Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web

src/assets/scss/main.scss

@@ -149,7 +149,6 @@ $lighter-color: rgba(#4D6DE4, 0.5);
 
 }
 .small-btn{
-  cursor: pointer;
   display: inline-block;
   width: 72px;
   height: 24px;
@@ -159,7 +158,23 @@ $lighter-color: rgba(#4D6DE4, 0.5);
   color: #FFF;
   font-size: 12px;
   text-align: center;
+  cursor: pointer;
   &:hover{
     background: $lighter-color;
   }
 }
+.delete-btn{
+  cursor: pointer;
+  display: inline-block;
+  width: 72px;
+  height: 24px;
+  line-height: 24px;
+  background: #ff0000;
+  border-radius: 3px;
+  color: #FFF;
+  font-size: 12px;
+  text-align: center;
+  &:hover{
+    background: (rgba(#ff0000, 0.5));
+  }
+}

src/components/SearchInput.vue

@@ -17,8 +17,8 @@
           @click="changeInput"
       />
     </template>
-    <div class="container">
-      <el-scrollbar style="max-height: 260px;width: 100%">
+    <div class="container" style="height: 300px">
+      <el-scrollbar style="max-height: 300px;width: 100%">
         <table class="table" style="width: 100%; border-collapse: collapse;max-height: 50px">
           <!-- 表头 -->
           <thead>

src/components/charge/RecordsLog.vue

@@ -6,9 +6,9 @@
           <el-collapse-item :name="index" v-for="(item, index) in list" :key="index">
             <template #title>
               <div class="list-item-content">
-                  <span class="disease-name">{{ item.diagnosisMedicalRecord?.diagnosisSummary }}</span>
+                <span class="disease-name">{{ item.diagnosisMedicalRecord?.diagnosisSummary }}</span>
                 <span class="doctor">{{ item.doctorName }}</span>
-                <span class="time">{{ formatListTime(item.createTime) }}</span>
+                <span class="time">{{ formatListTime(item.createDatetime) }}</span>
               </div>
             </template>
             <div>
@@ -31,17 +31,17 @@ const list = ref<any>([])
 const init = (patientId: any) => {
   const query = {
     patientId: patientId,
-    pageSize:10
+    pageSize: 10
   }
   post('charge/listDetail', {query}).then((res: any) => {
     list.value = res.list
-    console.log(list,'list')
+    console.log(list, 'list')
   })
 }
 const clearList = () => {
   list.value = []
 }
-defineExpose({init,clearList})
+defineExpose({init, clearList})
 </script>
 <style scoped lang="scss">
 .list {
@@ -65,12 +65,14 @@ defineExpose({init,clearList})
     .doctor {
       width: 80px;
     }
-    .time{
+
+    .time {
       display: inline-block;
       overflow: hidden;
     }
   }
 }
+
 :deep .el-collapse-item__content {
   padding: 0;
 }

src/components/outpatient/DiagnosisSearchInput.vue

@@ -231,4 +231,7 @@ defineExpose({init, clear})
     }
   }
 }
+table thead tr {
+  background: #F5FAFF;;
+}
 </style>

src/components/settings/SectionEdit.vue

@@ -115,9 +115,9 @@
     </template>
     <template #footer>
       <div class="bottom">
-        <el-button type="primary" @click="save()">保存</el-button>
-        <el-button @click="exit">取消</el-button>
-        <el-button v-if="props.id" @click="deleteDetail" type="danger">删除</el-button>
+        <span class="default-btn" @click="save()">保存</span>
+        <span class="default-btn" v-if="props.id" @click="deleteDetail" style="margin-left: 24px">删除</span>
+        <span class="default-btn" @click="exit" style="margin-left: 24px">取消</span>
       </div>
     </template>
   </Mask>
@@ -196,6 +196,7 @@ const options = Object.entries(depts).map(([key, value]) => {
   }
 });
 const init = (id: any) => {
+  form.value = {}
   post("organization/section/getById", {id}).then((res: any) => {
     form.value = res
   })

src/views/member/index.vue

@@ -14,7 +14,7 @@
                 </template>
               </el-input>
             </div>
-            <span class="btn" @click="openEdit(null)">患者建档</span>
+            <span class="default-btn" @click="openEdit(null)" style="margin-left: 24px">患者建档</span>
           </div>
           <div class="total">共{{ totalCount || 0 }}条</div>
           <ul class="content">
@@ -52,10 +52,10 @@
               </div>
             </div>
             <div class="detail-top-right">
-              <span class="btn" @click="openEdit(listItem.id)">编辑资料</span>
-              <span class="btn" @click="openGrant()">发放积分</span>
-              <span class="btn" @click="isExchange=true">兑换积分</span>
-              <span class="btn" @click="openFlowingWater">查看流水</span>
+              <span class="default-btn" @click="openEdit(listItem.id)">编辑资料</span>
+              <span class="default-btn" @click="openGrant()" style="margin: 0 24px">发放积分</span>
+              <span class="default-btn" @click="isExchange=true">兑换积分</span>
+              <span class="default-btn" @click="openFlowingWater" style="margin-left: 24px">查看流水</span>
               <!--              <span class="btn" @click="openLevelEdit(listItem)">患者等级编辑</span>-->
             </div>
           </div>

src/views/settings/log.vue

@@ -13,9 +13,8 @@
           />
           <el-input placeholder="请输入内容" v-model="searchModel.managerName" style="width: 180px;"></el-input>
           <el-input placeholder="请输入内容" v-model="searchModel.message" style="width: 180px;"></el-input>
-          <el-button type="primary" @click="getData">查询</el-button>
+          <span class="default-btn" @click="getData">查询</span>
         </el-form>
-
       </div>
       <div class="right">
 
@@ -127,7 +126,11 @@ const handleDateChange = (date: any[]) => {
     border-top: 1px solid #ebeef5;
     display: flex;
     align-items: center;
+    justify-content: flex-end;
   }
 }
