From 6c41701881efe354e0f53a1162784f3e91e1507d Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Wed, 30 Apr 2025 17:00:56 +0800
Subject: [PATCH] dev

---
 src/components/SearchInput.vue              |   6 +-
 src/components/outpatient/ServiceItems.vue  |  21 +-
 src/components/registration/CardDefault.vue |   6 +-
 src/components/registration/Edit.vue        | 267 ++++++++++----------
 src/views/registration/index.vue            |   4 +-
 5 files changed, 163 insertions(+), 141 deletions(-)

diff --git a/src/components/SearchInput.vue b/src/components/SearchInput.vue
index 2cca210..53a2bed 100644
--- a/src/components/SearchInput.vue
+++ b/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>
\ No newline at end of file
diff --git a/src/components/outpatient/ServiceItems.vue b/src/components/outpatient/ServiceItems.vue
index 4a4d060..5dfc602 100644
--- a/src/components/outpatient/ServiceItems.vue
+++ b/src/components/outpatient/ServiceItems.vue
@@ -10,7 +10,7 @@
             <span class="code">{{ item.itemSocialCode }}</span>
             <span class="unit">
               <el-input-number v-model="item.selectedNum" min="1"></el-input-number>
-                <span style="line-height: 30px;margin-left: 10px">{{ item.unit }}</span>
+              <span style="line-height: 30px;margin-left: 10px">{{ item.unit }}</span>
             </span>
             <span class="delete">
                 <el-button @click="deleteItem(item.id)">
@@ -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>
@@ -41,14 +44,14 @@ import Panel from "@/components/common/Panel.vue";
 import {CircleClose} from '@element-plus/icons-vue'
 import SearchInput from "@/components/SearchInput.vue";
 
