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

src/components/SearchInput.vue

@@ -2,7 +2,7 @@
 <template>
   <el-input
       ref="inputRef"
-      style="width: 100%;"
+      style="width: 100%;height: 100%"
              v-model="keyword"
              :prefix-icon="Plus"
              :placeholder="props.placeholder"
@@ -91,6 +91,7 @@ const emit = defineEmits(['selectedCallBack']);
 const clickRow = (row: any) => {
   emit('selectedCallBack', row);
   popoverRef.value.hide();
+  keyword.value=""
 };
 
 const beforeShow = () => {
@@ -113,5 +114,8 @@ const beforeShow = () => {
     border: none !important;
     box-shadow: none !important;
   }
+  &:hover{
+    border: 1px solid #409eff !important;
+  }
 }
 </style>

src/components/outpatient/ServiceItems.vue

@@ -28,10 +28,13 @@
               @selectedCallBack="serviceSelect"
               :placeholder="'请输入项目名称'"
               :disabled="disabled"
+              style="height: 100%"
           >
           </SearchInput>
         </div>
-        <span style="margin-right: 24px">￥{{ list.reduce((acc, cur) => acc + cur.unitPrice*cur.selectedNum, 0) }}元</span></div>
+        <span style="margin-right: 24px">￥{{
+            list.reduce((acc, cur) => acc + cur.unitPrice * cur.selectedNum, 0)
+          }}元</span></div>
     </div>
   </Panel>
 </template>
@@ -127,6 +130,14 @@ const deleteItem = (id: any) => {
         text-align: center;
       }
 
+      .unit {
+        height: 100%;
+        width: 200px;
+        margin-left: 10px;
+        border-right: 1px solid #EAEAEC;
+        line-height: 64px;
+      }
+
       .delete {
         height: 100%;
         width: 50px;

src/components/registration/CardDefault.vue

@@ -126,7 +126,7 @@ const close = () => {
 
 <style scoped lang="scss">
 .btn-wrapper {
-  width: 200px;
+  width: 150px;
   height: 100%;
   background: #FFFFFF;
   border-radius: 8px;
@@ -134,8 +134,8 @@ const close = () => {
     width: 100%;
     height: 46px;
     border-bottom: 1px solid #EAEAEC;
-    font-weight: 500;
-    font-size: 16px;
+    font-weight: 400;
+    font-size: 15px;
     color: #4D6DE4;
     font-style: normal;
     display: flex;

src/components/registration/Edit.vue

@@ -118,7 +118,7 @@
     <template #footer>
       <div class="bottom">
         <el-dropdown v-if="isShowCard" placement="top-start" @show="showCardBtn" @hide="hide">
-          <div class="left">
+          <div class="left" style="outline: none;">
             <span class="btnCard" type="primary">
               <img class="image" src="/public/static/images/registration/card.png" alt="" srcset="">进行读卡
               <img class="image1" :src="'/public/static/images/registration/'+(showBtn?2:1)+'.png'" alt="" srcset="">
@@ -129,7 +129,7 @@
                          @close="deleteCard"/>
           </template>
         </el-dropdown>
-        <div class="closeBtn" v-else @click="deleteCard">
+        <div class="closeBtn" v-else @click="deleteCard" style="outline: none;">
           <img class="image" src="/public/static/images/registration/card.png" alt="" srcset="">
           退出医保
         </div>
@@ -182,6 +182,7 @@ const rules = ref<any>({
   ],
   age: [
     {required: true, message: '请输入年龄', trigger: 'blur'},
+    {type: 'number', message: '年龄必须为数字值', trigger: 'blur'},
   ],
   gender: [
     {required: true, message: '请选择性别', trigger: 'blur'},
@@ -322,8 +323,8 @@ defineExpose({init})
 }
 
 .btnCard {
-  width: 200px;
-  height: 48px;
+  width: 150px;
+  height: 36px;
   background: #FFFFFF;
   border-radius: 8px;
   border: 1px solid #4D6DE4;
@@ -331,20 +332,20 @@ defineExpose({init})
   justify-content: center;
   align-items: center;
   font-weight: 400;
-  font-size: 20px;
+  font-size: 15px;
   color: #4D6DE4;
   font-style: normal;
 
   .image {
-    width: 26px;
-    height: 22px;
-    margin-right: 10px;
+    width: 20px;
+    height: 17px;
+    margin-right: 6px;
   }
 
   .image1 {
-    width: 16px;
-    height: 8px;
-    margin-left: 20px;
+    width: 12px;
+    height: 6px;
+    margin-left: 16px;
   }
 
   &:hover {
@@ -354,8 +355,8 @@ defineExpose({init})
 }
 
 .closeBtn {
-  width: 200px;
-  height: 48px;
+  width: 150px;
+  height: 36px;
   background: #FFFFFF;
   border-radius: 8px;
   border: 1px solid #4D6DE4;
@@ -363,14 +364,14 @@ defineExpose({init})
   justify-content: center;
   align-items: center;
   font-weight: 400;
-  font-size: 20px;
+  font-size: 15px;
   color: #4D6DE4;
   font-style: normal;
 
   .image {
-    width: 26px;
-    height: 22px;
-    margin-right: 10px;
+    width: 20px;
+    height: 17px;
+    margin-right: 6px;
   }
 
   &:hover {
@@ -378,4 +379,10 @@ defineExpose({init})
     border: 1px solid #4D6DE4;
   }
 }
+
+:deep(.el-dropdown) {
+  &:hover {
+    border: none;
+  }
+}
 </style>

src/views/registration/index.vue

@@ -9,11 +9,11 @@
         </div>
         <div class="left-bottom">
           <Panel title="医生列表">
-            <div class="search">
+            <div class="search" style="padding: 0 24px">
               <el-input v-model="keyword" placeholder="搜索医生"
                         @keydown.enter="initDoctor"></el-input>
             </div>
-            <div class="content_list">
+            <div class="content_list" style="padding: 0 24px">
               <div class="role_list">
                 <ul>
                   <li v-for="(item, index) in roleList" :key="index"