dev

src/components/home/index/InventoryAlert.vue

@@ -186,7 +186,7 @@ const getInventoryWarning = () => {
       .item-right {
         width: 70px;
         display: flex;
-        margin-right: 16px;
+        margin-right: 10px;
         font-weight: bold;
         font-style: normal;
         font-size: 28px;

src/components/home/index/ValidityWarning.vue

@@ -49,7 +49,7 @@ const getExpiryDateWarning = () => {
                 }}{{ expireDateWarningList[0].min_packaging_unit }}</span>
             </div>
           </div>
-          <div class="item-right">
+          <div class="item-right" style="margin-right: 10px">
             <div v-if="expireDateWarningList[0].remaining_days<0">已过期<span class="item-right-num">{{
                 Math.abs(expireDateWarningList[0].remaining_days)
               }}</span>天
@@ -75,7 +75,7 @@ const getExpiryDateWarning = () => {
                 }}{{ expireDateWarningList[1].min_packaging_unit }}</span>
             </div>
           </div>
-          <div class="item-right">
+          <div class="item-right" style="margin-right: 10px">
             <div v-if="expireDateWarningList[1].remaining_days<0">已过期<span class="item-right-num">{{
                 Math.abs(expireDateWarningList[1].remaining_days)
               }}</span>天
@@ -101,7 +101,7 @@ const getExpiryDateWarning = () => {
                 }}{{ expireDateWarningList[2].min_packaging_unit }}</span>
             </div>
           </div>
-          <div class="item-right">
+          <div class="item-right" style="margin-right: 10px">
             <div v-if="expireDateWarningList[2].remaining_days<0">已过期<span class="item-right-num">{{
                 Math.abs(expireDateWarningList[2].remaining_days)
               }}</span>天
@@ -127,7 +127,7 @@ const getExpiryDateWarning = () => {
                 }}{{ expireDateWarningList[3].min_packaging_unit }}</span>
             </div>
           </div>
-          <div class="item-right">
+          <div class="item-right" style="margin-right: 10px">
             <div v-if="expireDateWarningList[3].remaining_days<0">已过期<span class="item-right-num">{{
                 Math.abs(expireDateWarningList[3].remaining_days)
               }}</span>天
@@ -147,11 +147,9 @@ const getExpiryDateWarning = () => {
   height: 100%;
   display: flex;
   flex-direction: column;
+  margin-right: 24px;
 
   .box {
-    display: flex;
-    flex-wrap: wrap;
-
     .item {
       float: left;
       width:48%;
@@ -160,7 +158,8 @@ const getExpiryDateWarning = () => {
       border-radius: 8px;
       display: flex;
       align-items: center;
-
+      justify-content: space-between;
+      flex: 1 1 calc(50% - 8px); //每行显示2个 item，每个 item 占据 33.33% 减去间距
       .image {
         width: 34px;
         height: 34px;
@@ -178,24 +177,25 @@ const getExpiryDateWarning = () => {
           white-space: nowrap;
           overflow: hidden;
           text-overflow: ellipsis;
-
-        }
         }
 
-      .item-right {
-        width: 56px;
-        margin-right: 16px;
+        .item-name-font {
           font-weight: 400;
-        font-size: 10px;
-        color: #333333;
+          font-size: 12px;
+          color: #999999;
           font-style: normal;
-
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+        }
+      }
+      .item-right{
+        width: 70px;
         .item-right-num{
-          font-weight: bold;
           font-size: 28px;
           color: #FF282E;
+          font-weight: bold;
           font-style: normal;
-
         }
       }
 
@@ -211,15 +211,16 @@ const getExpiryDateWarning = () => {
         margin-top: 8px !important;
       }
     }
-
     .item1 {
       float: right;
+      width:48%;
       height: 58px;
       box-shadow: 0 0 4px 0 rgba(0, 0, 0, 0.1);
       border-radius: 8px;
       display: flex;
       align-items: center;
-
+      justify-content: space-between;
+      flex: 1 1 calc(50% - 8px); //每行显示2个 item，每个 item 占据 33.33% 减去间距
       .image {
         width: 34px;
         height: 34px;
@@ -237,24 +238,27 @@ const getExpiryDateWarning = () => {
           white-space: nowrap;
           overflow: hidden;
           text-overflow: ellipsis;
+        }
 
+        .item-name-font {
+          font-weight: 400;
+          font-size: 12px;
+          color: #999999;
+          font-style: normal;
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
         }
       }
 
+
       .item-right{
-        width: 56px;
-        margin-right: 16px;
-        font-weight: 400;
-        font-size: 10px;
-        color: #333333;
-        font-style: normal;
-
+        width: 70px;
         .item-right-num{
-          font-weight: bold;
           font-size: 28px;
           color: #FF282E;
+          font-weight: bold;
           font-style: normal;
-
         }
       }
 

src/components/outpatient/MedicalQueue.vue

@@ -10,7 +10,7 @@
     </div>
     <div class="list">
       <el-scrollbar>
-        <ul>
+        <ul v-loading="loading">
           <li class="list-item" :class="curItem.id == item.id ? 'active' : ''" v-for="(item, index) in list"
               :key="index" @click="clickLi(item)">
                 <span>
@@ -86,12 +86,15 @@ onMounted(() => {
   initStatusList()
   init()
 })
+const loading = ref(true)
 const init = () => {
+  loading.value = true
   post(apiConfig.DoctorList, {
     query: {
       status: props.status,
     }
   }).then((res: any) => {
+    loading.value = false
     list.value = res.list
   })
 }

src/components/registration/Edit.vue

@@ -120,6 +120,7 @@ const save = () => {
       mdtrtCertType: socialCard.value.mdtrtCertType
     }).then(() => {
       ElMessage.success('修改成功')
+      close()
     })
   } else {
     console.log(socialCard.value)
@@ -128,9 +129,9 @@ const save = () => {
       mdtrtCertType: socialCard.value.mdtrtCertType
     }).then(() => {
       ElMessage.success('新建成功')
+      close()
     })
   }
-  close()
 }
 const deleteDetail = () => {
   post('registration/delete', {id}).then(() => {

src/views/registration/index.vue

@@ -47,8 +47,8 @@
         </div>
       </div>
     </div>
-    <Mask :is-show="isShow" width="800" title="挂号" @close="isShow=false">
-      <Edit :id="id" :doctorList="roleList" @close="getPatientList"></Edit>
+    <Mask :is-show="isShow" width="800" title="挂号" @close="close">
+      <Edit :id="id" :doctorList="roleList" @close="close"></Edit>
     </Mask>
   </div>
 </template>
@@ -90,7 +90,6 @@ const getPatientList = () => {
   }).then((res: any) => {
     patientList.value = res.list
   })
-  isShow.value = false
 }
 const total = ref(0)
 const size = ref(20)
@@ -104,6 +103,10 @@ const rowClick = (row: any) => {
   isShow.value = true
   id.value = row.id
 }
+const close = () => {
+  isShow.value = false
+  getPatientList()
+}
 </script>
 <style scoped lang="scss">
 .container-wrapper {