-
+:deep(.el-input__wrapper){
+  height: 42px;
+  margin-right: 24px;
+}
 </style>

src/views/settings/print.vue

@@ -14,7 +14,7 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-button type="primary" @click="save">保存</el-button>
+      <span class="default-btn" @click="save">保存</span>
     </el-form>
 
   </div>

src/views/settings/section.vue

@@ -18,9 +18,9 @@
         </el-form>
       </div>
       <div class="title-btn">
-        <el-button type="primary" @click="init()">查询</el-button>
-        <el-button type="primary" @click="resetSearch">重置</el-button>
-        <el-button type="primary" :icon="Plus" @click="openDialog">新增</el-button>
+        <span class="default-btn" @click="init()">查询</span>
+        <span class="default-btn" @click="resetSearch" style="margin: 0 24px">重置</span>
+        <span class="default-btn" @click="openDialog">新增</span>
       </div>
     </div>
     <div class="table">
@@ -91,6 +91,7 @@ interface Dept {
 }
 
 const init = () => {
+  id.value=''
   post('organization/section/list', {page: page.value, size: pageSize.value, ...search.value}).then((res: any) => {
     tableData.value = res.list
     tableData.value.forEach((item: any) => {
@@ -157,4 +158,7 @@ const resetSearch = () => {
     justify-content: flex-end;
   }
 }
+:deep(.el-input__wrapper){
+  height: 42px;
+}
 </style>

src/views/social/costRecord.vue

@@ -12,7 +12,7 @@
           style="height: 100%"
       />
     </div>
-    <el-table :data="tableData" :max-height="710" border style="width: 100%;flex: 1;min-height: 0">
+    <el-table :data="tableData" border style="width: 100%;flex: 1;min-height: 0">
       <el-table-column prop="chargeTime" label="结算时间"></el-table-column>
       <el-table-column prop="customer" label="患者" width="180"></el-table-column>
       <el-table-column prop="projectCode" label="订单号"></el-table-column>

src/views/social/directory.vue

@@ -84,7 +84,7 @@
               {{ tip }}
             </div>
             <div class="demo-progress">
-              <el-progress v-if="tip" :text-inside="true" :stroke-width="30" :percentage="percent"
+              <el-progress v-if="tip" :stroke-width="30" :percentage="percent"
               />
             </div>
           </div>
@@ -103,7 +103,7 @@
           />
           <div class="default-btn startBtn" @click="update1318(1)"
                :style="{background: showBtn ? '#EDEFF6' : '', color: showBtn ? '#333333' : ''}"
-               >
+          >
             开始更新
           </div>
         </div>
@@ -184,6 +184,7 @@ let tableData: any = ref([])
 let content: any = ref(null);
 const showBtn = ref(false)
 const percent = ref(0)
+const percentage = ref<any>(0)
 let update1312 = (current_page: number) => {
   showBtn.value = true
   if (current_page == 1) {
@@ -197,7 +198,7 @@ let update1312 = (current_page: number) => {
     let number = res.number;
     if (current_page < pages && isUpdate1312.value) {
       current_page++
-      percent.value = Math.floor((current_page / pages) * 100)
+      percent.value = Math.floor((current_page / pages) * 10000)
       tip.value = "开始更新第:" + current_page + "/" + pages;
       update1312(current_page);
     } else {
@@ -339,7 +340,7 @@ const update1318 = (current_page: number) => {
     let number = res.number;
     if (current_page < pages && isUpdate1318.value) {
       current_page++
-      percent.value = Math.floor((current_page / pages) * 100)
+      percent.value = Math.floor((current_page / pages) * 10000)
       tip.value = "开始更新第:" + current_page + "/" + pages;
       update1318(current_page);
     } else {
@@ -361,7 +362,7 @@ const update1319 = (current_page: number) => {
     let number = res.number;
     if (current_page < pages && isUpdate1319.value) {
       current_page++
-      percent.value = Math.floor((current_page / pages) * 100)
+      percent.value = Math.floor((current_page / pages) * 10000)
       tip.value = "开始更新第:" + current_page + "/" + pages;
       update1318(current_page);
     } else {