-const props=defineProps({
+const props = defineProps({
   status: {
-      type: Number,
+    type: Number,
     default: 0
   }
 })
 const disabled = computed(() => {
-  if(props.status === 1){
+  if (props.status === 1) {
     return true
   }
 })
@@ -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;
diff --git a/src/components/registration/CardDefault.vue b/src/components/registration/CardDefault.vue
index 0ca5304..4a038f2 100644
--- a/src/components/registration/CardDefault.vue
+++ b/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;
diff --git a/src/components/registration/Edit.vue b/src/components/registration/Edit.vue
index 2a2c67b..eb2dd85 100644
--- a/src/components/registration/Edit.vue
+++ b/src/components/registration/Edit.vue
@@ -1,124 +1,124 @@
 <template>
   <Mask :is-show="isShow" width="800" :height="500" title="挂号" @close="close" :show-footer="true">
-   <template #default>
-     <el-scrollbar>
-       <div style="padding:0 24px 24px">
-         <el-form
-             :model="edit_data"
-             label-width="auto"
-             :rules="rules"
-             ref="form"
-         >
-           <el-descriptions
-               border
-               direction="vertical"
-               label-width="100"
-               :column="4"
-               style="margin-top: 20px"
-           >
-             <!--          <el-descriptions-item label="结算方式">-->
-             <!--            <el-form-item prop="gender">-->
-             <!--              <el-radio-group v-model="edit_data.type">-->
-             <!--                <el-radio value="1">医保</el-radio>-->
-             <!--                <el-radio value="2">自费</el-radio>-->
-             <!--              </el-radio-group>-->
-             <!--            </el-form-item>-->
-             <!--          </el-descriptions-item>-->
-             <el-descriptions-item label="名称">
-               <el-form-item prop="name">
-                 <el-input v-model="edit_data.name" placeholder="请输入名称" clearable></el-input>
-               </el-form-item>
-             </el-descriptions-item>
-             <el-descriptions-item label="性别">
-               <el-form-item prop="gender">
-                 <el-radio-group v-model="edit_data.gender">
-                   <el-radio value="1">男</el-radio>
-                   <el-radio value="2">女</el-radio>
-                 </el-radio-group>
-               </el-form-item>
-             </el-descriptions-item>
-             <el-descriptions-item label="年龄">
-               <el-form-item prop="age">
-                 <el-input v-model.number="edit_data.age" placeholder="请输入年龄"></el-input>
-               </el-form-item>
-             </el-descriptions-item>
-             <el-descriptions-item label="医生">
-               <el-form-item prop="organizationDoctorId">
-                 <el-select
-                     v-model="edit_data.organizationDoctorId"
-                     placeholder="请选择医生"
-                 >
-                   <el-option
-                       v-for="item in props.doctorList"
-                       :key="item.id"
-                       :label="item.name"
-                       :value="item.id"
-                   >
-                   </el-option>
-                 </el-select>
-               </el-form-item>
-             </el-descriptions-item>
-             <el-descriptions-item label="证件类型">
-               <el-form-item prop="certType">
-                 <el-select v-model="edit_data.certType" placeholder="证件类型">
-                   <el-option
-                       v-for="item in certTypeList"
-                       :key="item.id"
-                       :label="item.name"
-                       :value="item.id"
-                   ></el-option>
-                 </el-select>
-               </el-form-item>
-             </el-descriptions-item>
-             <el-descriptions-item label="证件码">
-               <el-form-item prop="certNo">
-                 <el-input v-model="edit_data.certNo" placeholder="请输入证件码"></el-input>
-               </el-form-item>
-             </el-descriptions-item>
+    <template #default>
+      <el-scrollbar>
+        <div style="padding:0 24px 24px">
+          <el-form
+              :model="edit_data"
+              label-width="auto"
+              :rules="rules"
+              ref="form"
+          >
+            <el-descriptions
+                border
+                direction="vertical"
+                label-width="100"
+                :column="4"
+                style="margin-top: 20px"
+            >
+              <!--          <el-descriptions-item label="结算方式">-->
+              <!--            <el-form-item prop="gender">-->
+              <!--              <el-radio-group v-model="edit_data.type">-->
+              <!--                <el-radio value="1">医保</el-radio>-->
+              <!--                <el-radio value="2">自费</el-radio>-->
+              <!--              </el-radio-group>-->
+              <!--            </el-form-item>-->
+              <!--          </el-descriptions-item>-->
+              <el-descriptions-item label="名称">
+                <el-form-item prop="name">
+                  <el-input v-model="edit_data.name" placeholder="请输入名称" clearable></el-input>
+                </el-form-item>
+              </el-descriptions-item>
+              <el-descriptions-item label="性别">
+                <el-form-item prop="gender">
+                  <el-radio-group v-model="edit_data.gender">
+                    <el-radio value="1">男</el-radio>
+                    <el-radio value="2">女</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-descriptions-item>
+              <el-descriptions-item label="年龄">
+                <el-form-item prop="age">
+                  <el-input v-model.number="edit_data.age" placeholder="请输入年龄"></el-input>
+                </el-form-item>
+              </el-descriptions-item>
+              <el-descriptions-item label="医生">
+                <el-form-item prop="organizationDoctorId">
+                  <el-select
+                      v-model="edit_data.organizationDoctorId"
+                      placeholder="请选择医生"
+                  >
+                    <el-option
+                        v-for="item in props.doctorList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-descriptions-item>
+              <el-descriptions-item label="证件类型">
+                <el-form-item prop="certType">
+                  <el-select v-model="edit_data.certType" placeholder="证件类型">
+                    <el-option
+                        v-for="item in certTypeList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-descriptions-item>
+              <el-descriptions-item label="证件码">
+                <el-form-item prop="certNo">
+                  <el-input v-model="edit_data.certNo" placeholder="请输入证件码"></el-input>
+                </el-form-item>
+              </el-descriptions-item>
 
-             <el-descriptions-item label="手机号">
-               <el-form-item prop="phone">
-                 <el-input v-model="edit_data.phone" placeholder="手机号"></el-input>
-               </el-form-item>
-             </el-descriptions-item>
-             <el-descriptions-item label="就诊类型">
-               <el-form-item prop="visitType">
-                 <el-select v-model="edit_data.visitType" placeholder="就诊类型">
-                   <el-option label="初诊" :value="0"></el-option>
-                   <el-option label="复诊" :value="1"></el-option>
-                 </el-select>
-               </el-form-item>
-             </el-descriptions-item>
-             <el-descriptions-item label="备注">
-               <el-input v-model="edit_data.memo" placeholder="备注"></el-input>
-             </el-descriptions-item>
-           </el-descriptions>
-         </el-form>
-         <h5 v-if="!isShowCard" style="margin:24px 0;font-size: 16px">险种列表</h5>
-         <el-table
-             :data="tableData"
-             style="width: 100%"
-             v-if="!isShowCard"
-         >
-           <el-table-column label="险种类型" prop="insutype">
-             <template #default="scope">
-               {{ getKey(insutypes,scope.row.insutype) }}
-             </template>
-           </el-table-column>
-           <el-table-column label="剩余余额" prop="balc">
-             <template #default="scope">
-               ￥{{ scope.row.balc || 0 }}
-             </template>
-           </el-table-column>
-         </el-table>
-       </div>
-     </el-scrollbar>
-   </template>
+              <el-descriptions-item label="手机号">
+                <el-form-item prop="phone">
+                  <el-input v-model="edit_data.phone" placeholder="手机号"></el-input>
+                </el-form-item>
+              </el-descriptions-item>
+              <el-descriptions-item label="就诊类型">
+                <el-form-item prop="visitType">
+                  <el-select v-model="edit_data.visitType" placeholder="就诊类型">
+                    <el-option label="初诊" :value="0"></el-option>
+                    <el-option label="复诊" :value="1"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-descriptions-item>
+              <el-descriptions-item label="备注">
+                <el-input v-model="edit_data.memo" placeholder="备注"></el-input>
+              </el-descriptions-item>
+            </el-descriptions>
+          </el-form>
+          <h5 v-if="!isShowCard" style="margin:24px 0;font-size: 16px">险种列表</h5>
+          <el-table
+              :data="tableData"
+              style="width: 100%"
+              v-if="!isShowCard"
+          >
+            <el-table-column label="险种类型" prop="insutype">
+              <template #default="scope">
+                {{ getKey(insutypes, scope.row.insutype) }}
+              </template>
+            </el-table-column>
+            <el-table-column label="剩余余额" prop="balc">
+              <template #default="scope">
+                ￥{{ scope.row.balc || 0 }}
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+      </el-scrollbar>
+    </template>
 
     <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>
\ No newline at end of file
diff --git a/src/views/registration/index.vue b/src/views/registration/index.vue
index ed62df9..680fa7d 100644
--- a/src/views/registration/index.vue
+++ b/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"