From 6ad6ff721cce8028b9c6bf6311f3d6ade2559930 Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Fri, 23 May 2025 12:49:21 +0800
Subject: [PATCH 01/33] dev

---
 .../purchase/TraceabilityCodeInput.vue        | 20 +++++++++++++------
 src/components/registration/Edit.vue          |  5 +++--
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/components/inventory/purchase/TraceabilityCodeInput.vue b/src/components/inventory/purchase/TraceabilityCodeInput.vue
index cc03b1d..0f5862d 100644
--- a/src/components/inventory/purchase/TraceabilityCodeInput.vue
+++ b/src/components/inventory/purchase/TraceabilityCodeInput.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-popover placement="bottom-end" :visible="isVisible" width="400">
+  <el-popover placement="bottom-end" :visible="true" width="400">
     <template #reference>
       <el-input v-model="input" style="width:100%;height: 100%" placeholder="追溯码" size="small" @focus="focus"
                 @blur="handlerBlur" @keydown.enter="addCode"></el-input>
@@ -11,9 +11,9 @@
             {{ row.code.slice(0, 7) }}&nbsp;{{ row.code.slice(7) }}
           </template>
         </el-table-column>
-        <el-table-column label="数量" prop="num" width="70">
+        <el-table-column label="数量" prop="num" width="70" show-overflow-tooltip>
           <template #default="{row}">
-            <span class="edit" @click="openCodeNumEdit(row)">
+            <span class="small-btn edit" style="cursor: pointer" @click="openCodeNumEdit(row)">
              {{ row.num }}
             </span>
           </template>
@@ -83,9 +83,7 @@ const openCodeNumEdit = (row: any) => {
 </script>
 <style scoped lang="scss">
 .code-popo {
-  .edit{
-    cursor: pointer;
-  }
+
   .remove {
     cursor: pointer;
 
@@ -94,4 +92,14 @@ const openCodeNumEdit = (row: any) => {
     }
   }
 }
+
+:deep(.el-table td.el-table__cell) {
+  .edit {
+    padding: 2px;
+    width: 100%;
+    cursor: pointer;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+}
 </style>
\ No newline at end of file
diff --git a/src/components/registration/Edit.vue b/src/components/registration/Edit.vue
index d2acb07..3f5ca18 100644
--- a/src/components/registration/Edit.vue
+++ b/src/components/registration/Edit.vue
@@ -229,9 +229,10 @@ import {getCurrentTime, getToday} from "@/utils/dateUtils.ts";
 const height = ref(570)
 const certTypeList = ref<any>(
     Object.entries(psnCertTypes)
-        .map(([id, name]) => ({id: Number(id), name}))
-        .sort((a, b) => a.id - b.id)
+        .map(([id, name]) => ({id, name}))
+        .sort((a, b) => Number(a.id) - Number(b.id))
 )
+console.log(certTypeList.value)
 const edit_data = ref<any>({
   timeList: []
 })

From 6416d2f629a62b3f2acd1c54ff53fb817a190b3e Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Fri, 23 May 2025 13:41:55 +0800
Subject: [PATCH 02/33] dev

---
 .../inventory/purchase/CodeNumEditDialog.vue  | 125 +++++++++++-------
 .../purchase/TraceabilityCodeInput.vue        |   7 +-
 2 files changed, 81 insertions(+), 51 deletions(-)

diff --git a/src/components/inventory/purchase/CodeNumEditDialog.vue b/src/components/inventory/purchase/CodeNumEditDialog.vue
index 3b893d3..7a564c2 100644
--- a/src/components/inventory/purchase/CodeNumEditDialog.vue
+++ b/src/components/inventory/purchase/CodeNumEditDialog.vue
@@ -1,27 +1,26 @@
 <template>
-  <Mask :is-show="isShow" :height="600" :width="800" @close="close" title="采集相同追溯码" :show-footer="true">
-    <div class="tips">
-      入库单位包装无追溯码时，可重复采集上层包装的追溯码
-    </div>
+  <Mask :is-show="isShow" :height="321" :width="818" @close="close" title="采集相同追溯码">
     <div class="content">
-    <div class="code">
-      <div class="before-code">
-        {{ data.code.slice(0, 7) }}
+      <div class="top">
+        <div class="tip">
+          入库单位包装无追溯码时，可重复采集上层包装的追溯码
+        </div>
+        <div class="code">
+            <span class="before-code">
+              {{ data.code.slice(0, 7) }}
+            </span>
+          <span class="after-code">
+              {{ data.code.slice(7) }}
+            </span>
+        </div>
       </div>
-      <div class="after-code">
-        {{  data.code.slice(7) }}
+      <div class="body">
+        <span class="text">采集</span>
+        <el-input-number v-model="data.num" min="1" size="large" ref="inputRef"
+                         @keydown.enter="close"></el-input-number>
+        <span class="text">条</span>
       </div>
     </div>
-    <div class="number">
-      <span class="text">
-        采集
-      </span>
-      <el-input-number v-model="data.num" min="1" size="large" ref="inputRef" @keydown.enter="close"></el-input-number>
-      <span class="text">
-        条
-      </span>
-    </div>
-    </div>
   </Mask>
 </template>
 <script setup lang="ts">
@@ -29,14 +28,14 @@ import Mask from "@/components/common/Mask.vue";
 import {nextTick, ref} from "vue";
 
 const data = ref<any>()
-const emit = defineEmits(['close'])
+const emit = defineEmits(['close', 'save'])
 
 const inputRef = ref<any>()
 
 const init = (codeInfo: any) => {
   isShow.value = true
   data.value = codeInfo
-  nextTick(()=>{
+  nextTick(() => {
     inputRef.value?.focus()
     const inputElement = inputRef.value?.$el?.querySelector('input');
     if (inputElement) {
@@ -51,45 +50,77 @@ const close = () => {
   emit('close')
   isShow.value = false
 }
+const save = () => {
+  emit('save', data.value)
+  isShow.value = false
+}
 </script>
 <style scoped lang="scss">
-.tips{
+.content {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
 
-}
-.content{
-  border: 1px solid #ddd;
-  margin: 40px;
-  border-radius: 10px;
-  .code {
+  .top {
     width: 100%;
-    font-weight: 800;
-    font-size: 30px;
-    color: #333333;
-    padding: 40px 0;
+    height: 126px;
+    background: #F9FAFC;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    font-weight: 500;
+    font-size: 20px;
+    color: #666666;
     font-style: normal;
-    display: flex;
-    justify-content: center;
-    border-bottom: 1px solid #ddd;
-    .before-code {
-      color: #999999;
-    }
+    padding: 24px;
 
-    .after-code {
-      margin-left: 10px;
+    .code {
+      width: 100%;
+      display: flex;
+      justify-content: center;
+      font-weight: 800;
+      font-size: 30px;
+      color: #999999;
+      font-style: normal;
+
+      .after-code {
+        color: #333;
+        margin-left: 10px;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
     }
   }
-  .number{
 
-    padding: 40px 0;
-    width: 100%;
+  .body {
+    flex: 1;
+    min-height: 0;
     display: flex;
     justify-content: center;
-    .text{
-      font-size: 24px;
-      line-height: 40px;
-      text-align: center;
+    align-items: center;
+
+    .text {
+      margin: 0 16px;
     }
   }
 }
 
+.footer {
+  height: 100%;
+  padding: 24px;
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+
+  .default-btn, .btn {
+    width: 60px;
+    height: 32px;
+    line-height: 32px;
+    margin-left: 10px;
+    font-size: 14px;
+  }
+}
 </style>
\ No newline at end of file
diff --git a/src/components/inventory/purchase/TraceabilityCodeInput.vue b/src/components/inventory/purchase/TraceabilityCodeInput.vue
index 0f5862d..adfb42f 100644
--- a/src/components/inventory/purchase/TraceabilityCodeInput.vue
+++ b/src/components/inventory/purchase/TraceabilityCodeInput.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-popover placement="bottom-end" :visible="true" width="400">
+  <el-popover placement="bottom-end" :visible="isVisible" width="400">
     <template #reference>
       <el-input v-model="input" style="width:100%;height: 100%" placeholder="追溯码" size="small" @focus="focus"
                 @blur="handlerBlur" @keydown.enter="addCode"></el-input>
@@ -13,7 +13,7 @@
         </el-table-column>
         <el-table-column label="数量" prop="num" width="70" show-overflow-tooltip>
           <template #default="{row}">
-            <span class="small-btn edit" style="cursor: pointer" @click="openCodeNumEdit(row)">
+            <span class="edit" @click="openCodeNumEdit(row)">
              {{ row.num }}
             </span>
           </template>
@@ -95,11 +95,10 @@ const openCodeNumEdit = (row: any) => {
 
 :deep(.el-table td.el-table__cell) {
   .edit {
-    padding: 2px;
-    width: 100%;
     cursor: pointer;
     overflow: hidden;
     text-overflow: ellipsis;
+    color: #4d6de4;
   }
 }
 </style>
\ No newline at end of file

From 39d501cd4e087edca5f278d5aa9535f2a838931e Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Fri, 23 May 2025 13:56:40 +0800
Subject: [PATCH 03/33] dev

---
 src/components/common/goods/GoodsDetail.vue | 6 +++---
 src/components/registration/Edit.vue        | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/common/goods/GoodsDetail.vue b/src/components/common/goods/GoodsDetail.vue
index 420b5b9..6ff70d3 100644
--- a/src/components/common/goods/GoodsDetail.vue
+++ b/src/components/common/goods/GoodsDetail.vue
@@ -51,7 +51,7 @@
         <el-table-column prop="number" label="数量" width="250">
           <template #default="scope">
             <div v-if="props.status">
-              <el-input-number v-model="scope.row.selectedNum" :min="0" @change="handleNumChange(scope.row)"
+              <el-input-number v-model="scope.row.selectedNum" ref="inputRef" :min="0" @change="handleNumChange(scope.row)"
                                style="margin-right: 5px"></el-input-number>
               <el-dropdown v-if="scope.row.trdnFlag == 1">
                 <span style="line-height: 30px;margin-left: 10px;cursor: pointer">{{ scope.row.selectedUnit }}</span>
@@ -111,7 +111,7 @@
 <script setup lang="ts">
 import SearchInput from "@/components/SearchInput.vue";
 import Panel from "@/components/common/Panel.vue";
-import {onMounted, ref} from "vue";
+import {nextTick, onMounted, ref} from "vue";
 import {post} from "@/utils/request.ts";
 import {ElMessage} from "element-plus";
 import {Delete} from "@element-plus/icons-vue";
@@ -168,6 +168,7 @@ const goodsShowConfig = [
     prop: "limit",
   }
 ]
+const inputRef=ref<any>()
 const goodsSelect = (row: any) => {
   row.selectedNum = 1
   row.selectedUnit = row.packagingUnit
@@ -175,7 +176,6 @@ const goodsSelect = (row: any) => {
   row.shouldNumber = 1;
   row.idCode = row.idCode ? row.idCode == "" ? null : row.idCode.split(",") : null
 
-
   if (goodsDetail.value.find((i: any) => i.id == row.id)) {
     ElMessage.warning("数据已存在,只能加数量")
     goodsDetail.value.find((i: any) => i.id == row.id).selectedNum += 1
diff --git a/src/components/registration/Edit.vue b/src/components/registration/Edit.vue
index 3f5ca18..5514d87 100644
--- a/src/components/registration/Edit.vue
+++ b/src/components/registration/Edit.vue
@@ -135,9 +135,9 @@
                     />
                     <el-time-select
                         v-model="time"
-                        start="00:00"
+                        start="08:00"
                         step="00:15"
-                        end="23:45"
+                        end="22:00"
                         :min-time="getCurrentTime(edit_data.date)"
                         placeholder="选择时间"
                         style="width: 50%"

From 0920d75472d50bf1271123ab3b30695b9362d97d Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Fri, 23 May 2025 14:14:04 +0800
Subject: [PATCH 04/33] dev

---
 src/components/outpatient/MedicalQueue.vue | 13 +++++--------
 src/components/registration/Edit.vue       |  5 ++---
 src/views/outpatient/index.vue             |  2 +-
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/components/outpatient/MedicalQueue.vue b/src/components/outpatient/MedicalQueue.vue
index 3a7db4e..b27a30a 100644
--- a/src/components/outpatient/MedicalQueue.vue
+++ b/src/components/outpatient/MedicalQueue.vue
@@ -38,7 +38,7 @@
                 </span>
               <span class="item-name">{{ item.name }}</span>
               <span class="item-time">
-                {{ formatListTime(item.createDatetime)}}
+                {{ formatListTime(item.createDatetime) }}
               </span>
               <span class="item-type">{{ item.type == 2 ? '医保' : '自费' }}</span>
             </li>
@@ -104,7 +104,7 @@ onMounted(() => {
   // 启动定时器，每秒更新一次
   refreshInterval = setInterval(() => {
     initList()
-  }, 60*1000); // 每1000毫秒（即1秒）执行一次
+  }, 60 * 1000); // 每1000毫秒（即1秒）执行一次
 })
 onUnmounted(() => {
   // 组件卸载时清除定时器
@@ -206,11 +206,8 @@ const clickLi = (item: any, showBox: any = true) => {
 
 }
 const changeCurItemOrStatus = (item: any, status: any) => {
-  clickLi(item, false)
-  if (curStatus != null) {
-    curStatus.value = status
-    init()
-  }
+  curStatus.value = status
+  init()
 }
 defineExpose({changeCurItemOrStatus})
 watch(() => curStatus.value, () => {
@@ -234,7 +231,7 @@ const setDateTip = () => {
 
 }
 watch(() => selectedDate.value, (newValue, oldValue) => {
-  curItem.value=null
+  curItem.value = null
   emit('clickItem', curItem.value)
   if (newValue == oldValue) {
     init()
diff --git a/src/components/registration/Edit.vue b/src/components/registration/Edit.vue
index 5514d87..4bd6957 100644
--- a/src/components/registration/Edit.vue
+++ b/src/components/registration/Edit.vue
@@ -377,7 +377,6 @@ const init = (doctorId: any = "", id: any = null, show: any = false) => {
   if (id) {
     post('registration/getById', {id: id}).then((res: any) => {
       edit_data.value = res
-      edit_data.value.certType = Number(edit_data.value.certType)
       time.value = edit_data.value.timeList[edit_data.value.timeList.length - 1]
     })
   }
@@ -393,7 +392,7 @@ const socialCardUpdate = (e: any) => {
     isShowCard.value = false
     edit_data.value.gender = Number(e.data.baseinfo.gend)
     edit_data.value.name = e.data.baseinfo.psn_name
-    edit_data.value.certType = Number(e.data.baseinfo.psn_cert_type)
+    edit_data.value.certType = e.data.baseinfo.psn_cert_type
     edit_data.value.certNo = e.data.baseinfo.certno
     edit_data.value.age = Math.floor(e.data.baseinfo.age)
     tableData.value = e.data.insuinfo
@@ -407,7 +406,7 @@ const socialCardUpdate = (e: any) => {
         edit_data.value.name = res.list[0].name
         edit_data.value.gender = res.list[0].sex
         edit_data.value.phone = res.list[0].phone
-        edit_data.value.certType = Number(res.list[0].certType)
+        edit_data.value.certType =res.list[0].certType
         edit_data.value.certNo = res.list[0].certNo
         edit_data.value.memo = res.list[0].remark
         edit_data.value.visitType = 1
diff --git a/src/views/outpatient/index.vue b/src/views/outpatient/index.vue
index 9be6da0..cbc4d46 100644
--- a/src/views/outpatient/index.vue
+++ b/src/views/outpatient/index.vue
@@ -104,7 +104,7 @@ const save = () => {
   } else {
     post('medical/record/save', {data: data}).then((res: any) => {
       ElMessage.success("接诊完毕,请到收费页面收费")
-      medicalQueueRef.value?.changeCurItemOrStatus(null, 2);
+      medicalQueueRef.value?.changeCurItemOrStatus(registerId.value, 3);
     })
   }
 }

From cbff38576cf23316ebfd20fa7d98366d3e811b11 Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Fri, 23 May 2025 15:55:55 +0800
Subject: [PATCH 05/33] dev

---
 src/assets/scss/main.scss                     |  7 +--
 src/components/charge/Settlement.vue          |  1 +
 src/components/outpatient/MedicalQueue.vue    |  3 +
 src/components/registration/Edit.vue          | 57 ++++++++++---------
 .../settings/item/group/GroupAdd.vue          |  3 -
 src/views/outpatient/index.vue                |  5 +-
 src/views/registration/index.vue              |  1 -
 7 files changed, 38 insertions(+), 39 deletions(-)

diff --git a/src/assets/scss/main.scss b/src/assets/scss/main.scss
index c92070e..27d71bb 100644
--- a/src/assets/scss/main.scss
+++ b/src/assets/scss/main.scss
@@ -146,20 +146,17 @@ $lighter-color: rgba(#4D6DE4, 0.5);
   &:hover{
     background: $lighter-color;
   }
-
 }
 .small-btn{
   display: inline-block;
-  width: 72px;
-  height: 24px;
-  line-height: 24px;
   background: $btn-color;
   border-radius: 3px;
   color: #FFF;
   font-size: 12px;
   text-align: center;
   cursor: pointer;
+  padding: 8px 15px;
   &:hover{
     background: $lighter-color;
   }
-}
\ No newline at end of file
+}
diff --git a/src/components/charge/Settlement.vue b/src/components/charge/Settlement.vue
index ceb7580..b3946e5 100644
--- a/src/components/charge/Settlement.vue
+++ b/src/components/charge/Settlement.vue
@@ -89,6 +89,7 @@ const props = defineProps({
 const init = async (code: any, psnNo: any) => {
   if (props.disabled) {
     selectedIndex.value = 0
+    payType.value = 1
   }
   retailOrder.value = await post("charge/getByCode", {code: code});
   if (psnNo != null) {
diff --git a/src/components/outpatient/MedicalQueue.vue b/src/components/outpatient/MedicalQueue.vue
index b27a30a..9b807d1 100644
--- a/src/components/outpatient/MedicalQueue.vue
+++ b/src/components/outpatient/MedicalQueue.vue
@@ -207,6 +207,9 @@ const clickLi = (item: any, showBox: any = true) => {
 }
 const changeCurItemOrStatus = (item: any, status: any) => {
   curStatus.value = status
+  if (item != null) {
+    clickLi(item);
+  }
   init()
 }
 defineExpose({changeCurItemOrStatus})
diff --git a/src/components/registration/Edit.vue b/src/components/registration/Edit.vue
index 4bd6957..a2bd692 100644
--- a/src/components/registration/Edit.vue
+++ b/src/components/registration/Edit.vue
@@ -134,7 +134,7 @@
                         :disabledDate="disabledDate"
                     />
                     <el-time-select
-                        v-model="time"
+                        v-model="edit_data.time"
                         start="08:00"
                         step="00:15"
                         end="22:00"
@@ -227,12 +227,7 @@ import Quick from "@/components/charge/RecordsLog/Quick.vue";
 import {getCurrentTime, getToday} from "@/utils/dateUtils.ts";
 
 const height = ref(570)
-const certTypeList = ref<any>(
-    Object.entries(psnCertTypes)
-        .map(([id, name]) => ({id, name}))
-        .sort((a, b) => Number(a.id) - Number(b.id))
-)
-console.log(certTypeList.value)
+const certTypeList = ref<any>([])
 const edit_data = ref<any>({
   timeList: []
 })
@@ -257,7 +252,7 @@ const rules = ref<any>({
     {required: true, message: '请选择医生', trigger: 'blur'},
   ],
   certType: [
-    {required: true, message: '请选择证件类型', trigger: 'blur'},
+    {required: true, message: '请选择证件类型', trigger: 'change'},
   ],
   certNo: [
     {required: true, message: '请输入证件码', trigger: 'blur'},
@@ -279,9 +274,7 @@ const close = () => {
   isBtnShow.value = true
   time.value = ''
   edit_data.value = {
-    timeList: [],
     insutype: '',
-    appointmentTime: ''
   }
   isShowCard.value = true
   nextTick(() => {
@@ -298,24 +291,25 @@ const disabledDate = (date: Date) => {
   today.setHours(0, 0, 0, 0); // 将时间设置为今天的 00:00:00
   return date < today; // 禁用今天之前的日期
 };
+const timeList = ref<any>([])
 const dateName = defineModel()
 const save = () => {
-  if (dateName.value == '现在') {
-    edit_data.value.timeList = ''
-    edit_data.value.appointmentTime = ''
-  } else {
-    edit_data.value.timeList.push(edit_data.value.date, time.value)
-    edit_data.value.appointmentTime = edit_data.value.timeList.join(' ')
-  }
-  let data = {
-    ...edit_data.value,
-    psnNo: socialCard.value?.data?.baseinfo.psn_no,
-    insutype: edit_data.value.insutype || socialCard.value?.data?.insuinfo[0].insutype,
-    insuBalance: socialCard.value?.data?.insuinfo[0].balc,
-
-  }
   form.value.validate((v: any) => {
     if (v) {
+      let combinedDateTime = ''
+      if (edit_data.value.date == undefined || edit_data.value.time == undefined) {
+        combinedDateTime = ''
+      } else {
+        combinedDateTime = `${edit_data.value.date} ${edit_data.value.time}`
+      }
+      let data = {
+        ...edit_data.value,
+        appointmentTime: combinedDateTime || '',
+        psnNo: socialCard.value?.data?.baseinfo.psn_no,
+        insutype: edit_data.value.insutype || socialCard.value?.data?.insuinfo[0].insutype,
+        insuBalance: socialCard.value?.data?.insuinfo[0].balc,
+
+      }
       if (edit_data.value.id) {
         post('registration/edit', {
           data: data, mdtrtCertNo: socialCard.value?.mdtrtCertNo,
@@ -369,6 +363,9 @@ const socialCard: any = ref({
 })
 const quickShow = ref<any>(false)
 const init = (doctorId: any = "", id: any = null, show: any = false) => {
+  certTypeList.value = Object.entries(psnCertTypes)
+      .map(([id, name]) => ({id, name}))
+      .sort((a, b) => Number(a.id) - Number(b.id))
   isShow.value = true
   quickShow.value = show
   edit_data.value.organizationDoctorId = doctorId || ""
@@ -389,6 +386,7 @@ const multipleTable = ref<any>()
 const socialCardUpdate = (e: any) => {
   isShowCard.value = false
   if (e) {
+    console.log(e.data.baseinfo.psn_cert_type)
     isShowCard.value = false
     edit_data.value.gender = Number(e.data.baseinfo.gend)
     edit_data.value.name = e.data.baseinfo.psn_name
@@ -406,7 +404,7 @@ const socialCardUpdate = (e: any) => {
         edit_data.value.name = res.list[0].name
         edit_data.value.gender = res.list[0].sex
         edit_data.value.phone = res.list[0].phone
-        edit_data.value.certType =res.list[0].certType
+        edit_data.value.certType = res.list[0].certType
         edit_data.value.certNo = res.list[0].certNo
         edit_data.value.memo = res.list[0].remark
         edit_data.value.visitType = 1
@@ -465,6 +463,10 @@ const changeLoading = (e: any) => {
 const isBtnShow = ref(true)
 const changeBtn = () => {
   isBtnShow.value = !isBtnShow.value
+  if (isBtnShow.value) {
+    time.value = ''
+    timeList.value = []
+  }
 }
 const handleCurrentChange = (val: any) => {
   edit_data.value.insutype = val.insutype
@@ -557,9 +559,8 @@ defineExpose({init})
 }
 
 .small-btn {
-  width: 51px;
-  height: 32px;
-  line-height: 32px;
   margin-left: 5px;
+  height: 32px;
+  line-height: 1;
 }
 </style>
\ No newline at end of file
diff --git a/src/components/settings/item/group/GroupAdd.vue b/src/components/settings/item/group/GroupAdd.vue
index 863dc14..f365a28 100644
--- a/src/components/settings/item/group/GroupAdd.vue
+++ b/src/components/settings/item/group/GroupAdd.vue
@@ -225,7 +225,4 @@ defineExpose({init})
   padding: 0 24px;
 }
 
-.small-btn {
-  width: 50px;
-}
 </style>
\ No newline at end of file
diff --git a/src/views/outpatient/index.vue b/src/views/outpatient/index.vue
index cbc4d46..f89057f 100644
--- a/src/views/outpatient/index.vue
+++ b/src/views/outpatient/index.vue
@@ -104,7 +104,9 @@ const save = () => {
   } else {
     post('medical/record/save', {data: data}).then((res: any) => {
       ElMessage.success("接诊完毕,请到收费页面收费")
-      medicalQueueRef.value?.changeCurItemOrStatus(registerId.value, 3);
+      debugger
+      medicalQueueRef.value?.changeCurItemOrStatus(res, 3);
+
     })
   }
 }
@@ -113,7 +115,6 @@ const medicalHistoryRef = ref()
 const patientCardRef = ref()
 const patientRegistration = ref<any>({})//  当前挂号信息
 const clickItem = (item: any) => {
-  initFormData()
   if (!item) {
     medicalHistoryRef.value?.clearList();
     return
diff --git a/src/views/registration/index.vue b/src/views/registration/index.vue
index 7d2ea81..2f1c020 100644
--- a/src/views/registration/index.vue
+++ b/src/views/registration/index.vue
@@ -104,7 +104,6 @@ import {Search} from "@element-plus/icons-vue";
 
 const dateName = ref<any>('挂号')
 const selectDate = (date: any) => {
-  console.log(date, 'date')
   dateName.value = getActionText(date)
 }
 const getActionText = (date: string) => {

From a9093c59d1a4051e257690cb3bd90005511dfeb7 Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Fri, 23 May 2025 16:13:33 +0800
Subject: [PATCH 06/33] dev

---
 src/components/registration/Edit.vue |  4 ++--
 src/views/settings/item.vue          | 10 ++++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/components/registration/Edit.vue b/src/components/registration/Edit.vue
index a2bd692..fd91d94 100644
--- a/src/components/registration/Edit.vue
+++ b/src/components/registration/Edit.vue
@@ -248,8 +248,8 @@ const rules = ref<any>({
   phone: [
     {required: true, message: '请输入手机号', trigger: 'blur'},
   ],
-  organzationDoctorId: [
-    {required: true, message: '请选择医生', trigger: 'blur'},
+  organizationDoctorId: [
+    {required: true, message: '请选择医生', trigger: 'change'},
   ],
   certType: [
     {required: true, message: '请选择证件类型', trigger: 'change'},
diff --git a/src/views/settings/item.vue b/src/views/settings/item.vue
index 78c7bb3..caacb36 100644
--- a/src/views/settings/item.vue
+++ b/src/views/settings/item.vue
@@ -17,8 +17,14 @@
         </el-form>
       </div>
       <div class="title-btn">
-        <span  class="default-btn" @click="initData()">查询</span>
-        <span  class="default-btn" @click="resetSearch">重置</span>
+        <span  class="default-btn" @click="initData()">
+          <span class="iconfont icon-RectangleCopy1"></span>
+          查询
+        </span>
+        <span  class="default-btn" @click="resetSearch">
+          <span class="iconfont icon-RectangleCopy"></span>
+          重置
+        </span>
         <span  class="default-btn" @click="openDialog">新建项目</span>
         <span  class="default-btn" @click="openGroupDialog">组套</span>
       </div>

From 66d6b833b5309911a77436271d1ab8c560ebc691 Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Fri, 23 May 2025 16:34:44 +0800
Subject: [PATCH 07/33] dev

---
 src/assets/iconfont/iconfont.css  |  15 ++++++++++++---
 src/assets/iconfont/iconfont.ttf  | Bin 1964 -> 2332 bytes
 src/assets/iconfont/iconfont.woff | Bin 1328 -> 1592 bytes
 src/assets/scss/main.scss         |   4 ++++
 src/views/inventory/supplier.vue  |  12 ++++++------
 src/views/settings/item.vue       |  20 ++++++++------------
 src/views/settings/log.vue        |   2 +-
 src/views/settings/member.vue     |  30 ++++++++++++++++++++++--------
 src/views/settings/section.vue    |  16 ++++++++++++----
 9 files changed, 65 insertions(+), 34 deletions(-)

diff --git a/src/assets/iconfont/iconfont.css b/src/assets/iconfont/iconfont.css
index 6b5ed31..73194f6 100644
--- a/src/assets/iconfont/iconfont.css
+++ b/src/assets/iconfont/iconfont.css
@@ -1,17 +1,26 @@
 @font-face {
   font-family: "iconfont"; /* Project id 4921806 */
-  src: url('iconfont.woff?t=1747274949107') format('woff'),
-       url('iconfont.ttf?t=1747274949107') format('truetype');
+  src: url('iconfont.woff2?t=1747988318985') format('woff2'),
+       url('iconfont.woff?t=1747988318985') format('woff'),
+       url('iconfont.ttf?t=1747988318985') format('truetype');
 }
 
 .iconfont {
-  font-family: "iconfont", serif !important;
+  font-family: "iconfont" !important;
   font-size: 16px;
   font-style: normal;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-qunzutaozhuang:before {
+  content: "\eac9";
+}
+
+.icon-jia:before {
+  content: "\e6a9";
+}
+
 .icon-RectangleCopy:before {
   content: "\e6a2";
 }
diff --git a/src/assets/iconfont/iconfont.ttf b/src/assets/iconfont/iconfont.ttf
index dd739fcd09cf3f7ce4e911301da3d1adefe7a829..be1dd0a68b02b8ee3e9daf670356a883225e84be 100644
GIT binary patch
delta 770
zcmYjOO=uHQ5T4nW|8#dv+zmpon`~?nXi|vzDMFEgP(_eb(1WMC)HG4@XPZFnB_};8
zRN_Uj5wswIiZ=1sgC0{nc=k|xC=o)z3VQ6;*<BCa<(oJ2&G)^Xw{J^)<zH7@H(mnZ
zQvkTTSkdbHUtjM6a8zQiSbnrLmW@vXu+PN3C>6AOle_E-HTMa*5)sZl_Jr~s!i7?$
zu_{qQ-a`sfxwfd`JbowtC#uIP+G-uo!Y%5bqdHX8Dupw_w=*9B97J-(dTpigyW9H(
z;4(H`c)k<4Vh5y@kn;B5Er>IJ!D}M|;NbR;z0<1=n2TzcIlR#@e0I17wzi5}+-T7L
zhVk|h2JbAJEr2pGGfU9wA^kGgV3tfCa}#d(X1F=*js_<u0H<?O7!Q)pdg*-R<N*8g
z9FMJ8vkgR%%>oHvxM{)UyOa}*Sw{m4|Azutf^`_-bwfux&v6G3gcwZ2Rr+QoI*D?6
z9A%&6h=kQ>EE|!fKstOem&J58qB_oFE1kWJ6Pai%ETGdjj%G7r$+Nypj_QES=8{S(
zB}kH}_e2Tfi4f+Mq+ZzA2qoeuA(sg0+e!j4p<tdUS=6@$Sr#xa%6MdIOhyu?rj%q-
z!IgMY>2yTtvC=YK`UitHEjNv5-3n8=_uvJ(eWc;7StJLlQDZO~i%!M7$0N5OxVZpD
z{m{+xexAps5&gXWhxeEb_wmTXTYrqT=-w{@OvIw9hywOI>?c#~$RR@;+R*{R!)A4@
V+0bfhrKVObvIqCI_A{q~@DEa>oR<Iq

delta 411
zcmYjNK}!Nb7=7Q&rb`J%Cn2J+4nm$fbdn$<sGwsIA=aYi9^5qAgLSEcNQa=pYbW#Q
zA+SS)f1!weKuE-%x&|E-d%IFJ!<+ZLH}9Jn=4PT5y^5c%yMSB(*vmRr*`9ixp#COm
zh2rtPnb~>=^f|R_=dIlQ{n90~U1HIu5q{HE)*WKbcHByY1+$-ABE?eH!VVtUe@1OO
zR;4UaY;r$FJ#%0=`SHoy)E!{-097cLj@+k*=Mx~DV_@yNGrOW8EQx9?UE7VOzA$Fc
z06sSQtN+=6HmOZ0-{tW8G?t<2acL>9S$~m4n%+p@14%NEl1z{Uwwd;OlH}3AH-b!v
zDS`4DUUM)2ewj%@h|_1@DWUeEQnG;I7bNKWgF9Yh2>*1iImF*9`9JNh(buLHC0Y#B
Hd*<{HfzVIb

diff --git a/src/assets/iconfont/iconfont.woff b/src/assets/iconfont/iconfont.woff
index 357b10f529390b975f45168bf8e865b09b7d1875..207812b209ea7eb71f712e9c3265ef271346a451 100644
GIT binary patch
delta 1120
zcmdnMwSz~b+~3WOfsp|S*en>hK{Th#L=n4s-<ip|i3JP{j2%Fs93Z{v!I}A|(sL@)
zfb1^}3`}M~JcY+p!#pE3F@=GFMF*%(7l_TYPca|N015)dVt{-ZAXZ_&$J~~YTT%fO
z17Zd~AQlk;5;^(FAax)+ctDsjfbmvtVnqRiIRncSpnyCOD=-Q(gybdWrUDgi0b1?=
zv^ZU0vCW2p{NfS@2G%b?HBLYr|8eD}_mepoGwVwy?R;3z%*^~*mQCU0fsREToD97(
zyyq+Cyq$QEw?To&HD0t=vG0)p&y$lAdBoil1^M(AE`9nypzagL-^}VC48jIlvxOY^
zT9(De8rG}KlJ|&m7h`Lyx)!s3w+(;I{n$mdb+^7P5Z>jTR=2ind0gwXd6(-JrXBxt
z`r?}%-OYRIcWNszSIp53Jnt>-C^0wRExp`i_v~Kl+5f!E)OM^c-JG#$=31}ITfAI)
za#+2CGZ%(LSLwQTg=mOGuMpv9ed)RKy3@vQ`(N%=e|gY(z24lMIgRFLzVDN~S1m8)
zP&Co(U-LR;e%A~^MUK0k556iDTwXNw;-=T8T6Z?RUTk`?p{jmy&@$FalSG}8y@9eK
zn>jSYUzVGn2{^I)tmp1mKK`$#rK;@b;Xd|P=!l<bWnD$Yr{f2i-b|kqe4PD*Y)5LR
z^vRXycJggJ_|WF9r}i{K7Qd~p4!r)js<<R2LjG6(q{(rnwHt3aw*>2_{$b`_tbM6n
z<nr{Sz!$G4ty-dPR8x4Yq<(H<bke8knNfb16IQod>i%5LyOd?Oh4dwXCH4E1wPrbH
zoGCud_ToWRk-JislS<c&+g!R$9WKf|8<dzAa-F?hIn&G6rE<5L)27-*Gq|pleNPkD
zdfIsK)zxn<zZ230Ke?PtJGu4h-}fIwVmR1Wnr}4vsgsk(di=_jJM*VZdO2IUK5oMn
ziTm^Acc<PnxL!8>xsvH>jaPG9+2iLw^V)eW<@w3QSGR5m_@dsoGHuamnO#53wH8i0
zvyh{!PrIn^&Z2j@97koYEU}B3{OhR%bEk#=n;K=2GR7w&OZPHNUn(r?F?;2V{JK8*
z`q__c4tE&!xbMohe_K*~V@JjLkfi)~rPuoFgC-d!m2S7sE7zUFI$t8^=h?eor|L`k
zo}ROrXYu#AGiUbA3BPG~Zk6}?Sq%Kv?9)}$oY(Rynnn5i<-ggH@5R7SF()}8B_V+!
z$@$&c(~p1V?lUUbY|wCE@`c~uCuEATrST~oJ$QiS5hH`t5>6jr%7?1Y`*Ht(z~Ms-
z9!w6CCNhd{U}A9RX37IfCMF~#I38wTWML2mss@2Hh6xO>7`>nx6H-4UBqTC0swq5U
za$;-ypJ2z#AYjUvvH38w52NMOiJcQ?PHdexbz*Ph`VA)QS8Y)-+^@CR#87{(rMB@z
ea}Cp-EGN!+mY&mJ@x=L|q>%vw!)s0<APE3yB*{|%

delta 854
zcmdnNvw=&b+~3WOfsp|SSPdAsK{WfCi6VCOo+Zh-i3JP{j2%FsFd*HQA$v(EJ*P4a
z$bJCCAi9JjF7#1GYGMil1G5KEoemJ2X>YOX&j1Pn#Y%vD86Z|+zsKB?ky}y$6q^9#
z^MEjj$jMIzshb02a)5CZ!>-)KiUJ062IeI|0XZO6VB}};%}dNp1u8rOwA6utfhk>J
zvCW2p{9>R5tSmq^Ad5ZD?l@O9nS(L2ep}1VhxN?N%%5f16iy!KSk%GE&{530tYXgF
z2?u!_40xFJGhZ?ra`3Y~I$E$|b7}9RWgA$h>4nYN!=vLM)P5pC{Mdz+SCstMOnm-B
zv*_^cyIJo)>`d7;wcxtOpIb@q-alKs_GHGktDOHBZZr$UF)&oj(e3y4W(t%!`u_jD
zJ>_}zKW7-Gw<)m)&N(RO?E84GT*@~GK~dozHO-E$jN3|1LQNACIK>;cbl=*xa{cA)
zFSuEFFIg6t?LYfo!NKu_?8FONPLZd5jw^626TKoF$7qw75So02;bG^V>|`-kH_5A}
zcN<dOD|S8Om|kKx^U#5pU$2)Lzub7?P>5!@RN3hT!u4vWQ+8SY$j~vHl-Cip^Vgk~
z(L1)?Unyj`UqjV<^W<r<n&#iiHff*gx%4XZx~*rL&#gOm>n%H%KRUYe*2l!nPt|&V
z-m&i0;CMK3bN~K8E>S@y<_MAWOUst3t=P%9E`nYC!(qP%@eONab*{B8dmg(`RngJ-
zpsn=sX7xY?RlUTo^?z0te%ZESRifVwmU&<D<#*S~9It!7(`C!&y0w3;n&wPyxnKF>
z2dB<qo6e7~&W7#&C)4M0$lm76%Wp?t-Fn)0ggs)KRyb=z^Q{l^Nk(xt!jIORSZW_~
z$1Wcf)X51c2?-33#5!ketEij3p68AZkHUu|uh(lEojr8m4C4|Di5X!IHVpq=IW(Y(
z^M2evAaM8)1Czs~iHxEK%na_FOgW%L1H(Wj0|PMOLDeUu6{I92F)#|8WNqQ$`G2s6
zje%c@F_vNTW)>et#hDX3C(fMM+Gws}x>Lna-&Xyq<^Bbe_*>IY9AIGB9>8@101a$R
AN&o-=

diff --git a/src/assets/scss/main.scss b/src/assets/scss/main.scss
index 27d71bb..bfc7774 100644
--- a/src/assets/scss/main.scss
+++ b/src/assets/scss/main.scss
@@ -143,6 +143,10 @@ $lighter-color: rgba(#4D6DE4, 0.5);
   color: #FFF;
   font-size: 16px;
   text-align: center;
+  margin-left: 10px;
+  &:first-child{
+    margin-left: 0;
+  }
   &:hover{
     background: $lighter-color;
   }
diff --git a/src/views/inventory/supplier.vue b/src/views/inventory/supplier.vue
index 40618fe..d7e1245 100644
--- a/src/views/inventory/supplier.vue
+++ b/src/views/inventory/supplier.vue
@@ -33,18 +33,18 @@
     </div>
     <div class="content">
       <el-table :data="tableData" style="width: 100%;height: 100%" @row-click="editSupplier" :header-cell-style="{ backgroundColor: '#F1F5FB' }">
-        <el-table-column label="供应商名称" prop="name" width="250">
+        <el-table-column label="供应商名称" prop="name" show-overflow-tooltip>
         </el-table-column>
-        <el-table-column label="启用状态" prop="turn" width="150">
+        <el-table-column label="启用状态" prop="turn" width="150" show-overflow-tooltip>
           <template #default="scope">
             <el-tag type="success" v-if="scope.row.turn ==1">启用中</el-tag>
             <el-tag type="info" v-else>已禁用</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="许可证号" prop="licenseCode"></el-table-column>
-        <el-table-column label="联系人" prop="contactName" width="100"></el-table-column>
-        <el-table-column label="联系方式" prop="contactTel" width="150"></el-table-column>
-        <el-table-column label="备注" prop="remark"/>
+        <el-table-column label="许可证号" prop="licenseCode" show-overflow-tooltip></el-table-column>
+        <el-table-column label="联系人" prop="contactName" width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column label="联系方式" prop="contactTel" width="150" show-overflow-tooltip></el-table-column>
+        <el-table-column label="备注" prop="remark" show-overflow-tooltip/>
       </el-table>
     </div>
     <div class="bottom">
diff --git a/src/views/settings/item.vue b/src/views/settings/item.vue
index caacb36..ba2f9fd 100644
--- a/src/views/settings/item.vue
+++ b/src/views/settings/item.vue
@@ -25,8 +25,14 @@
           <span class="iconfont icon-RectangleCopy"></span>
           重置
         </span>
-        <span  class="default-btn" @click="openDialog">新建项目</span>
-        <span  class="default-btn" @click="openGroupDialog">组套</span>
+        <span  class="default-btn" @click="openDialog">
+          <span class="iconfont icon-jia"></span>
+          新建项目
+        </span>
+        <span  class="default-btn" @click="openGroupDialog">
+          <span class="iconfont icon-qunzutaozhuang"></span>
+          组套
+        </span>
       </div>
     </div>
     <div class="table">
@@ -125,19 +131,9 @@ const loading= ref(true)
   background: #fff;
   display: flex;
   flex-direction: column;
-.title-btn{
-  .default-btn{
-    margin-right: 24px;
-    &:last-child{
-      margin-right: 0;
-    }
-  }
-
-}
   .title {
     display: flex;
     height: 60px;
-    align-items: center;
     justify-content: space-between;
 
     .title-search {
diff --git a/src/views/settings/log.vue b/src/views/settings/log.vue
index 5ac2caa..fe21471 100644
--- a/src/views/settings/log.vue
+++ b/src/views/settings/log.vue
@@ -13,7 +13,7 @@
           />
           <el-input placeholder="请输入内容" v-model="searchModel.managerName" style="width: 180px;"></el-input>
           <el-input placeholder="请输入内容" v-model="searchModel.message" style="width: 180px;"></el-input>
-          <span class="default-btn" @click="getData">查询</span>
+          <span class="default-btn" @click="getData"><span class="iconfont icon-RectangleCopy" style="margin-right: 5px"></span>查询</span>
         </el-form>
       </div>
       <div class="right">
diff --git a/src/views/settings/member.vue b/src/views/settings/member.vue
index 148ab4d..7489a4d 100644
--- a/src/views/settings/member.vue
+++ b/src/views/settings/member.vue
@@ -25,9 +25,15 @@
         </el-form>
       </div>
       <div class="title-btn">
-        <span class="default-btn" @click="init()">查询</span>
-        <span class="default-btn" @click="resetSearch" style="margin: 0 24px">重置</span>
-        <span class="default-btn" @click="openDialog(null)">新增</span>
+        <span class="default-btn" @click="resetSearch">
+          <span class="iconfont icon-RectangleCopy1"></span>
+          重置
+        </span>
+        <span class="default-btn" @click="init()"><span class="iconfont icon-RectangleCopy"></span>查询</span>
+        <span class="default-btn" @click="openDialog(null)">
+          <span class="iconfont icon-jia"></span>
+          新增
+        </span>
       </div>
     </div>
     <div class="table">
@@ -49,7 +55,7 @@
         </el-table-column>
         <el-table-column prop="sectionNames" label="科室" show-overflow-tooltip>
           <template #default="scope">
-            {{scope.row.memberInfo.sectionNames}}
+            {{ scope.row.memberInfo.sectionNames }}
           </template>
         </el-table-column>
         <el-table-column prop="memo" label="备注" show-overflow-tooltip>
@@ -71,7 +77,7 @@
         />
       </div>
     </div>
-    <MemberEdit  ref="memberEditRef" @close="init()"></MemberEdit>
+    <MemberEdit ref="memberEditRef" @close="init()"></MemberEdit>
   </div>
 </template>
 <script setup lang="ts">
@@ -88,7 +94,7 @@ const memberEditRef = ref<any>(null)
 const rowClick = (row: any) => {
   openDialog(row.memberInfo.id)
 }
-const openDialog= (id:any) => {
+const openDialog = (id: any) => {
   nextTick(() => {
     memberEditRef.value?.init(id)
   })
@@ -190,10 +196,18 @@ const resetSearch = () => {
     justify-content: flex-end;
   }
 }
-:deep(.el-input__wrapper){
+
+:deep(.el-input__wrapper) {
   height: 42px;
 }
-:deep(.el-select__wrapper){
+
+:deep(.el-select__wrapper) {
   height: 42px;
 }
+.default-btn{
+  margin-left: 10px;
+  &:first-child{
+    margin-left: 0;
+  }
+}
 </style>
\ No newline at end of file
diff --git a/src/views/settings/section.vue b/src/views/settings/section.vue
index 23bfe71..7e9cee7 100644
--- a/src/views/settings/section.vue
+++ b/src/views/settings/section.vue
@@ -18,9 +18,18 @@
         </el-form>
       </div>
       <div class="title-btn">
-        <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>
+        <span class="default-btn" @click="resetSearch">
+          <span class="iconfont icon-RectangleCopy1"></span>
+          重置
+        </span>
+        <span class="default-btn" @click="init()">
+          <span class="iconfont icon-RectangleCopy"></span>
+          查询
+        </span>
+        <span class="default-btn" @click="openDialog">
+           <span class="iconfont icon-jia"></span>
+          新增
+        </span>
       </div>
     </div>
     <div class="table">
@@ -191,7 +200,6 @@ const getDeptDisplayName = (code: string): string => {
     height: 60px;
     display: flex;
     justify-content: space-between;
-    align-items: center;
   }
 
   .table {

From 0839a6094fbfeecd0dbbfa6b6949ce95f4a58d38 Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Fri, 23 May 2025 16:41:04 +0800
Subject: [PATCH 08/33] dev

---
 src/views/settings/item.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/views/settings/item.vue b/src/views/settings/item.vue
index ba2f9fd..b273ab2 100644
--- a/src/views/settings/item.vue
+++ b/src/views/settings/item.vue
@@ -137,11 +137,8 @@ const loading= ref(true)
     justify-content: space-between;
 
     .title-search {
-      padding: 10px;
       border-radius: 10px;
       box-sizing: border-box;
-      margin-top: 10px;
-      margin-bottom: 10px;
       display: flex;
     }
 

From 6541a1ba341bf4515d74cf09bae437366e93a425 Mon Sep 17 00:00:00 2001
From: NiuZiYuan <niuziyuan@jizhiweb.cn>
Date: Fri, 23 May 2025 16:48:09 +0800
Subject: [PATCH 09/33] dev

---
 src/components/outpatient/MedicalQueue.vue |  2 +-
 src/components/registration/Edit.vue       | 44 +++++++++-------------
 2 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/src/components/outpatient/MedicalQueue.vue b/src/components/outpatient/MedicalQueue.vue
index 9b807d1..359c83d 100644
--- a/src/components/outpatient/MedicalQueue.vue
+++ b/src/components/outpatient/MedicalQueue.vue
@@ -38,7 +38,7 @@
                 </span>
               <span class="item-name">{{ item.name }}</span>
               <span class="item-time">
-                {{ formatListTime(item.createDatetime) }}
+                {{ formatListTime(item.appointmentTime) }}
               </span>
               <span class="item-type">{{ item.type == 2 ? '医保' : '自费' }}</span>
             </li>
diff --git a/src/components/registration/Edit.vue b/src/components/registration/Edit.vue
index a2bd692..1f385a8 100644
--- a/src/components/registration/Edit.vue
+++ b/src/components/registration/Edit.vue
@@ -385,32 +385,24 @@ const tableData = ref<any>([])
 const multipleTable = ref<any>()
 const socialCardUpdate = (e: any) => {
   isShowCard.value = false
-  if (e) {
-    console.log(e.data.baseinfo.psn_cert_type)
-    isShowCard.value = false
-    edit_data.value.gender = Number(e.data.baseinfo.gend)
-    edit_data.value.name = e.data.baseinfo.psn_name
-    edit_data.value.certType = e.data.baseinfo.psn_cert_type
-    edit_data.value.certNo = e.data.baseinfo.certno
-    edit_data.value.age = Math.floor(e.data.baseinfo.age)
-    tableData.value = e.data.insuinfo
-    edit_data.value.type = 2
-    if (edit_data.value.certNo) {
-      post('vip/vip/list', {
-        keyword: edit_data.value.certNo,
-        page: 1,
-        pageSize: 50
-      }).then((res: any) => {
-        edit_data.value.name = res.list[0].name
-        edit_data.value.gender = res.list[0].sex
-        edit_data.value.phone = res.list[0].phone
-        edit_data.value.certType = res.list[0].certType
-        edit_data.value.certNo = res.list[0].certNo
-        edit_data.value.memo = res.list[0].remark
-        edit_data.value.visitType = 1
-      })
-    }
-  }
+  if (!e) return;
+  isShowCard.value = false
+  edit_data.value.gender = Number(e.data.baseinfo.gend)
+  edit_data.value.name = e.data.baseinfo.psn_name
+  edit_data.value.certType = e.data.baseinfo.psn_cert_type
+  edit_data.value.certNo = e.data.baseinfo.certno
+  edit_data.value.age = Math.floor(e.data.baseinfo.age)
+  tableData.value = e.data.insuinfo
+  edit_data.value.type = 2
+  if (!edit_data.value.certNo) return;
+  post('vip/vip/list', {
+    keyword: edit_data.value.certNo,
+    page: 1,
+    pageSize: 50
+  }).then((res: any) => {
+    edit_data.value.phone = res.list[0].phone
+  })
+
   nextTick(() => {
     if (tableData.value.length > 0) {
       height.value = 820

From 19d901e4579f61dfb8593bcc29678ccec04264d4 Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Fri, 23 May 2025 17:06:42 +0800
Subject: [PATCH 10/33] dev

---
 src/assets/iconfont/iconfont.css              |  10 +-
 src/assets/iconfont/iconfont.ttf              | Bin 2332 -> 2556 bytes
 src/assets/iconfont/iconfont.woff             | Bin 1592 -> 1740 bytes
 src/components/outpatient/MedicalQueue.vue    |  14 ++-
 src/components/registration/List.vue          |   3 +-
 .../settings/item/group/GroupList.vue         | 118 +++++++++---------
 6 files changed, 77 insertions(+), 68 deletions(-)

diff --git a/src/assets/iconfont/iconfont.css b/src/assets/iconfont/iconfont.css
index 73194f6..db80712 100644
--- a/src/assets/iconfont/iconfont.css
+++ b/src/assets/iconfont/iconfont.css
@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 4921806 */
-  src: url('iconfont.woff2?t=1747988318985') format('woff2'),
-       url('iconfont.woff?t=1747988318985') format('woff'),
-       url('iconfont.ttf?t=1747988318985') format('truetype');
+  src:
+       url('iconfont.woff?t=1747990278440') format('woff'),
+       url('iconfont.ttf?t=1747990278440') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-yuyue:before {
+  content: "\e606";
+}
+
 .icon-qunzutaozhuang:before {
   content: "\eac9";
 }
diff --git a/src/assets/iconfont/iconfont.ttf b/src/assets/iconfont/iconfont.ttf
index be1dd0a68b02b8ee3e9daf670356a883225e84be..31dec3822b5ea2a4166eb128d21f3a5d5417ab1a 100644
GIT binary patch
delta 732
zcmZ8dO=uHA6n<}Kced5iSd-lZ|JtUqTQGWvVFNXYM->GHy#>>y`B|Z9Q*5<?%En7i
zQq*`6Jk=iTMT8!D@!-LOK?OZ{6Z9Y}1_>VOt+>9~O<L+3KIZ*>-+MDp4{k>vjJiiI
zKLNn|05CaKwQI{Gk2(O7Ou4s}>3aF$)x)0w*cZYTr(_pTyo>fz?>B<wP(uC6mdSrb
zIPO&E7Zc$7#QjBaVtRJUmbRn;;=ZSNuxc;XFb3DCo}hSS#;%s!1J80V0n`)?t<+|3
z&3`geHv#$|Q$q!is13gXd6{H=Uq+GHV?4-EHmZNPTZrWTz<%1D?ECc}VzJ;Rsw*SA
zM`0gGB1<NeI5daxg~{8kV2pUDXcDDe6Q2QMf#z=<t1NY^w}Ay-itc?xS)!JU)Ho1~
zkUj3LdTZW#yCwc(Z?q$g)ZIH`stgLL(Spb~<|GMSstUW*Whg=^gqZEEh9DkzYavJh
zy!8;I1?^Ud?z3;e8|dJ9d`^mN=UWnR63)=nq&kQykHwE+Tu*1uqMNlc<|#A{mNX61
z$Yiaom5%FiJ*IM%N5_UTMv`koqiHK+NZ=ImE9UsPxsoq@+;yEh<>EvxH&HBidd|5`
zZCFEyXc}w$-ySlzF9d``Jw`yqP2%W!<gcJ_yk<w07)J>i%BUbm6_olyeWBF+*?0OM
Duk@tL

delta 507
zcmY*Vze~eV5dJPdYHb6G?cgFRbr5tBQI`&#1)+m(N)5F?hQ=1{P^Z?#$)QjO1wm*F
z(nX{dTpV;v@h=dm9V9~#M9@vB_mT+u!o9ou?z`{a<vVmfR-G>2uAKpN3}8EH=!O2{
zMHi4brFJHFkk*!FR{;5*v6E~{-<j*m4_xfCEoT`R>d8kO-?7bPjbbUx0r$S~70%_8
zI>qUU`)@ec482sK5Z1Xq&iT}?Zlubijp#MtV^GQz^83Y)R{I_B3&8}4TPuSKHWf|*
zz8U#<R0m;nA=tT0j6}Z>bh)n^FFnEh^$KJ^r+#NQQ4mThYLj#osoSPA2J$m1UWuJ|
zBq3P)q{!BuH$Dg1iRRe{SZR-67GqMtk(aEx)wEi+IT!$cV^5Em=YG5$cS=Hwe2qhi
z;!M#TTFfK!Y^&}XlVLSo6TiZ0xh6KUP1n2!0%=rX(`x5bnNT&AB$7!Xm3*j~!;3!@
C3uV~=

diff --git a/src/assets/iconfont/iconfont.woff b/src/assets/iconfont/iconfont.woff
index 207812b209ea7eb71f712e9c3265ef271346a451..0d2c7029d53c17198134cd641adc4e1925cbe921 100644
GIT binary patch
delta 1238
zcmdnNbB0%>+~3WOfsp|S*v>F;gJ{k_6Gd$6WqfBQ=Oz{~Ffeui#Y%wmi8h5v@6vNB
z(}3(h3=B*w85o!YCI(7h%}7m5VPIfc0aRxQ#Ae#3g*h{Tf<Uo5K)xIhtFYf^Zp+9m
zsQ`)r^)iS6v4jM}|NlAp$v}0i0zf_=2s3?Q;>k^{D6jwuDgXuKfmnf2gdrp^F*g+`
z<^Z%Dh?&v_7Tatn$S(#ujI9Bv#tVqkFRJTgPUc`tuiv=W>g1gd`x_e@fATpi2h0$3
z6%=Nu^5!+EnDchxLC#hO9+&t#p)NW{y^d7bMD|u}6p=o8P|f7#AN?E6!f^?0I^3KA
z%qJy!cs42QNb_F$q;uVqnHOvPy<M-lh2Jf)?|<F2y;{ZWuYUQ>I`3~%nLn;fxBDCO
zHkzmA{VujT;k)%sMw{8|Hh<<=k$1^eg{xvt?8N*2mjgtOzuzgI7ro%ERh4ypu54^Z
zdk$~Uy2*{jT#||oYMjSB4J2l^geP+-PFld`tCGgAc0|2n&n$@};{SN#Yrl6&9B%Fp
z+Vk4L?RP;{Rh`NG_dgYi%F4FgWP4({t6@_Hi{b_rR+d%Ag#?W2i&}+5YR(rP+}Qc_
zM&Db}KTY$yB@La$S2*kro|PUwCDYdO{$|6d$e0X^ms>7JMEv<=9vd0GPTbwS`|DHr
z`bnPzjU^SP8h(27|6|y%>`(Js4H}jAB}rsmxZ{@FVZWql|H9KJ99c~cUac;(->{Iy
zz<2pdxzlBzG?z&`$Hd9CeX7^&KK64p%iei!zZA@mVmcJJ%5?5^oB8$9Jt3Q(Jy@{l
zb=HT-tBP|yovxl?>n|&xJk#VwgYn4+7tS!G_^kLO6x{6GYRI}ut9f#P+L{-uUeCI@
zhSUF2WO2U#)%b1Gnwry0@65<`YjM^W``2M*$;lGq<K5-AaB27INAo<MzudS)qh83Y
zf@h!iCYh<J5xK`!$o!dNeW<OZ>W-o^$N!z4E+#zz>yx9kG!o1;i#mKaaGv35RBKQ^
zTdl`;kbBDEr{O1mvYxyD{lu@v1)LLZ-_q+_zGmCEH%GnVQ`3`~l3Y4mPAt87to@aP
z>AS7L%k!80Ul<-$`hBI^?fDw2&EdOc%ZnD(S5>e1KC8@i_U&0xnjM0U0{K1nE59qu
z>Y4U?`TP5`=YD?F>2u$1s%c4GyVSp~Nh{90pTOXFQ1jfxmsj@j&9i5+T*v=>M_u2=
zr-H|8l&5{KQRbVYwEcNfw{>7ch>GCmU$b8w`ptN3mx@x!qj$G1Uzgsh5#}H7p=9{#
z_T|sjiNTZVJL012x5iyAWHEA?y6jrsx$}G8PI|gdc%}EE?bF)3wUZZJIUrd0sgU!*
zyD#S|g(vrYn)F_Os_IAcmxt#?0W(s?oaBU*gan49#EqM`e*9w=FS#R9!r_7Ei_c~f
zfB*mgUnS=D%uQi>b0en;7lZ3@o_d6yydU=u2!tO#^g*5@LPD}ZNuz<6VZl+h9I&B@
z2?+^_KmN~W^-(rpP;q4v2kK*Bh+{ay@Q%@g5m<geElx=O0944psHX6Y$%(D)e}Ww|
vgFpad=H|^TK8zy06FVo)oY*>X>crlOa~rpA+Oo-H>SS&<b+&XH5ui%|S`-a=

delta 1089
zcmX@ZyMsrh+~3WOfsp|S*en>hK{Th#L=oHi?Y=XUa}x^~7#KT%VmUy1(}OefPo?Kn
zrUBVs7#Nt$fOrazsfKw*YGMil1B(t&oh}fYX`f;~m;n?7ip2o=GC-`tevi2=Be$di
zC<ep~d_XKB0wi+slR@f0cJP2OV*ul=+{B6k3!vZ>pnyCOD=-Q(gybdWrUJ#b04;X_
zTAVJh*k(gPesKu{1M3%{8Ydu*|G09~`^g-P>Gir*rIU6(tY>Cs{w&L;aPmOMq7F`m
zUK!r=6?5KBJjmOiz~dS(+N;?2NPy?b$%#DT?umkYdJC66eIQWxiQ{i(^$!MN1FhLY
z4ty=kVq*>KRc6V1M7fKxwN+h<S-;zczvh1IqT0G!-xdh(@=mK;Tedu|b=thkbqmvu
z|2ci}&5rK+<~=*L6__jL=mwtmmUfhwo9~uhZnArJul4MIUS?`LR+nzh*fevk*X1o<
zE<HJ{-ocp*L!zs6UAsawM50%S@Uy=3TzTDT<G1}U_o}}<=)7KUZqA%W^E2P~N#3iL
zmvShYX!fspoie{`hM*$HUC#$!l?pB|ntE~5Yg4T|n_e$Ay;$E+wK!-QYo$q|PRZUt
zS&_{gn&B_Y&Cdj!*nQS>_bVU&*V9r}_VaKb`zv(B&$P0xBI48WgG_IxPYOQH{z0}Q
zwNv`!%5yvUHXeLv^VU;)njnkc)>j8!e_T~uk`f{RtAEnuIMdpVx13vo^;7>a^DfrD
z)Gl&)dQ#wv*OOK)Q8%h7tUp#VH!(Wt)AY<Jzsm`$+bwl}F6Uj!vfD!XlE9Mseac$1
z95c=opJsdUpsL7SDa%QvYsPIZ-KGu~Wu6U6%nP~B-maYK<?B+pTg_=x?V=f6SIWMp
ziEBM=JoxJBH<#ZD>4KkJPNtpQdiC%7k0CJ}>?_ST8vWGC$zwf!<;tD;QzpHvpRF9X
zVT;85`SQC{?-^V#oBmwMbhXB-xvlK+^PhR`yq5C(<l?JaHw1i9?^~I+=(NnPALd#M
zr=3~I(bcD2)OTmmyIhW=GFO(^#Z3P7RD!wFLjO&TvPc=@6OpBR8Ky54mi3suaz=h#
zpM3r7M>dB$jC$O6<=ek4DZa6z;(SO_{=3rpYyCl!43kQ?+vk<*&S9M|k@NHH-LF&i
zC4EoN+03)}d)%2b`{sn-v^%%Td;Kg1erxvWDr(Mac@@o~eE#y^?8x_GV5pdroRE@`
zz>wtp?(FHuKXdmP6>K(WI57Fb@9z^b#n{sL6pkJ|!19QZL23!74>0XR)#v@Ve?Z`{
z*C7Tbhe;C|MK>@pxN|e*0VNX?5)vE_Gcd9+hyqoEKpMjYhF6SUP>l(x9}*H085q?R
xo-sMGwf#@9V`dOAWz5)Y&+5a-Gj(F;#F-OYCr+K%+c<eXn>yQTP9XyZ1^_^jyWao+

diff --git a/src/components/outpatient/MedicalQueue.vue b/src/components/outpatient/MedicalQueue.vue
index 359c83d..1e6dae3 100644
--- a/src/components/outpatient/MedicalQueue.vue
+++ b/src/components/outpatient/MedicalQueue.vue
@@ -30,11 +30,12 @@
           <el-scrollbar style="height: 100%">
             <li class="list-item" :class="curItem?.id == item.id ? 'active' : ''" v-for="(item, index) in list"
                 :key="index" @click="clickLi(item)">
-                <span class="item-avatar">
+                <span class="item-avatar" style="position: relative">
                   <img v-if="item.gender==1" class="avatar" src="/static/images/outpatient/man.png"
                        alt="头像"/>
                   <img v-if="item.gender==2" class="avatar" src="/static/images/outpatient/women.png"
                        alt="头像"/>
+                   <span v-if="item.isAppointment" class="iconfont icon-yuyue yuyueIcon" ></span>
                 </span>
               <span class="item-name">{{ item.name }}</span>
               <span class="item-time">
@@ -403,5 +404,14 @@ watch(() => selectedDate.value, (newValue, oldValue) => {
   right: 0;
   top: 50px;
 }
-
+.yuyueIcon{
+  width: 13px;
+  height: 13px;
+  position: absolute;
+  top: -8px;
+  color: rgb(255, 102, 0);
+  font-size: 12px;
+  right: 0;
+  z-index: 99;
+}
 </style>
\ No newline at end of file
diff --git a/src/components/registration/List.vue b/src/components/registration/List.vue
index c5d6b7a..e4820b4 100644
--- a/src/components/registration/List.vue
+++ b/src/components/registration/List.vue
@@ -7,10 +7,11 @@
     >
       <el-table-column prop="name" label="姓名" show-overflow-tooltip>
         <template #default="scope">
-          <div style="display: flex;align-items: center;">
+          <div style="display: flex;align-items: center;position: relative">
             <img style="width: 25px;height: 25px;margin-right: 10px"
                  :src="scope.row.gender === 1 ? '/static/images/member/man.png' :scope.row.gender === 2 ? '/static/images/member/women.png':'无'"
                  alt="" srcset="">
+
             <span>{{ scope.row.name }}</span>
           </div>
         </template>
diff --git a/src/components/settings/item/group/GroupList.vue b/src/components/settings/item/group/GroupList.vue
index 915fd4b..378248a 100644
--- a/src/components/settings/item/group/GroupList.vue
+++ b/src/components/settings/item/group/GroupList.vue
@@ -3,10 +3,13 @@
     <template #default>
       <div class="search_content_wrapper">
         <div class="search_wrapper">
-          <span class="default-btn" @click="add">添加组套</span>
+          <span class="default-btn" @click="add">
+              <span class="iconfont icon-jia"></span>
+            添加组套
+          </span>
         </div>
         <div class="content">
-          <el-table :data="tableList">
+          <el-table border style="height: 100%" :data="tableList" :header-cell-style="{ backgroundColor: '#F1F5FB' }">
             <el-table-column
                 prop="itemName"
                 label="组套名称">
@@ -50,10 +53,11 @@ import {post} from '@/utils/request.ts'
 import Mask from "@/components/common/Mask.vue";
 import GroupAdd from "@/components/settings/item/group/GroupAdd.vue";
 import {ElMessage, ElMessageBox} from "element-plus";
+
 let current_page = ref(1)
 const show = ref(false);
 const emit = defineEmits(["confirm"])
-const deleteGroup=(row: any)=>{
+const deleteGroup = (row: any) => {
   ElMessageBox.confirm('确定删除该组套？', '提示', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
@@ -110,81 +114,70 @@ const handleCurrentChange = (val: any) => {
 <style scoped lang="scss">
 .search_bottom {
   display: block;
-  margin-top: 10px;
 }
 
 .search_content_wrapper {
   background-color: #FFF;
   width: 100%;
   height: 100%;
-  overflow: hidden;
-  margin: auto;
-  margin-top: 20px;
+  display: flex;
+  flex-direction: column;
   border-radius: 10px;
   box-sizing: border-box;
-  padding: 10px;
-}
-
-.search_wrapper {
-  position: relative;
-  width: 100%;
-  display: flex;
-  margin: 0 auto;
-  height: 60px;
-
-  span {
-    position: relative;
-    display: block;
-    width: 100px;
-    line-height: 40px;
-  }
-
-  .input {
-    display: block;
-    flex: 1;
-  }
-
-
-  button {
-    width: 80px;
-    line-height: 40px;
-    color: #FFF;
-    margin-left: 10px;
-    height: 40px;
-    background-color: #409EFF;
-    border: none;
-  }
-}
-
-.content {
-  display: block;
-  width: 100%;
-  flex: 1;
-  //min-height: 0;
-
-  table {
-    //border-collapse: collapse;
+  padding: 24px;
+  .search_wrapper {
     width: 100%;
+    display: flex;
+    margin: 0 auto;
+    height: 60px;
+
+    .input {
+      display: block;
+      flex: 1;
+    }
+
+    button {
+      width: 80px;
+      line-height: 40px;
+      color: #FFF;
+      margin-left: 10px;
+      height: 40px;
+      background-color: #409EFF;
+      border: none;
+    }
   }
 
-  th,
-  td {
-    //border: 1px solid #ccc;
-    padding: 8px;
-    text-align: left;
+  .content {
+    display: block;
+    width: 100%;
+    flex: 1;
+    min-height: 0;
 
-  }
+    table {
+      //border-collapse: collapse;
+      width: 100%;
+    }
 
-  th {
-    //background-color: #F9F9F9;
-  }
+    th,
+    td {
+      //border: 1px solid #ccc;
+      padding: 8px;
+      text-align: left;
 
-  /* 可选：为可点击的行添加鼠标悬停效果 */
-  tr:hover {
-    //background-color: #f5f5f5;
+    }
+
+    th {
+      //background-color: #F9F9F9;
+    }
+
+    /* 可选：为可点击的行添加鼠标悬停效果 */
+    tr:hover {
+      //background-color: #f5f5f5;
+    }
   }
 }
 
+
 :deep(.invalid) {
   color: #409EFF;
 }
@@ -193,7 +186,8 @@ const handleCurrentChange = (val: any) => {
   width: 100%;
   height: 400px;
 }
-.bottom{
+
+.bottom {
   height: 100%;
   display: flex;
   justify-content: flex-end;

From 6d84346af9a2853f12c2205565d0e64d5348e4f3 Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Mon, 26 May 2025 09:30:19 +0800
Subject: [PATCH 11/33] dev

---
 src/assets/config/apiConfig.ts             |  4 ++
 src/components/common/Calendar.vue         | 56 ++++++++++++----------
 src/components/outpatient/MedicalQueue.vue |  4 +-
 src/views/registration/index.vue           | 43 ++++++++++-------
 4 files changed, 64 insertions(+), 43 deletions(-)

diff --git a/src/assets/config/apiConfig.ts b/src/assets/config/apiConfig.ts
index f1120ed..b963a44 100644
--- a/src/assets/config/apiConfig.ts
+++ b/src/assets/config/apiConfig.ts
@@ -6,6 +6,10 @@ export enum apiConfig{
     "signIn"="sign/in",//签到
     "signOut"="sign/out",//签退
     "managerUserVerify"="manager/user/verify",//获取用户信息
+    /**
+     * 挂号操作
+     */
+    "registrationList"="registration/list",//挂号列表
     /**
      * 接诊操作
      */
diff --git a/src/components/common/Calendar.vue b/src/components/common/Calendar.vue
index 24c5614..19db830 100644
--- a/src/components/common/Calendar.vue
+++ b/src/components/common/Calendar.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
-import { ref, computed } from 'vue';
-import {ArrowLeft,ArrowRight} from '@element-plus/icons-vue'
+import {ref, computed} from 'vue';
+import {ArrowLeft, ArrowRight} from '@element-plus/icons-vue'
+
 const currentMonth = ref(new Date().getMonth());
 const currentYear = ref(new Date().getFullYear());
 const selectedDate = ref<{ day: number; isCurrentMonth: boolean } | null>(null);
@@ -51,17 +52,17 @@ const generateCalendarData = (
       // 当前月日期
       if ((isFirstWeek && day >= firstDayIndex) || (!isFirstWeek && dayCounter <= daysInMonth)) {
         const isToday = dayCounter === currentDay && month === currentMonthValue && year === currentYearValue;
-        weekDays.push({ day: dayCounter, isCurrentMonth: true, isCurrentDay: isToday });
+        weekDays.push({day: dayCounter, isCurrentMonth: true, isCurrentDay: isToday});
         dayCounter++;
       }
       // 前月日期
       else if (isFirstWeek) {
         const prevDay = daysInPrevMonth - firstDayIndex + day + 1;
-        weekDays.push({ day: prevDay, isCurrentMonth: false, isCurrentDay: false });
+        weekDays.push({day: prevDay, isCurrentMonth: false, isCurrentDay: false});
       }
       // 下月日期
       else {
-        weekDays.push({ day: nextMonthDayCounter, isCurrentMonth: false, isCurrentDay: false });
+        weekDays.push({day: nextMonthDayCounter, isCurrentMonth: false, isCurrentDay: false});
         nextMonthDayCounter++;
       }
     }
@@ -95,19 +96,19 @@ const nextMonth = () => {
   }
   selectedDate.value = null;
 };
-const emit=defineEmits(['dateClick']);
+const emit = defineEmits(['dateClick']);
 const handleDateClick = (day: number) => {
-    selectedDate.value = { day, isCurrentMonth:true };
-   emit('dateClick',`${currentYear.value}-${currentMonth.value + 1}-${day}` )
+  selectedDate.value = {day, isCurrentMonth: true};
+  emit('dateClick', `${currentYear.value}-${currentMonth.value + 1}-${day}`)
 };
 </script>
 
 <template>
   <div class="calendar-wrapper">
-    <div class="header">
-      <span class="btn" @click="prevMonth"><el-icon><ArrowLeft /></el-icon></span>
+    <div class="calendar-wrapper-header">
+      <span class="btn" @click="prevMonth"><el-icon><ArrowLeft/></el-icon></span>
       <span class="current">{{ currentYear }}年{{ currentMonth + 1 }}月</span>
-      <span class="btn" @click="nextMonth"><el-icon><ArrowRight /></el-icon></span>
+      <span class="btn" @click="nextMonth"><el-icon><ArrowRight/></el-icon></span>
     </div>
     <div class="row">
       <div class="item">
@@ -148,25 +149,24 @@ const handleDateClick = (day: number) => {
 
 <style scoped lang="scss">
 .calendar-wrapper {
-  .header {
+  &-header {
+    margin-bottom: 8px;
     display: flex;
     justify-content: space-between;
     align-items: center;
-    margin-bottom: 8px;
-    .current{
+
+    .current {
       font-weight: 500;
       font-size: 18px;
       color: #333333;
       font-style: normal;
-      margin-bottom: 8px;
     }
 
     .btn {
-      padding: 5px 10px;
       font-size: 14px;
       color: #1677FE;
       background-color: #FFF;
-      border-radius: 4px;
+      border-radius: 6px;
       cursor: pointer;
 
       &:hover {
@@ -175,10 +175,11 @@ const handleDateClick = (day: number) => {
       }
     }
   }
+
   width: 100%;
   height: 100%;
   box-sizing: border-box;
-  padding:0 20px 20px;
+  padding: 0 20px 20px;
   background-color: #FFF;
   border-radius: 0 0 8px 8px;
   display: flex;
@@ -187,41 +188,46 @@ const handleDateClick = (day: number) => {
   .row {
     flex: 1;
     width: 100%;
-    background: #F9FAFC ;
+    background: #F9FAFC;
     padding: 0 20px;
     display: flex;
     justify-content: space-between;
     align-items: center;
     font-weight: 500;
-    font-size: 14px;
+    font-size: 12px;
     color: #999999;
     font-style: normal;
+
     .item {
       width: 100%;
       height: 100%;
       display: flex;
       justify-content: center;
       align-items: center;
+
       span {
         margin: auto;
-        height: 34px;
-        width: 34px;
+        height: 25px;
+        width: 25px;
         display: flex;
         justify-content: center;
         align-items: center;
         font-weight: bold;
-        font-size: 16px;
+        font-size: 14px;
         color: #666666;
         font-style: normal;
-        border-radius:17px;
+        border-radius: 25px;
       }
+
       .currentDay {
         background: #1677FE;
         color: #fff;
       }
-      .otherMonth{
+
+      .otherMonth {
         color: #999;
       }
+
       .selectedDay {
         background: #FFA500;
         color: #fff;
diff --git a/src/components/outpatient/MedicalQueue.vue b/src/components/outpatient/MedicalQueue.vue
index 1e6dae3..ac96c24 100644
--- a/src/components/outpatient/MedicalQueue.vue
+++ b/src/components/outpatient/MedicalQueue.vue
@@ -35,7 +35,7 @@
                        alt="头像"/>
                   <img v-if="item.gender==2" class="avatar" src="/static/images/outpatient/women.png"
                        alt="头像"/>
-                   <span v-if="item.isAppointment" class="iconfont icon-yuyue yuyueIcon" ></span>
+                   <span v-if="item.isAppointment" class="iconfont icon-yuyue yuYueIcon" ></span>
                 </span>
               <span class="item-name">{{ item.name }}</span>
               <span class="item-time">
@@ -404,7 +404,7 @@ watch(() => selectedDate.value, (newValue, oldValue) => {
   right: 0;
   top: 50px;
 }
-.yuyueIcon{
+.yuYueIcon{
   width: 13px;
   height: 13px;
   position: absolute;
diff --git a/src/views/registration/index.vue b/src/views/registration/index.vue
index 2f1c020..87583e5 100644
--- a/src/views/registration/index.vue
+++ b/src/views/registration/index.vue
@@ -67,7 +67,7 @@
                 />
               </div>
             </div>
-            <div class="middle">
+            <div class="middle" v-loading="listLoading">
               <List :patientList="patientList" @rowClick="rowClick"></List>
             </div>
             <div class="bottom">
@@ -101,6 +101,7 @@ import Calendar from "@/components/common/Calendar.vue";
 import Panel from "@/components/common/Panel.vue";
 import {apiConfig} from "@/assets/config/apiConfig.ts";
 import {Search} from "@element-plus/icons-vue";
+import {ElMessage} from "element-plus";
 
 const dateName = ref<any>('挂号')
 const selectDate = (date: any) => {
@@ -155,18 +156,26 @@ const handleDateChange = (date: any[]) => {
   }
   getPatientList()
 }
-const getPatientList = () => {
+const listLoading = ref(false)
+const getPatientList = async () => {
+  listLoading.value = true
   id.value = null
-  post('registration/list', {
-    page: page.value,
-    size: size.value,
-    startDate: selectedDate.value[0],
-    endDate: selectedDate.value[1],
-    doctorId: doctorId.value,
-  }).then((res: any) => {
-    patientList.value = res.list
-    total.value = res.total_count
-  })
+  try {
+    const data: any = await post(apiConfig.registrationList, {
+      page: page.value,
+      size: size.value,
+      startDate: selectedDate.value[0],
+      endDate: selectedDate.value[1],
+      doctorId: doctorId.value,
+    }, {catch_error:true})
+    patientList.value = data.list
+    total.value = data.total_count
+  }
+  catch (e:any) {
+  }
+  finally {
+    listLoading.value = false
+  }
 }
 const total = ref(0)
 const size = ref(20)
@@ -208,9 +217,9 @@ const reset = () => {
 const doctorId = ref(null)
 const changeRole = (item: any, index: any) => {
   isShowNum.value = index
-  if(index==-1){
+  if (index == -1) {
     allList()
-  }else{
+  } else {
     doctorId.value = item.id
     getPatientList()
   }
@@ -235,12 +244,12 @@ const allList = () => {
 
   .left {
     height: 100%;
-    width: 382px;
+    width: 320px;
     display: flex;
     flex-direction: column;
 
     .left-top {
-      height: 399px;
+      height: 299px;
       background: #FFFFFF;
       border-radius: 8px;
     }
@@ -288,6 +297,7 @@ const allList = () => {
                 white-space: nowrap;
                 overflow: hidden;
                 text-overflow: ellipsis;
+                margin-right: 5px;
               }
 
               .section_name {
@@ -297,6 +307,7 @@ const allList = () => {
                 white-space: nowrap;
                 overflow: hidden;
                 text-overflow: ellipsis;
+                margin-right: 5px;
               }
 
               .btn {

From 144a42f894625bfc2fe4e8059b4227a37f963ee3 Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Mon, 26 May 2025 09:31:36 +0800
Subject: [PATCH 12/33] dev

---
 src/views/member/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/member/index.vue b/src/views/member/index.vue
index 395d270..548cf5a 100644
--- a/src/views/member/index.vue
+++ b/src/views/member/index.vue
@@ -407,7 +407,7 @@ const openFlowingWater = () => {
 
   .left {
     height: 100%;
-    width: 430px;
+    width: 320px;
     margin-right: 24px;
 
     .search {

From c722a4414affc997accf90b8a0882866c406708e Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Mon, 26 May 2025 09:42:41 +0800
Subject: [PATCH 13/33] dev

---
 src/components/outpatient/MedicalQueue.vue | 1 +
 src/views/settings/member.vue              | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/outpatient/MedicalQueue.vue b/src/components/outpatient/MedicalQueue.vue
index ac96c24..57b5247 100644
--- a/src/components/outpatient/MedicalQueue.vue
+++ b/src/components/outpatient/MedicalQueue.vue
@@ -197,6 +197,7 @@ const clickLi = (item: any, showBox: any = true) => {
             curItem.value = res
             initStatusList()
             emit('clickItem', curItem.value)
+            selectedDate.value=getCurrentDate()
           })
         }
       },
diff --git a/src/views/settings/member.vue b/src/views/settings/member.vue
index 7489a4d..f77af26 100644
--- a/src/views/settings/member.vue
+++ b/src/views/settings/member.vue
@@ -85,7 +85,6 @@ import {onMounted, ref, nextTick} from "vue"
 import MemberEdit from "@/components/settings/MemberEdit.vue";
 import {post} from "@/utils/request.ts";
 import {formatDate} from "@/utils/dateUtils.ts";
-import {Plus} from "@element-plus/icons-vue";
 import {apiConfig} from "@/assets/config/apiConfig.ts";
 
 const isShow = ref(false)
@@ -205,7 +204,7 @@ const resetSearch = () => {
   height: 42px;
 }
 .default-btn{
-  margin-left: 10px;
+  margin-left: 5px;
   &:first-child{
     margin-left: 0;
   }

From d2e325e5fc1c3934aa6b8f337d221dc7f7565838 Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Mon, 26 May 2025 10:24:33 +0800
Subject: [PATCH 14/33] dev

---
 src/assets/scss/main.scss               | 38 ++++++++++++++++++-------
 src/components/inventory/goods/Edit.vue | 18 +++++-------
 src/components/registration/Edit.vue    | 16 +++++------
 3 files changed, 41 insertions(+), 31 deletions(-)

diff --git a/src/assets/scss/main.scss b/src/assets/scss/main.scss
index bfc7774..84e7dd9 100644
--- a/src/assets/scss/main.scss
+++ b/src/assets/scss/main.scss
@@ -143,24 +143,40 @@ $lighter-color: rgba(#4D6DE4, 0.5);
   color: #FFF;
   font-size: 16px;
   text-align: center;
-  margin-left: 10px;
-  &:first-child{
-    margin-left: 0;
-  }
+  margin-left: 9px;
   &:hover{
     background: $lighter-color;
   }
 }
+
 .small-btn{
-  display: inline-block;
-  background: $btn-color;
-  border-radius: 3px;
-  color: #FFF;
-  font-size: 12px;
-  text-align: center;
+    cursor: pointer;
+    display: inline-block;
+    line-height: 1;
+    background: $btn-color;
+    border-radius: 4px;
+    color: #FFF;
+    font-size: 14px;
+    text-align: center;
+    margin-left: 9px;
+    padding: 8px 15px;
+    &:hover{
+      background: $lighter-color;
+    }
+}
+
+.danger-btn{
   cursor: pointer;
+  display: inline-block;
+  line-height: 1;
+  background: #EB5757;
+  border-radius: 4px;
+  color: #FFF;
+  font-size: 14px;
+  text-align: center;
+  margin-left: 9px;
   padding: 8px 15px;
   &:hover{
-    background: $lighter-color;
+    background:  rgba(#EB5757, 0.5);
   }
 }
diff --git a/src/components/inventory/goods/Edit.vue b/src/components/inventory/goods/Edit.vue
index 7a5cd64..0f92641 100644
--- a/src/components/inventory/goods/Edit.vue
+++ b/src/components/inventory/goods/Edit.vue
@@ -425,12 +425,13 @@
 
     <template #footer>
       <div class="footer">
-        <span class="default-btn" @click="returnInit" v-if="edit_data.id != null">医保库存重新初始化</span>
-        <span class="default-btn" v-if="edit_data.saleStatus" @click="disableSale" style="margin: 0 24px">停售</span>
-        <span class="default-btn" v-else @click="enableSale">起售</span>
-        <span class="default-btn" @click="save(true)" style="margin: 0 24px">保存</span>
-        <span class="default-btn" @click="save(false)" v-if="edit_data.id == null">保存并继续</span>
-        <span class="default-btn" @click="exit" style="margin-left: 24px">关闭</span>
+        <span class="small-btn" @click="returnInit"
+              v-if="edit_data.id != null">医保库存重新初始化</span>
+        <span class="danger-btn" v-if="edit_data.saleStatus" @click="disableSale">停售</span>
+        <span class="danger-btn" v-else @click="enableSale">起售</span>
+        <span class="small-btn" @click="save(true)">保存</span>
+        <span class="small-btn" @click="save(false)" v-if="edit_data.id == null">保存并继续</span>
+        <span class="small-btn" @click="exit">关闭</span>
       </div>
     </template>
   </Mask>
@@ -915,11 +916,6 @@ const enableSale = () => {
   justify-content: flex-end;
   align-items: center;
   padding: 0 24px;
-  .default-btn{
-    &:nth-child(1){
-      width: 200px;
-    }
-  }
 }
 </style>
 
diff --git a/src/components/registration/Edit.vue b/src/components/registration/Edit.vue
index adb4afc..f927cad 100644
--- a/src/components/registration/Edit.vue
+++ b/src/components/registration/Edit.vue
@@ -204,9 +204,9 @@
           退出医保
         </div>
         <div class="bottom-right">
-          <span class="default-btn" type="primary" @click="save">保存</span>
-          <span class="default-btn" @click="close" style="margin: 0 24px">取消</span>
-          <span class="default-btn" v-if="edit_data.status==1" @click="registrationCancel">退号</span>
+          <span class="danger-btn" v-if="edit_data.status==1" @click="registrationCancel">退号</span>
+          <span class="small-btn" @click="save">保存</span>
+          <span class="small-btn" @click="close">取消</span>
         </div>
       </div>
     </template>
@@ -548,11 +548,9 @@ defineExpose({init})
 
 :deep(.el-form-item) {
   margin-bottom: 2px !important;
-}
-
-.small-btn {
-  margin-left: 5px;
-  height: 32px;
-  line-height: 1;
+  .small-btn{
+    height: 33px;
+    line-height: 33px;
+  }
 }
 </style>
\ No newline at end of file

From c9ef75f035ff5e1455bd36e2365eebeb0bf099cf Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Mon, 26 May 2025 10:28:06 +0800
Subject: [PATCH 15/33] dev

---
 src/components/registration/Edit.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/components/registration/Edit.vue b/src/components/registration/Edit.vue
index f927cad..28c40ef 100644
--- a/src/components/registration/Edit.vue
+++ b/src/components/registration/Edit.vue
@@ -548,9 +548,5 @@ defineExpose({init})
 
 :deep(.el-form-item) {
   margin-bottom: 2px !important;
-  .small-btn{
-    height: 33px;
-    line-height: 33px;
-  }
 }
 </style>
\ No newline at end of file

From ca29c3019845a4c8e7da21c0e1b7ad64fe853fcd Mon Sep 17 00:00:00 2001
From: NiuZiYuan <niuziyuan@jizhiweb.cn>
Date: Mon, 26 May 2025 10:28:46 +0800
Subject: [PATCH 16/33] dev

---
 src/components/common/Calendar.vue | 56 +++++++++++++-----------------
 1 file changed, 25 insertions(+), 31 deletions(-)

diff --git a/src/components/common/Calendar.vue b/src/components/common/Calendar.vue
index 19db830..24c5614 100644
--- a/src/components/common/Calendar.vue
+++ b/src/components/common/Calendar.vue
@@ -1,7 +1,6 @@
 <script setup lang="ts">
-import {ref, computed} from 'vue';
-import {ArrowLeft, ArrowRight} from '@element-plus/icons-vue'
-
+import { ref, computed } from 'vue';
+import {ArrowLeft,ArrowRight} from '@element-plus/icons-vue'
 const currentMonth = ref(new Date().getMonth());
 const currentYear = ref(new Date().getFullYear());
 const selectedDate = ref<{ day: number; isCurrentMonth: boolean } | null>(null);
@@ -52,17 +51,17 @@ const generateCalendarData = (
       // 当前月日期
       if ((isFirstWeek && day >= firstDayIndex) || (!isFirstWeek && dayCounter <= daysInMonth)) {
         const isToday = dayCounter === currentDay && month === currentMonthValue && year === currentYearValue;
-        weekDays.push({day: dayCounter, isCurrentMonth: true, isCurrentDay: isToday});
+        weekDays.push({ day: dayCounter, isCurrentMonth: true, isCurrentDay: isToday });
         dayCounter++;
       }
       // 前月日期
       else if (isFirstWeek) {
         const prevDay = daysInPrevMonth - firstDayIndex + day + 1;
-        weekDays.push({day: prevDay, isCurrentMonth: false, isCurrentDay: false});
+        weekDays.push({ day: prevDay, isCurrentMonth: false, isCurrentDay: false });
       }
       // 下月日期
       else {
-        weekDays.push({day: nextMonthDayCounter, isCurrentMonth: false, isCurrentDay: false});
+        weekDays.push({ day: nextMonthDayCounter, isCurrentMonth: false, isCurrentDay: false });
         nextMonthDayCounter++;
       }
     }
@@ -96,19 +95,19 @@ const nextMonth = () => {
   }
   selectedDate.value = null;
 };
-const emit = defineEmits(['dateClick']);
+const emit=defineEmits(['dateClick']);
 const handleDateClick = (day: number) => {
-  selectedDate.value = {day, isCurrentMonth: true};
-  emit('dateClick', `${currentYear.value}-${currentMonth.value + 1}-${day}`)
+    selectedDate.value = { day, isCurrentMonth:true };
+   emit('dateClick',`${currentYear.value}-${currentMonth.value + 1}-${day}` )
 };
 </script>
 
 <template>
   <div class="calendar-wrapper">
-    <div class="calendar-wrapper-header">
-      <span class="btn" @click="prevMonth"><el-icon><ArrowLeft/></el-icon></span>
+    <div class="header">
+      <span class="btn" @click="prevMonth"><el-icon><ArrowLeft /></el-icon></span>
       <span class="current">{{ currentYear }}年{{ currentMonth + 1 }}月</span>
-      <span class="btn" @click="nextMonth"><el-icon><ArrowRight/></el-icon></span>
+      <span class="btn" @click="nextMonth"><el-icon><ArrowRight /></el-icon></span>
     </div>
     <div class="row">
       <div class="item">
@@ -149,24 +148,25 @@ const handleDateClick = (day: number) => {
 
 <style scoped lang="scss">
 .calendar-wrapper {
-  &-header {
-    margin-bottom: 8px;
+  .header {
     display: flex;
     justify-content: space-between;
     align-items: center;
-
-    .current {
+    margin-bottom: 8px;
+    .current{
       font-weight: 500;
       font-size: 18px;
       color: #333333;
       font-style: normal;
+      margin-bottom: 8px;
     }
 
     .btn {
+      padding: 5px 10px;
       font-size: 14px;
       color: #1677FE;
       background-color: #FFF;
-      border-radius: 6px;
+      border-radius: 4px;
       cursor: pointer;
 
       &:hover {
@@ -175,11 +175,10 @@ const handleDateClick = (day: number) => {
       }
     }
   }
-
   width: 100%;
   height: 100%;
   box-sizing: border-box;
-  padding: 0 20px 20px;
+  padding:0 20px 20px;
   background-color: #FFF;
   border-radius: 0 0 8px 8px;
   display: flex;
@@ -188,46 +187,41 @@ const handleDateClick = (day: number) => {
   .row {
     flex: 1;
     width: 100%;
-    background: #F9FAFC;
+    background: #F9FAFC ;
     padding: 0 20px;
     display: flex;
     justify-content: space-between;
     align-items: center;
     font-weight: 500;
-    font-size: 12px;
+    font-size: 14px;
     color: #999999;
     font-style: normal;
-
     .item {
       width: 100%;
       height: 100%;
       display: flex;
       justify-content: center;
       align-items: center;
-
       span {
         margin: auto;
-        height: 25px;
-        width: 25px;
+        height: 34px;
+        width: 34px;
         display: flex;
         justify-content: center;
         align-items: center;
         font-weight: bold;
-        font-size: 14px;
+        font-size: 16px;
         color: #666666;
         font-style: normal;
-        border-radius: 25px;
+        border-radius:17px;
       }
-
       .currentDay {
         background: #1677FE;
         color: #fff;
       }
-
-      .otherMonth {
+      .otherMonth{
         color: #999;
       }
-
       .selectedDay {
         background: #FFA500;
         color: #fff;

From 1c600f7942437d7c4ffcd50ca878d33d4aa237cd Mon Sep 17 00:00:00 2001
From: NiuZiYuan <niuziyuan@jizhiweb.cn>
Date: Mon, 26 May 2025 10:34:47 +0800
Subject: [PATCH 17/33] dev

---
 src/components/common/Calendar.vue | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/components/common/Calendar.vue b/src/components/common/Calendar.vue
index 24c5614..9dfd85d 100644
--- a/src/components/common/Calendar.vue
+++ b/src/components/common/Calendar.vue
@@ -204,16 +204,17 @@ const handleDateClick = (day: number) => {
       align-items: center;
       span {
         margin: auto;
-        height: 34px;
-        width: 34px;
+        height: 28px;
+        width: 28px;
         display: flex;
         justify-content: center;
         align-items: center;
         font-weight: bold;
-        font-size: 16px;
+        font-size: 14px;
         color: #666666;
         font-style: normal;
-        border-radius:17px;
+        border-radius:14px;
+        cursor: pointer;
       }
       .currentDay {
         background: #1677FE;

From f29fbf9c1b9aa8ee3443a0f53dc1eec4dee004ef Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Mon, 26 May 2025 10:46:14 +0800
Subject: [PATCH 18/33] dev

---
 src/components/registration/Edit.vue | 312 +++++++++++++--------------
 1 file changed, 155 insertions(+), 157 deletions(-)

diff --git a/src/components/registration/Edit.vue b/src/components/registration/Edit.vue
index 28c40ef..fad493a 100644
--- a/src/components/registration/Edit.vue
+++ b/src/components/registration/Edit.vue
@@ -2,128 +2,126 @@
   <Mask :is-show="isShow" width="800" :height="height" title="挂号" @close="close"
         :show-footer="true">
     <template #default>
-      <div style="padding:0 24px;height: 100%;display: flex;flex-direction: column">
-        <el-form
-            v-loading="loading"
-            :model="edit_data"
-            label-width="auto"
-            :rules="rules"
-            ref="form"
-            style="flex: 1;width: 100%"
-        >
-          <el-descriptions
-              border
-              direction="vertical"
-              :column="4"
-              style="margin-top: 20px"
+      <div style="padding:0 24px 24px;height: 100%;display: flex;flex-direction: column">
+        <el-scrollbar>
+          <el-form
+              v-loading="loading"
+              :model="edit_data"
+              label-width="auto"
+              :rules="rules"
+              ref="form"
+              style="flex: 1;width: 100%"
           >
-            <el-descriptions-item label="姓名" width="200">
-              <el-form-item prop="name" style="margin-bottom: 2px">
-                <el-input v-model="edit_data.name" placeholder="请输入姓名" clearable
-                          :disabled="edit_data.status==1||edit_data.status==3||edit_data.status==0"></el-input>
-              </el-form-item>
-            </el-descriptions-item>
-            <el-descriptions-item label="性别" width="200">
-              <el-form-item prop="gender">
-                <el-radio-group v-model="edit_data.gender"
-                                :disabled="edit_data.status==1||edit_data.status==3||edit_data.status==0">
-                  <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="年龄" width="200">
-              <el-form-item prop="age">
-                <el-input v-model.number="edit_data.age" placeholder="请输入年龄"
-                          :disabled="edit_data.status==1||edit_data.status==3||edit_data.status==0"></el-input>
-              </el-form-item>
-            </el-descriptions-item>
-            <el-descriptions-item label="手机号" width="200">
-              <el-form-item prop="phone">
-                <el-input v-model="edit_data.phone" placeholder="手机号"
-                          :disabled="edit_data.status==3||edit_data.status==0"></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="请选择医生"
-                    @change="getSectionList"
-                    :disabled="edit_data.status==3||edit_data.status==0"
-                >
-                  <el-option
-                      v-for="item in 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>
-                <el-select
-                    v-model="edit_data.organizationSectionId"
-                    placeholder="选择科室"
-                    :disabled="edit_data.status==3||edit_data.status==0"
-                >
-                  <el-option
-                      v-for="item in sectionList"
-                      :key="item.id"
-                      :label="item.name"
-                      :value="item.id"
-                  />
-                </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="证件类型"
-                           :disabled="edit_data.status==1||edit_data.status==3||edit_data.status==0">
-                  <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="请输入证件码"
-                          :disabled="edit_data.status==1||edit_data.status==3||edit_data.status==0"></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="就诊类型" :disabled="edit_data.status==0">
-                  <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-form-item prop="type">
-                <el-select v-model="edit_data.type" :disabled="edit_data.status==0||isShowCard">
-                  <el-option label="自费" :value="1"></el-option>
-                  <el-option label="医保" :value="2"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-descriptions-item>
-            <el-descriptions-item
-                :span="2"
-                label="时间">
-
-
-              <div style=" display: flex;justify-content: space-between">
-                <el-form-item style="flex: 1;min-width: 0" v-if="!isBtnShow&&dateName!='预约'">
-                  <div style="width: 100%">现在</div>
+            <el-descriptions
+                border
+                direction="vertical"
+                :column="4"
+                style="margin-top: 20px"
+            >
+              <el-descriptions-item label="姓名" width="200">
+                <el-form-item prop="name" style="margin-bottom: 2px">
+                  <el-input v-model="edit_data.name" placeholder="请输入姓名" clearable
+                            :disabled="edit_data.status==1||edit_data.status==3||edit_data.status==0"></el-input>
                 </el-form-item>
-                <el-form-item v-else style="flex: 1;min-width: 0" prop="date">
-                  <div style="display: flex">
+              </el-descriptions-item>
+              <el-descriptions-item label="性别" width="200">
+                <el-form-item prop="gender">
+                  <el-radio-group v-model="edit_data.gender"
+                                  :disabled="edit_data.status==1||edit_data.status==3||edit_data.status==0">
+                    <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="年龄" width="200">
+                <el-form-item prop="age">
+                  <el-input v-model.number="edit_data.age" placeholder="请输入年龄"
+                            :disabled="edit_data.status==1||edit_data.status==3||edit_data.status==0"></el-input>
+                </el-form-item>
+              </el-descriptions-item>
+              <el-descriptions-item label="手机号" width="200">
+                <el-form-item prop="phone">
+                  <el-input v-model="edit_data.phone" placeholder="手机号"
+                            :disabled="edit_data.status==3||edit_data.status==0"></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="请选择医生"
+                      @change="getSectionList"
+                      :disabled="edit_data.status==3||edit_data.status==0"
+                  >
+                    <el-option
+                        v-for="item in 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>
+                  <el-select
+                      v-model="edit_data.organizationSectionId"
+                      placeholder="选择科室"
+                      :disabled="edit_data.status==3||edit_data.status==0"
+                  >
+                    <el-option
+                        v-for="item in sectionList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    />
+                  </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="证件类型"
+                             :disabled="edit_data.status==1||edit_data.status==3||edit_data.status==0">
+                    <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="请输入证件码"
+                            :disabled="edit_data.status==1||edit_data.status==3||edit_data.status==0"></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="就诊类型" :disabled="edit_data.status==0">
+                    <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-form-item prop="type">
+                  <el-select v-model="edit_data.type" :disabled="edit_data.status==0||isShowCard">
+                    <el-option label="自费" :value="1"></el-option>
+                    <el-option label="医保" :value="2"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-descriptions-item>
+              <el-descriptions-item
+                  :span="2"
+                  label="时间">
+
+
+                <div style=" display: flex;">
+                  <div style="flex: 1;min-width: 0" v-if="!isBtnShow&&dateName!='预约'">现在</div>
+                  <div v-else style="flex:1;min-width:0;display: flex;align-items: center">
                     <el-date-picker
                         v-model="edit_data.date"
                         type="date"
@@ -143,44 +141,44 @@
                         style="width: 50%"
                     />
                   </div>
+                  <span v-if="dateName!='预约'" class="small-btn" @click="changeBtn">{{
+                      isBtnShow ? '挂号' : '预约'
+                    }}</span>
+                </div>
+              </el-descriptions-item>
+              <el-descriptions-item
+                  :span="4"
+                  label="备注">
+                <el-form-item>
+                  <el-input v-model="edit_data.memo" placeholder="备注" :disabled="edit_data.status==0"></el-input>
                 </el-form-item>
-                <span v-if="dateName!='预约'" class="small-btn" @click="changeBtn">{{
-                    isBtnShow ? '挂号' : '预约'
-                  }}</span>
-              </div>
-            </el-descriptions-item>
-            <el-descriptions-item
-                :span="4"
-                label="备注">
-              <el-form-item>
-                <el-input v-model="edit_data.memo" placeholder="备注" :disabled="edit_data.status==0"></el-input>
-              </el-form-item>
-            </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%;flex: 1"
-            v-if="!isShowCard"
-            highlight-current-row
-            ref="multipleTable"
-            @current-change="handleCurrentChange"
-        >
-          <el-table-column label="险种类型" prop="insutype">
-            <template #default="scope">
-              {{ getKey(insutypes, scope.row.insutype) }}
-            </template>
-          </el-table-column>
-          <el-table-column label="待遇状态">
-          </el-table-column>
-          <el-table-column label="参保日期" prop="psn_insu_date"></el-table-column>
-          <el-table-column label="剩余余额" prop="balc">
-            <template #default="scope">
-              ￥{{ scope.row.balc || 0 }}
-            </template>
-          </el-table-column>
-        </el-table>
+              </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%;flex: 1"
+              v-if="!isShowCard"
+              highlight-current-row
+              ref="multipleTable"
+              @current-change="handleCurrentChange"
+          >
+            <el-table-column label="险种类型" prop="insutype">
+              <template #default="scope">
+                {{ getKey(insutypes, scope.row.insutype) }}
+              </template>
+            </el-table-column>
+            <el-table-column label="待遇状态">
+            </el-table-column>
+            <el-table-column label="参保日期" prop="psn_insu_date"></el-table-column>
+            <el-table-column label="剩余余额" prop="balc">
+              <template #default="scope">
+                ￥{{ scope.row.balc || 0 }}
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-scrollbar>
       </div>
     </template>
     <template #footer>

From 36833e0cf3a74fbff2a18c8f635da5707b468e6e Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Mon, 26 May 2025 11:21:56 +0800
Subject: [PATCH 19/33] dev

---
 src/components/charge/AssociationIdCode.vue | 101 ++++++++++++--------
 src/components/charge/CheckoutDetail.vue    |  53 +++++-----
 2 files changed, 85 insertions(+), 69 deletions(-)

diff --git a/src/components/charge/AssociationIdCode.vue b/src/components/charge/AssociationIdCode.vue
index 6acb32f..dc6dab1 100644
--- a/src/components/charge/AssociationIdCode.vue
+++ b/src/components/charge/AssociationIdCode.vue
@@ -6,45 +6,45 @@
           请勾选该追溯码关联的发药项目商品
         </div>
         <div class="code">
-          <div class="before-code">
+          <span class="before-code">
             {{ traceabilityCode.slice(0, 7) }}
-          </div>
-          <div class="after-code">
+          </span>
+          <span class="after-code">
             {{ traceabilityCode.slice(7, traceabilityCode.length) }}
-          </div>
+          </span>
+        </div>
+      </div>
+      <div style="padding: 0 24px;flex: 1; min-height: 0;">
+        <div class="list">
+          <table class="table" style="border-spacing: 0">
+            <thead style="background:#F1F5FB">
+            <tr class="table-title" style="background: #f1f5fb">
+              <th>选择</th>
+              <th>发药项目</th>
+              <th>产品标识码</th>
+              <th>系统处理</th>
+            </tr>
+            </thead>
+            <tbody class="table-body" style="height: 52px">
+            <tr v-for="(item,index) in tableData">
+              <td>
+                <input class="blue-radio" type="radio" :value="item.id" v-model="selected" @click="closeModal"/>
+              </td>
+              <td>{{ item.name }}</td>
+              <td>
+                <IdCodeListShow :idCodeList="item.idCode" v-if="item.idCode && item.idCode.length > 0"/>
+                <div v-else>未关联</div>
+              </td>
+              <td style="width: 300px;">
+                <template v-if="selected === item.id">
+                  关联产品标识码，采集追溯码自动识别商品
+                </template>
+              </td>
+            </tr>
+            </tbody>
+          </table>
         </div>
       </div>
-     <div style="padding: 0 24px;flex: 1; min-height: 0;">
-       <div class="list">
-         <table class="table" style="border-spacing: 0">
-           <thead style="background:#F1F5FB">
-           <tr class="table-title" style="background: #f1f5fb">
-             <th>选择</th>
-             <th>发药项目</th>
-             <th>产品标识码</th>
-             <th>系统处理</th>
-           </tr>
-           </thead>
-           <tbody class="table-body" style="height: 52px">
-           <tr v-for="(item,index) in tableData">
-             <td>
-               <input class="blue-radio" type="radio" :value="item.id" v-model="selected"  @click="closeModal"/>
-             </td>
-             <td>{{ item.name }}</td>
-             <td>
-               <IdCodeListShow :idCodeList="item.idCode" v-if="item.idCode && item.idCode.length > 0"/>
-               <div v-else>未关联</div>
-             </td>
-             <td style="width: 300px;">
-               <template v-if="selected === item.id">
-                 关联产品标识码，采集追溯码自动识别商品
-               </template>
-             </td>
-           </tr>
-           </tbody>
-         </table>
-       </div>
-     </div>
     </div>
     <template #footer>
       <div class="bottom">
@@ -116,23 +116,26 @@ const emit = defineEmits(["addIdCode", "addTraceabilityCode"])
 const addTraceabilityCodeDo = (item: any) => {
   emit("addTraceabilityCode", item, traceabilityCode.value)
 }
-const showRadio=ref<any>(false)
+const showRadio = ref<any>(false)
 const closeModal = () => {
   showRadio.value = false
-  selected.value=null
+  selected.value = null
 
 }
 const close = () => {
-  show.value= false
+  show.value = false
   closeModal()
 }
 </script>
 <style scoped lang="scss">
 .panel {
+  width: 100%;
   height: 100%;
   display: flex;
   flex-direction: column;
+
   .title {
+    width: 100%;
     height: 126px;
     font-size: 24px;
     display: flex;
@@ -140,6 +143,7 @@ const close = () => {
     justify-content: center;
     align-items: center;
     background: #F9FAFC;
+    padding: 24px;
     margin-bottom: 24px;
 
     .title-content {
@@ -150,34 +154,43 @@ const close = () => {
     }
 
     .code {
+      width: 100%;
+      flex: 1;
+      min-height: 0;
       font-weight: 800;
       font-size: 30px;
       color: #333333;
       font-style: normal;
       display: flex;
-
+      justify-content: center;
       .before-code {
         color: #999999;
       }
-
       .after-code {
+        min-width: 0;
         margin-left: 10px;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
       }
     }
   }
 
 }
+
 .list {
   height: 100%;
   border-radius: 8px 8px 0 0;
   width: 100%;
   border: 1px solid #EAEAEC;
   border-bottom: none;
+
   .table {
 
     th {
       background: none !important;
     }
+
     .table-title {
       width: 100%;
       height: 52px;
@@ -210,18 +223,22 @@ const close = () => {
         }
       }
     }
+
     .table-body {
       height: 52px;
       font-weight: 500;
       font-size: 14px;
       color: #666666;
       font-style: normal;
-      tr{
+
+      tr {
         height: 52px;
         font-size: 14px;
         color: #333333;
+
         td {
           height: 52px;
+
           &:first-child {
             width: 132px;
             padding-left: 35px;
@@ -236,6 +253,7 @@ const close = () => {
     }
   }
 }
+
 table, tbody, td {
   border-bottom: 1px solid #EAEAEC; /* 明确设置边框 */
 }
@@ -243,6 +261,7 @@ table, tbody, td {
 table {
   border: none;
 }
+
 .bottom {
   height: 100%;
   display: flex;
diff --git a/src/components/charge/CheckoutDetail.vue b/src/components/charge/CheckoutDetail.vue
index 07cbe4a..1a70a18 100644
--- a/src/components/charge/CheckoutDetail.vue
+++ b/src/components/charge/CheckoutDetail.vue
@@ -16,34 +16,31 @@
           </template>
         </el-input>
         <div class="list">
-          <el-scrollbar>
-            <table class="table" style="border-spacing: 0">
-              <thead style="background:#F1F5FB">
-              <tr class="table-title" style="background: #f1f5fb">
-                <th>发药项目</th>
-                <th>产品标识码</th>
-                <th>发药数量</th>
-                <th>已采/应采</th>
-                <th>追溯码</th>
-              </tr>
-              </thead>
-              <tbody class="table-body">
-              <tr v-for="(item,index) in list" :key="index">
-                <td>{{ item.name }}</td>
-                <td>
-                  <IdCodeListShow :idCodeList="item.idCode" v-if="item.idCode&&item.idCode.length>0"
-                                  @addTraceabilityCode="addTraceAbilityCodeHandler"/>
-                  <div v-else>未关联</div>
-                </td>
-                <td>{{ item.selectedNum }}{{ item.selectedUnit }}</td>
-                <td>{{ item.traceAbilityCodeList ? item.traceAbilityCodeList.length : 0 }}/{{ item.shouldNumber }}</td>
-                <td>
-                  <TraceabilityCodeAdd :item="item" @addTraceabilityCode="addTraceAbilityCodeHandler"/>
-                </td>
-              </tr>
-              </tbody>
-            </table>
-          </el-scrollbar>
+          <el-table :data="list" :header-cell-style="{backgroundColor: '#F1F5FB'}">
+            <el-table-column prop="name" label="发药项目" width="300" show-overflow-tooltip></el-table-column>
+            <el-table-column label="产品标识码" show-overflow-tooltip>
+              <template #default="scope">
+                <IdCodeListShow :idCodeList="scope.row.idCode" v-if="scope.row.idCode&&scope.row.idCode.length>0"
+                                @addTraceabilityCode="addTraceAbilityCodeHandler"/>
+                <div v-else>未关联</div>
+              </template>
+            </el-table-column>
+            <el-table-column label="发药数量" show-overflow-tooltip>
+              <template #default="scope">
+              {{scope.row.selectedNum}}{{scope.row.selectedUnit}}
+              </template>
+            </el-table-column>
+            <el-table-column label="已采/应采" show-overflow-tooltip>
+              <template #default="scope">
+                {{ scope.row.traceAbilityCodeList ? scope.row.traceAbilityCodeList.length : 0 }}/{{ scope.row.shouldNumber }}
+              </template>
+            </el-table-column>
+            <el-table-column label="追溯码" width="300">
+              <template #default="scope">
+                <TraceabilityCodeAdd :item="scope.row" @addTraceabilityCode="addTraceAbilityCodeHandler"/>
+              </template>
+            </el-table-column>
+          </el-table>
         </div>
       </div>
     </template>

From 0d70e1a7d09638936c89f834f70e0d7ee63e7703 Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Mon, 26 May 2025 11:49:04 +0800
Subject: [PATCH 20/33] dev

---
 src/components/charge/AssociationIdCode.vue | 49 +++++++++------------
 1 file changed, 21 insertions(+), 28 deletions(-)

diff --git a/src/components/charge/AssociationIdCode.vue b/src/components/charge/AssociationIdCode.vue
index dc6dab1..d2d363b 100644
--- a/src/components/charge/AssociationIdCode.vue
+++ b/src/components/charge/AssociationIdCode.vue
@@ -16,33 +16,27 @@
       </div>
       <div style="padding: 0 24px;flex: 1; min-height: 0;">
         <div class="list">
-          <table class="table" style="border-spacing: 0">
-            <thead style="background:#F1F5FB">
-            <tr class="table-title" style="background: #f1f5fb">
-              <th>选择</th>
-              <th>发药项目</th>
-              <th>产品标识码</th>
-              <th>系统处理</th>
-            </tr>
-            </thead>
-            <tbody class="table-body" style="height: 52px">
-            <tr v-for="(item,index) in tableData">
-              <td>
-                <input class="blue-radio" type="radio" :value="item.id" v-model="selected" @click="closeModal"/>
-              </td>
-              <td>{{ item.name }}</td>
-              <td>
-                <IdCodeListShow :idCodeList="item.idCode" v-if="item.idCode && item.idCode.length > 0"/>
-                <div v-else>未关联</div>
-              </td>
-              <td style="width: 300px;">
-                <template v-if="selected === item.id">
+          <el-table :data="tableData" :header-cell-style="{backgroundColor: '#F1F5FB'}">
+            <el-table-column label="选择" width="60">
+             <template #default="scope">
+              <input class="blue-radio" type="radio" :value="scope.row.id" v-model="selected" @click="closeModal"/>
+            </template>
+            </el-table-column>
+            <el-table-column prop="name" label="发药项目" show-overflow-tooltip/>
+            <el-table-column prop="idCode" label="产品标识码" width="140" show-overflow-tooltip>
+            <template #default="scope">
+              <IdCodeListShow :idCodeList="scope.row.idCode" v-if="scope.row.idCode && scope.row.idCode.length > 0"/>
+              <div v-else>未关联</div>
+            </template>
+            </el-table-column>
+            <el-table-column label="系统处理" width="160" show-overflow-tooltip>
+              <template #default="scope">
+                <div v-if="selected === scope.row.id">
                   关联产品标识码，采集追溯码自动识别商品
-                </template>
-              </td>
-            </tr>
-            </tbody>
-          </table>
+                </div>
+              </template>
+            </el-table-column>
+          </el-table>
         </div>
       </div>
     </div>
@@ -93,7 +87,6 @@ const addIdCode = () => {
   }
   let idCode = traceabilityCode.value.slice(0, 7);
   post("goods/goods/addIdCode", {goodsId: selected.value, idCode: idCode}).then((res: any) => {
-    show.value = false;
     for (let subItem of tableData.value) {
       if (subItem.id === selected.value) {
         if (subItem.idCode == null) {
@@ -102,6 +95,7 @@ const addIdCode = () => {
         subItem.idCode?.push(idCode);
         break
       }
+      close()
     }
   })
   const selectedItem = tableData.value.find((item: any) => item.id === selected.value);
@@ -109,7 +103,6 @@ const addIdCode = () => {
     return
   }
   addTraceabilityCodeDo(selectedItem)
-
 }
 
 const emit = defineEmits(["addIdCode", "addTraceabilityCode"])

From 9f04807cb8031a5b2a195271cb4c97e08768524a Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Mon, 26 May 2025 11:55:04 +0800
Subject: [PATCH 21/33] dev

---
 src/components/common/goods/GoodsDetail.vue     | 4 ++--
 src/components/common/service/ServiceDetail.vue | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/common/goods/GoodsDetail.vue b/src/components/common/goods/GoodsDetail.vue
index 6ff70d3..5d8a8b3 100644
--- a/src/components/common/goods/GoodsDetail.vue
+++ b/src/components/common/goods/GoodsDetail.vue
@@ -247,14 +247,14 @@ const colosInfo = () => {
   font-size: 16px;
   font-weight: 500;
   color: #333333;
-  height: 60px;
+  height: 40px;
 }
 
 .bottom {
   text-align: right;
   border-top: 1px solid #EAEAEC;
   display: flex;
-  height: 58px;
+  height: 50px;
   align-items: center;
 
   .search {
diff --git a/src/components/common/service/ServiceDetail.vue b/src/components/common/service/ServiceDetail.vue
index 2560f89..5b7695b 100644
--- a/src/components/common/service/ServiceDetail.vue
+++ b/src/components/common/service/ServiceDetail.vue
@@ -172,14 +172,14 @@ const hide = () => {
   font-size: 16px;
   font-weight: 500;
   color: #333333;
-  height: 60px;
+  height: 40px;
 }
 
 .bottom {
   text-align: right;
   border-top: 1px solid #EAEAEC;
   display: flex;
-  height: 58px;
+  height: 50px;
   align-items: center;
 
   .search {

From a0c20212ccb0bc11c6ba6e45d8f144de0b745edb Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Mon, 26 May 2025 13:48:47 +0800
Subject: [PATCH 22/33] dev

---
 .../member/memberProfile/Exchange.vue         |   5 +-
 src/components/member/memberProfile/Grant.vue |   4 +-
 .../member/memberProfile/VipEdit.vue          |   6 +-
 src/components/settings/MemberEdit.vue        |   6 +-
 src/components/settings/SectionEdit.vue       |   6 +-
 src/components/settings/item/ItemEdit.vue     |  11 +-
 src/components/settings/item/ItemSearch.vue   |  15 +-
 .../settings/item/group/GroupAdd.vue          |   2 +-
 .../settings/item/group/GroupList.vue         |  13 +-
 src/views/inventory/goods.vue                 |  40 +---
 src/views/inventory/inventory.vue             | 194 ++++++++----------
 src/views/settings/item.vue                   |  14 +-
 src/views/settings/log.vue                    |  59 +++---
 src/views/settings/member.vue                 |  13 +-
 src/views/settings/section.vue                |  18 +-
 15 files changed, 186 insertions(+), 220 deletions(-)

diff --git a/src/components/member/memberProfile/Exchange.vue b/src/components/member/memberProfile/Exchange.vue
index d6e6c0b..7fb1500 100644
--- a/src/components/member/memberProfile/Exchange.vue
+++ b/src/components/member/memberProfile/Exchange.vue
@@ -48,8 +48,8 @@
           <el-checkbox v-model="printReceipt">同时打印凭证</el-checkbox>
         </div>
         <div style="display:flex;">
-          <div class="default-btn" @click="reduceIntegral">兑换</div>
-          <div class="default-btn" style="margin-left: 24px" @click="close">取消</div>
+          <div class="small-btn" @click="close">取消</div>
+          <div class="small-btn" @click="reduceIntegral">兑换</div>
         </div>
       </div>
     </template>
@@ -122,6 +122,7 @@ const reduceIntegral = () => {
       flex-direction: column;
       justify-content: center;
       margin-left: 16px;
+
       .name {
         font-weight: bold;
         font-size: 24px;
diff --git a/src/components/member/memberProfile/Grant.vue b/src/components/member/memberProfile/Grant.vue
index 04dc01c..7721768 100644
--- a/src/components/member/memberProfile/Grant.vue
+++ b/src/components/member/memberProfile/Grant.vue
@@ -45,8 +45,8 @@
     </template>
     <template #footer>
       <div class="footer">
-        <div class="default-btn" @click="grant()">发放</div>
-        <div class="default-btn" style="margin-left: 24px" @click="close">取消</div>
+        <div class="small-btn" @click="close">取消</div>
+        <div class="small-btn" @click="grant()">发放</div>
       </div>
     </template>
   </Mask>
diff --git a/src/components/member/memberProfile/VipEdit.vue b/src/components/member/memberProfile/VipEdit.vue
index b2b212c..3f4aad0 100644
--- a/src/components/member/memberProfile/VipEdit.vue
+++ b/src/components/member/memberProfile/VipEdit.vue
@@ -186,10 +186,8 @@
           退出医保
         </div>
         <div class="bottom-right">
-          <el-button @click="close">取消</el-button>
-          <el-button type="primary" @click="submitForm">
-            保存
-          </el-button>
+          <span  class="default-btn" @click="close">取消</span>
+          <span class="default-btn" @click="submitForm">保存</span>
         </div>
       </div>
     </template>
diff --git a/src/components/settings/MemberEdit.vue b/src/components/settings/MemberEdit.vue
index cf00939..855cbc0 100644
--- a/src/components/settings/MemberEdit.vue
+++ b/src/components/settings/MemberEdit.vue
@@ -120,9 +120,9 @@
     </el-scrollbar>
     <template #footer>
       <div class="bottom">
-        <span class="default-btn" @click="save()">保存</span>
-        <span class="default-btn" style="margin: 0 24px">取消</span>
-        <span class="default-btn" v-if="memberInfo.id" @click="deleteDetail">删除</span>
+        <span class="small-btn" @click="save()">保存</span>
+        <span class="small-btn" @click="exit()">取消</span>
+        <span class="danger-btn" v-if="memberInfo.id" @click="deleteDetail">删除</span>
       </div>
     </template>
   </Mask>
diff --git a/src/components/settings/SectionEdit.vue b/src/components/settings/SectionEdit.vue
index 0c64d2f..335c4f2 100644
--- a/src/components/settings/SectionEdit.vue
+++ b/src/components/settings/SectionEdit.vue
@@ -115,9 +115,9 @@
     </template>
     <template #footer>
       <div class="bottom">
-        <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>
+        <span class="small-btn" @click="exit">取消</span>
+        <span class="small-btn" @click="save()">保存</span>
+        <span class="danger-btn" v-if="props.id" @click="deleteDetail">删除</span>
       </div>
     </template>
   </Mask>
diff --git a/src/components/settings/item/ItemEdit.vue b/src/components/settings/item/ItemEdit.vue
index 6f19364..22d260f 100644
--- a/src/components/settings/item/ItemEdit.vue
+++ b/src/components/settings/item/ItemEdit.vue
@@ -5,10 +5,7 @@
       <el-scrollbar>
         <div style="padding: 0 24px">
           <div class="header" style="width: 100%;display: flex;justify-content: center;margin-bottom: 10px">
-            <el-button type="primary" style="margin-top:10px" round class="btn" @click="openCreateSearch"
-                       plain>
-              一键建档
-            </el-button>
+            <span style="margin-top:10px" class="btn small-btn" @click="openCreateSearch">一键建档</span>
           </div>
           <el-form :model="form" label-width="auto" :rules="formRules" ref="formRef">
             <el-descriptions
@@ -63,9 +60,9 @@
     </template>
     <template #footer>
       <div class="bottom">
-        <el-button type="primary" @click="save()">保存</el-button>
-        <el-button @click="close">取消</el-button>
-        <el-button v-if="props.id" @click="deleteDetail" type="danger">删除</el-button>
+        <span class="small-btn" @click="save()">保存</span>
+        <span class="small-btn" @click="close">取消</span>
+        <span class="danger-btn" v-if="props.id" @click="deleteDetail">删除</span>
       </div>
     </template>
   </Mask>
diff --git a/src/components/settings/item/ItemSearch.vue b/src/components/settings/item/ItemSearch.vue
index d713d90..f41c4dc 100644
--- a/src/components/settings/item/ItemSearch.vue
+++ b/src/components/settings/item/ItemSearch.vue
@@ -10,7 +10,7 @@
               placeholder="请输入药品名称或者编号"
               @keydown.enter="searchSocialItem"
               clearable/>
-          <span class="default-btn" @click="searchSocialItem">搜索</span>
+          <span class="small-btn" @click="searchSocialItem">搜索</span>
         </div>
         <div class="search_result" style="width: 100%;padding: 0 12px">
           <div class="result_table" style="width: 100%;height: 100%;box-sizing: border-box;padding-bottom: 20px">
@@ -34,8 +34,8 @@
                          v-model:current-page="searchResult.pageNum" @current-change="changePage"/>
         </div>
         <div class="btn">
-          <span class="default-btn" @click="confirm">确认</span>
-          <span class="default-btn" @click="close">关闭</span>
+          <span class="small-btn" @click="confirm">确认</span>
+          <span class="small-btn" @click="close">关闭</span>
         </div>
       </div>
     </template>
@@ -137,15 +137,15 @@ const close = () => {
   display: flex;
   margin-bottom: 24px;
 
-  span {
-    line-height: 42px;
-  }
-
   .input {
     display: block;
     flex: 1;
   }
 
+  span {
+    line-height: 1;
+  }
+
   .default-btn {
     margin-left: 24px;
   }
@@ -181,7 +181,6 @@ const close = () => {
 
 :deep(.el-input__wrapper) {
   width: 100%;
-  height: 42px;
 }
 
 .btn {
diff --git a/src/components/settings/item/group/GroupAdd.vue b/src/components/settings/item/group/GroupAdd.vue
index f365a28..c9d537d 100644
--- a/src/components/settings/item/group/GroupAdd.vue
+++ b/src/components/settings/item/group/GroupAdd.vue
@@ -76,7 +76,7 @@
           </el-table-column>
           <el-table-column label="操作" width="80">
             <template #default="scope">
-              <span @click="removeTableRow(scope.row)" class="small-btn">删除</span>
+              <span @click="removeTableRow(scope.row)" style="color: #ff0000">删除</span>
             </template>
           </el-table-column>
         </el-table>
diff --git a/src/components/settings/item/group/GroupList.vue b/src/components/settings/item/group/GroupList.vue
index 378248a..6384c03 100644
--- a/src/components/settings/item/group/GroupList.vue
+++ b/src/components/settings/item/group/GroupList.vue
@@ -24,8 +24,8 @@
             </el-table-column>
             <el-table-column label="操作">
               <template #default="scope">
-                <el-button type="primary" link @click="editGroup(scope.row)">编辑</el-button>
-                <el-button type="primary" link @click="deleteGroup(scope.row)">删除</el-button>
+                <span class="edit" @click="editGroup(scope.row)">编辑</span>
+                <span class="delete" @click="deleteGroup(scope.row)">删除</span>
               </template>
             </el-table-column>
           </el-table>
@@ -194,4 +194,13 @@ const handleCurrentChange = (val: any) => {
   align-items: center;
   padding: 0 24px;
 }
+.edit{
+  cursor: pointer;
+  color: #4d6de4;
+  margin-right: 10px
+}
+.delete{
+  cursor: pointer;
+  color: #ff0000;
+}
 </style>
diff --git a/src/views/inventory/goods.vue b/src/views/inventory/goods.vue
index 71115a8..150cda2 100644
--- a/src/views/inventory/goods.vue
+++ b/src/views/inventory/goods.vue
@@ -67,7 +67,7 @@
             <span class="iconfont icon-RectangleCopy1"></span>
             重置
           </div>
-          <div class="default-btn" @click="searchGoods" style="margin-left: 24px">
+          <div class="default-btn" @click="searchGoods">
             <span class="iconfont icon-RectangleCopy"></span>
             搜索
           </div>
@@ -81,7 +81,7 @@
       </div>
     </div>
     <div class="content_goods">
-      <el-table :data="tableData" style="height: 100%;padding: 0 24px;" @row-click="openMack"
+      <el-table :data="tableData" style="height: 100%;" @row-click="openMack"
                 :header-cell-style="{ backgroundColor: '#F1F5FB' }">
         <el-table-column fixed prop="name" label="名称" width="200" show-overflow-tooltip>
           <template #default="scope">
@@ -433,13 +433,13 @@ const props = {multiple: true}
   height: 100%;
   display: flex;
   flex-direction: column;
-
+  border-radius: 8px;
+  padding: 24px 24px 0;
   .top {
-    height: 144px;
-    padding: 24px 24px 0;
     background: #fff;
     display: flex;
     flex-direction: column;
+    margin-bottom: 24px;
 
     .search {
       display: flex;
@@ -447,21 +447,18 @@ const props = {multiple: true}
 
       .left {
         flex: 1;
+        min-width: 0;
         display: flex;
         justify-content: space-between;
-        margin-right: 24px;
-
-        .el-form-item {
-          margin-right: 5px;
-        }
       }
 
     }
 
     .addBtn {
       span {
-        display: inline-block;
-        margin-right: 24px;
+       &:first-child  {
+        margin-left: 0;
+      }
       }
     }
   }
@@ -514,24 +511,5 @@ const props = {multiple: true}
 
 .btn-group {
   display: flex;
-
-  .btn {
-    width: 120px;
-    height: 42px;
-    background: #FFFFFF;
-    border-radius: 6px;
-    border: 1px solid #979797;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    margin-left: 24px;
-    cursor: pointer;
-
-    &:hover {
-      background: #4D6DE4;
-      color: #fff;
-      border: none;
-    }
-  }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/inventory/inventory.vue b/src/views/inventory/inventory.vue
index e539b57..7d5c9aa 100644
--- a/src/views/inventory/inventory.vue
+++ b/src/views/inventory/inventory.vue
@@ -78,37 +78,37 @@
       </div>
     </div>
     <div class="content_list">
-        <el-table :data="tableData" style="width: 100%;height: 100%" @row-click="open_edit"
-                  :header-cell-style="{ backgroundColor: '#F1F5FB' }">
-          <el-table-column fixed label="采购单号" show-overflow-tooltip>
-            <template #default="scope">
-              <div class="link">{{ scope.row.code }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column label="货单号" prop="shippingCode" show-overflow-tooltip>
-          </el-table-column>
-          <el-table-column label="品种" prop="kindCount" show-overflow-tooltip>
-          </el-table-column>
-          <el-table-column label="入库金额" show-overflow-tooltip>
-            <template #default="scope">
-              ￥{{ scope.row.totalPrice.toFixed(2) }}
-            </template>
-          </el-table-column>
-          <el-table-column label="采购人" prop="managerUserName" show-overflow-tooltip></el-table-column>
-          <el-table-column label="供应商" prop="supplierName" show-overflow-tooltip></el-table-column>
-          <el-table-column prop="purchaseDate" label="采购时间" show-overflow-tooltip>
-            <template #default="scope">
-              {{ formatDate(scope.row.purchaseDate) }}
-            </template>
-          </el-table-column>
-          <!--          <el-table-column prop="createDatetime" label="入库时间">-->
-          <!--            <template #default="scope">-->
-          <!--              {{ formatDate(scope.row.purchaseDate) }}-->
-          <!--            </template>-->
-          <!--          </el-table-column>-->
-          <el-table-column label="备注" prop="remark" show-overflow-tooltip>
-          </el-table-column>
-        </el-table>
+      <el-table :data="tableData" style="width: 100%;height: 100%" @row-click="open_edit"
+                :header-cell-style="{ backgroundColor: '#F1F5FB' }">
+        <el-table-column fixed label="采购单号" show-overflow-tooltip>
+          <template #default="scope">
+            <div class="link">{{ scope.row.code }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="货单号" prop="shippingCode" show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column label="品种" prop="kindCount" show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column label="入库金额" show-overflow-tooltip>
+          <template #default="scope">
+            ￥{{ scope.row.totalPrice.toFixed(2) }}
+          </template>
+        </el-table-column>
+        <el-table-column label="采购人" prop="managerUserName" show-overflow-tooltip></el-table-column>
+        <el-table-column label="供应商" prop="supplierName" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="purchaseDate" label="采购时间" show-overflow-tooltip>
+          <template #default="scope">
+            {{ formatDate(scope.row.purchaseDate) }}
+          </template>
+        </el-table-column>
+        <!--          <el-table-column prop="createDatetime" label="入库时间">-->
+        <!--            <template #default="scope">-->
+        <!--              {{ formatDate(scope.row.purchaseDate) }}-->
+        <!--            </template>-->
+        <!--          </el-table-column>-->
+        <el-table-column label="备注" prop="remark" show-overflow-tooltip>
+        </el-table-column>
+      </el-table>
     </div>
     <div class="bottom">
       <div class="page_btn_list">
@@ -124,7 +124,7 @@
     </div>
     <AddOrder ref="addOrderRef" @close="closeAddOrder"/>
     <EditOrder ref="editOrderRef" @close="closeEditOrder" @updateOrderDetail="init"/>
-    <UpLoad v-model="show" @initAddOrderData =initAddOrderData></UpLoad>
+    <UpLoad v-model="show" @initAddOrderData=initAddOrderData></UpLoad>
   </div>
 </template>
 
@@ -240,37 +240,37 @@ const resetSearch = () => {
   init()
 }
 const show = ref(false)
-const openUpload= ()=>{
-  show.value=true
+const openUpload = () => {
+  show.value = true
 }
 
-const initAddOrderData = (initData:any)=>{
+const initAddOrderData = (initData: any) => {
   const data = {
-    invoiceCode:initData.tag.invoice_code,
-    shippingCode:initData.tag.shipping_code,
-    remark:initData.tag.remark,
+    invoiceCode: initData.tag.invoice_code,
+    shippingCode: initData.tag.shipping_code,
+    remark: initData.tag.remark,
     purchaseDate: initData.tag.purchase_date,
   }
   let goodsList = []
-  for (let i=0;i<initData.list.length;i++){
+  for (let i = 0; i < initData.list.length; i++) {
     let item = initData.list[i]
-    let  goodsInfo = {
-      productionBatchCode:item.info.production_batch_code,
-      wholeNumber:item.info.whole_number,
-      productionDate:item.info.production_date,
-      expiryDate:item.info.expiry_date,
-      purchaseUnitPrice:item.info.purchase_unit_price,
-      goodId:item.id,
-      name:item.goods.name,
-      packagingUnit:item.goods.packagingUnit,
-      unitPrice:item.goods.unitPrice,
+    let goodsInfo = {
+      productionBatchCode: item.info.production_batch_code,
+      wholeNumber: item.info.whole_number,
+      productionDate: item.info.production_date,
+      expiryDate: item.info.expiry_date,
+      purchaseUnitPrice: item.info.purchase_unit_price,
+      goodId: item.id,
+      name: item.goods.name,
+      packagingUnit: item.goods.packagingUnit,
+      unitPrice: item.goods.unitPrice,
     }
     goodsList.push(goodsInfo)
   }
 
 
-  nextTick(()=>{
-    addOrderRef.value?.init(data,goodsList)
+  nextTick(() => {
+    addOrderRef.value?.init(data, goodsList)
   })
 }
 </script>
@@ -279,11 +279,47 @@ const initAddOrderData = (initData:any)=>{
 
 .container-wrapper {
   box-sizing: border-box;
-  padding: 24px;
+  padding: 24px 24px 0;
   overflow: hidden;
   display: flex;
   flex-direction: column;
   height: 100%;
+  border-radius: 8px;
+
+  .top {
+    background: #fff;
+    display: flex;
+    flex-direction: column;
+
+    .search {
+      display: flex;
+      justify-content: space-between;
+
+      .left {
+        flex: 1;
+        display: flex;
+        justify-content: space-between;
+        margin-right: 24px;
+
+        .el-form-item {
+          margin-right: 5px;
+        }
+      }
+
+      .right {
+        display: flex;
+      }
+
+    }
+
+    .addBtn {
+      span {
+        &:first-child {
+          margin-left: 0;
+        }
+      }
+    }
+  }
 
   .content_list {
     width: 100%;
@@ -361,63 +397,11 @@ const initAddOrderData = (initData:any)=>{
 
 }
 
-.top {
-  height: 110px;
-  background: #fff;
-  display: flex;
-  flex-direction: column;
-
-  .search {
-    display: flex;
-    justify-content: space-between;
-
-    .left {
-      flex: 1;
-      display: flex;
-      justify-content: space-between;
-      margin-right: 24px;
-
-      .el-form-item {
-        margin-right: 5px;
-      }
-    }
-
-    .right {
-      display: flex;
-
-      .btn {
-        width: 120px;
-        height: 42px;
-        background: #FFFFFF;
-        border-radius: 6px;
-        border: 1px solid #979797;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        margin-left: 24px;
-        cursor: pointer;
-
-        &:hover {
-          background: #4D6DE4;
-          color: #fff;
-          border: none;
-        }
-      }
-    }
-
-  }
-
-  .addBtn {
-    span{
-      display: inline-block;
-      margin-right: 24px;
-    }
-  }
-}
 :deep(.el-input__wrapper) {
   height: 42px;
   width: 200px;
 }
+
 :deep(.el-range-editor.el-input__wrapper) {
   height: 42px;
 }
diff --git a/src/views/settings/item.vue b/src/views/settings/item.vue
index b273ab2..192fbd4 100644
--- a/src/views/settings/item.vue
+++ b/src/views/settings/item.vue
@@ -37,13 +37,21 @@
     </div>
     <div class="table">
       <el-scrollbar>
-        <el-table :data="tableData" @row-click="rowClick">
+        <el-table :data="tableData" @row-click="rowClick" :header-cell-style="{ backgroundColor: '#F1F5FB' }">
           <el-table-column prop="itemSocialCode" label="医保码编码" width="200"
                            show-overflow-tooltip></el-table-column>
           <el-table-column prop="itemName" label="项目名称" show-overflow-tooltip></el-table-column>
           <el-table-column prop="unit" label="单位" show-overflow-tooltip></el-table-column>
-          <el-table-column prop="purchaseUnitPrice" label="原价" show-overflow-tooltip></el-table-column>
-          <el-table-column prop="unitPrice" label="售价" show-overflow-tooltip></el-table-column>
+          <el-table-column prop="purchaseUnitPrice" label="原价" show-overflow-tooltip>
+            <template #default="scope">
+              {{ scope.row.purchaseUnitPrice ? scope.row.purchaseUnitPrice + '元' : '' }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="unitPrice" label="售价" show-overflow-tooltip>
+            <template #default="scope">
+              {{ scope.row.unitPrice ? scope.row.unitPrice + '元' : '' }}
+            </template>
+          </el-table-column>
           <el-table-column prop="createDatetime" label="创建时间" show-overflow-tooltip>
             <template #default="scope">
               {{ formatDate(scope.row.createDatetime) }}
diff --git a/src/views/settings/log.vue b/src/views/settings/log.vue
index fe21471..888f758 100644
--- a/src/views/settings/log.vue
+++ b/src/views/settings/log.vue
@@ -1,35 +1,35 @@
 <template>
-  <div class="container-wrapper" style="padding: 24px">
+  <div class="container-wrapper" style="padding: 24px 24px 0">
     <div class="title">
-      <div class="left">
-        <el-form :inline="true" :model="searchModel">
-          <el-date-picker
-              v-model="selectedDate"
-              type="daterange"
-              range-separator="-"
-              @change="handleDateChange"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"
-          />
-          <el-input placeholder="请输入内容" v-model="searchModel.managerName" style="width: 180px;"></el-input>
-          <el-input placeholder="请输入内容" v-model="searchModel.message" style="width: 180px;"></el-input>
-          <span class="default-btn" @click="getData"><span class="iconfont icon-RectangleCopy" style="margin-right: 5px"></span>查询</span>
-        </el-form>
-      </div>
-      <div class="right">
-
-      </div>
+      <el-form :inline="true" :model="searchModel">
+        <el-date-picker
+            v-model="selectedDate"
+            type="daterange"
+            range-separator="-"
+            @change="handleDateChange"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+        />
+        <el-input placeholder="请输入内容" v-model="searchModel.managerName" style="width: 180px;"></el-input>
+        <el-input placeholder="请输入内容" v-model="searchModel.message" style="width: 180px;"></el-input>
+        <span class="default-btn" @click="getData">
+          <span class="iconfont icon-RectangleCopy"></span>
+          查询
+        </span>
+      </el-form>
     </div>
     <div class="content">
       <el-table
           :data="tableData"
           style="width: 100%;height: 100%"
+          :header-cell-style="{backgroundColor: '#F1F5FB'}"
+
       >
-        <el-table-column prop="managerName" label="用户名" width="100"></el-table-column>
-        <el-table-column prop="managerUsername" label="用户名" width="100"></el-table-column>
-        <el-table-column prop="message" label="操作" width="200"></el-table-column>
-        <el-table-column prop="createDatetime" label="时间" width="200"></el-table-column>
-        <el-table-column prop="params" label="请求参数">
+        <el-table-column prop="managerName" label="用户名" width="150" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="managerUsername" label="用户名" width="150" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="message" label="操作" width="200" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="createDatetime" label="时间" width="200" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="params" label="请求参数" show-overflow-tooltip>
           <template #default="scope">
             <el-input v-model="scope.row.params" class="input-with-select" disabled>
               <template #prepend>
@@ -111,18 +111,9 @@ const copy = (text: any) => {
 
   .title {
     font-size: 20px;
-    height: 60px;
-    line-height: 60px;
     background: #fff;
     font-weight: 500;
-
-    .left {
-      flex: 1;
-      display: flex;
-      justify-content: space-between;
-      margin-right: 24px;
-
-    }
+    margin-bottom: 24px;
   }
 
   .content {
diff --git a/src/views/settings/member.vue b/src/views/settings/member.vue
index f77af26..0b7d2bf 100644
--- a/src/views/settings/member.vue
+++ b/src/views/settings/member.vue
@@ -29,7 +29,10 @@
           <span class="iconfont icon-RectangleCopy1"></span>
           重置
         </span>
-        <span class="default-btn" @click="init()"><span class="iconfont icon-RectangleCopy"></span>查询</span>
+        <span class="default-btn" @click="init()">
+          <span class="iconfont icon-RectangleCopy"></span>
+          查询
+        </span>
         <span class="default-btn" @click="openDialog(null)">
           <span class="iconfont icon-jia"></span>
           新增
@@ -37,7 +40,7 @@
       </div>
     </div>
     <div class="table">
-      <el-table :data="tableData" style="width: 100%;height: 100%" @row-click="rowClick">
+      <el-table :data="tableData" style="width: 100%;height: 100%" @row-click="rowClick" :header-cell-style="{ backgroundColor: '#F1F5FB' }">
         <el-table-column prop="date" label="日期" width="180" show-overflow-tooltip>
           <template #default="scope">
             {{ formatDate(scope.row.memberInfo.createDatetime) }}
@@ -203,10 +206,4 @@ const resetSearch = () => {
 :deep(.el-select__wrapper) {
   height: 42px;
 }
-.default-btn{
-  margin-left: 5px;
-  &:first-child{
-    margin-left: 0;
-  }
-}
 </style>
\ No newline at end of file
diff --git a/src/views/settings/section.vue b/src/views/settings/section.vue
index 7e9cee7..8ed7177 100644
--- a/src/views/settings/section.vue
+++ b/src/views/settings/section.vue
@@ -33,9 +33,13 @@
       </div>
     </div>
     <div class="table">
-      <el-table :data="tableData" style="width: 100%" @row-click="rowClick">
+      <el-table :data="tableData" style="width: 100%" @row-click="rowClick" :header-cell-style="{ backgroundColor: '#F1F5FB' }">
         <el-table-column prop="name" label="科室类型" width="120" show-overflow-tooltip/>
-        <el-table-column prop="bedCnt" label="病床数量" width="80" show-overflow-tooltip/>
+        <el-table-column prop="bedCnt" label="病床数量" width="80" show-overflow-tooltip align="center">
+          <template #default="scope">
+            {{ scope.row.bedCnt?scope.row.bedCnt+'个':'' }}
+          </template>
+        </el-table-column>
         <el-table-column prop="beginDate" label="开始日期" width="120" show-overflow-tooltip/>
         <el-table-column prop="caty" label="类别" show-overflow-tooltip width="150">
           <template #default="scope">
@@ -44,17 +48,17 @@
         </el-table-column>
         <el-table-column prop="code" label="编码" width="180" show-overflow-tooltip/>
         <el-table-column prop="creationDate" label="创建日期" width="120" show-overflow-tooltip/>
-        <el-table-column prop="drPsncnt" label="医生人数" show-overflow-tooltip/>
+        <el-table-column prop="drPsncnt" label="医生人数" show-overflow-tooltip align="center"/>
         <el-table-column prop="endDate" label="结束日期" width="120" show-overflow-tooltip/>
         <el-table-column prop="info" label="信息" show-overflow-tooltip/>
         <el-table-column prop="medServScp" label="医疗服务范围" width="150" show-overflow-tooltip/>
         <el-table-column prop="memo" label="备注" show-overflow-tooltip/>
-        <el-table-column prop="nursPsncnt" label="护士人数" show-overflow-tooltip/>
-        <el-table-column prop="pharPsncnt" label="药剂师人数" width="100" show-overflow-tooltip/>
+        <el-table-column prop="nursPsncnt" label="护士人数" show-overflow-tooltip align="center"/>
+        <el-table-column prop="pharPsncnt" label="药剂师人数" width="100" show-overflow-tooltip align="center"/>
         <el-table-column prop="resperName" label="负责人姓名" width="100" show-overflow-tooltip/>
         <el-table-column prop="resperTel" label="负责人电话" width="200" show-overflow-tooltip/>
-        <el-table-column prop="socialBedCnt" label="社会病床数量" width="200" show-overflow-tooltip/>
-        <el-table-column prop="tecnPsncnt" label="技术人员人数" width="200" show-overflow-tooltip/>
+        <el-table-column prop="socialBedCnt" label="社会病床数量" width="200" show-overflow-tooltip align="center"/>
+        <el-table-column prop="tecnPsncnt" label="技术人员人数" width="200" show-overflow-tooltip align="center"/>
       </el-table>
     </div>
     <div class="bottom">

From e9a3464f62543116707f5065a8a69a55902d7cec Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Mon, 26 May 2025 14:11:44 +0800
Subject: [PATCH 23/33] dev

---
 src/components/inventory/apply/AddApply.vue   |  15 ++-
 .../inventory/supplier/AddSupplier.vue        |   4 +-
 src/views/charge/index.vue                    |  14 +--
 src/views/inventory/apply.vue                 | 104 +++++++++---------
 src/views/inventory/check.vue                 |  13 ++-
 src/views/inventory/inventory.vue             |   4 +-
 src/views/inventory/supplier.vue              |  12 +-
 7 files changed, 85 insertions(+), 81 deletions(-)

diff --git a/src/components/inventory/apply/AddApply.vue b/src/components/inventory/apply/AddApply.vue
index c90e8cb..5fcd669 100644
--- a/src/components/inventory/apply/AddApply.vue
+++ b/src/components/inventory/apply/AddApply.vue
@@ -27,6 +27,10 @@
           <span>领用药品</span>
           <div class="search">
             <GoodsSearch @selectCallBack="goodsSelectCallBack"></GoodsSearch>
+            <span class="default-btn" @click="goodsSelectCallBack">
+              <span class="iconfont icon-RectangleCopy"></span>
+              搜索
+            </span>
           </div>
         </div>
         <table class="simple-table" style="margin-top: 15px;width: 100% ;height:300px ;max-height:550px">
@@ -127,8 +131,8 @@
     </div>
     <template #footer>
       <div class="bottom">
-        <el-button type="primary" @click="save">保存</el-button>
-        <el-button type="primary" @click="exit">关闭</el-button>
+        <span  class="small-btn" @click="exit">关闭</span>
+        <span class="small-btn" @click="save">保存</span>
       </div>
     </template>
   </Mask>
@@ -187,9 +191,7 @@ const findIndexForTableList = (goodId: any) => {
   return tableList.value.findIndex((item: any) => item.goodId === goodId);
 }
 const goodsSelectCallBack = (inventory: any) => {
-  if (findIndexForTableList(inventory.goodId) != -1) {
-    return
-  }
+  if (findIndexForTableList(inventory.goodId) != -1) return
   post("inventory/goods/getByGoodsId", {goodsId: inventory.goodId,isZero:false}).then((res: any) => {
     inventory.batchList = res.inventoryGoodsList
     inventory.minPackagingUnit = res.minPackagingUnit
@@ -398,7 +400,8 @@ defineExpose({init})
       font-style: normal;
 
       .search {
-        width: 50%;
+        display: flex;
+        align-items: center;
       }
     }
 
diff --git a/src/components/inventory/supplier/AddSupplier.vue b/src/components/inventory/supplier/AddSupplier.vue
index 8845713..ea177ff 100644
--- a/src/components/inventory/supplier/AddSupplier.vue
+++ b/src/components/inventory/supplier/AddSupplier.vue
@@ -48,8 +48,8 @@
     </div>
     <template #footer>
       <div class="bottom">
-        <span class="default-btn" @click="save">确定</span>
-        <span class="default-btn" @click="close" style="margin-left: 24px">取消</span>
+        <span class="small-btn" @click="close">取消</span>
+        <span class="small-btn" @click="save">确定</span>
       </div>
     </template>
   </Mask>
diff --git a/src/views/charge/index.vue b/src/views/charge/index.vue
index c151658..d507790 100644
--- a/src/views/charge/index.vue
+++ b/src/views/charge/index.vue
@@ -1,4 +1,4 @@
-<template xmlns="http://www.w3.org/1999/html">
+<template>
   <div class="container">
     <div class="left">
       <chargeQueue @clickItem="clickItem" @getStatus="getStatus" ref="chargeQueueRef"></ChargeQueue>
@@ -338,13 +338,11 @@ const list = () => {
 }
 const getStatus = (status: any) => {
   statusDisabled.value = status
-  formData.value = {
-    patientInfo: {},
-    diagnosisMedicalRecord: {},
-    goodsDetail: [],
-    itemDetail: [],
-    patientRegistration: {}
-  }
+  initFormData()
+  nextTick(() => {
+    patientCardRef.value?.clear()
+    recordsConsumptionRef.value?.clearList();
+  })
 }
 //退费
 const refund = async () => {
diff --git a/src/views/inventory/apply.vue b/src/views/inventory/apply.vue
index 43770ca..018ba6e 100644
--- a/src/views/inventory/apply.vue
+++ b/src/views/inventory/apply.vue
@@ -21,7 +21,7 @@
             <span class="iconfont icon-RectangleCopy1"></span>
             重置
           </div>
-          <div class="default-btn" @click="getList" style="margin-left: 24px">
+          <div class="default-btn" @click="getList">
             <span class="iconfont icon-RectangleCopy"></span>
             搜索
           </div>
@@ -91,12 +91,10 @@
   </div>
 </template>
 <script setup lang="ts">
-import Mask from "@/components/common/Mask.vue";
 import AddApply from "@/components/inventory/apply/AddApply.vue";
 import {nextTick, onMounted, ref} from "vue";
 import {post} from "@/utils/request.ts";
 import DetailApply from "@/components/inventory/apply/DetailApply.vue";
-import {Refresh,Search} from "@element-plus/icons-vue";
 import {formatDateArray, getEndOfDay} from "@/utils/dateUtils.ts";
 
 const is_add = ref(false)
@@ -175,16 +173,64 @@ const resetSearch=  () => {
 @use "@/assets/scss/base.scss";
 .container-wrapper {
   box-sizing: border-box;
-  padding: 24px;
+  padding: 24px 24px 0;
   overflow: hidden;
   display: flex;
   flex-direction: column;
-  height: 100%;
+  border-radius: 8px;
+  .top {
+    background: #fff;
+    display: flex;
+    flex-direction: column;
+    margin-bottom: 24px;
+
+    .search {
+      display: flex;
+      justify-content: space-between;
+      .left {
+        flex: 1;
+        display: flex;
+        justify-content: space-between;
+        margin-right: 24px;
+        .el-form-item {
+          margin-right: 5px;
+        }
+      }
+      .right {
+        display: flex;
+        .btn {
+          width: 120px;
+          height: 42px;
+          background: #FFFFFF;
+          border-radius: 6px;
+          border: 1px solid #979797;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          margin-left: 24px;
+          cursor: pointer;
+          &:hover {
+            background: #4D6DE4;
+            color: #fff;
+            border: none;
+          }
+        }
+      }
+
+    }
+
+    .addBtn {
+      span {
+       &:first-child{
+         margin-left: 0;
+       }
+      }
+    }
+  }
   .content {
     width: 100%;
     flex: 1;
     overflow: hidden;
-    margin-top: base.$margin-base;
   }
   .bottom {
     width: 100%;
@@ -200,53 +246,7 @@ const resetSearch=  () => {
   }
 }
 
-.top {
-  height: 110px;
-  background: #fff;
-  display: flex;
-  flex-direction: column;
 
-  .search {
-    display: flex;
-    justify-content: space-between;
-    .left {
-      flex: 1;
-      display: flex;
-      justify-content: space-between;
-      margin-right: 24px;
-      .el-form-item {
-        margin-right: 5px;
-      }
-    }
-    .right {
-      display: flex;
-      .btn {
-        width: 120px;
-        height: 42px;
-        background: #FFFFFF;
-        border-radius: 6px;
-        border: 1px solid #979797;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        margin-left: 24px;
-        cursor: pointer;
-        &:hover {
-          background: #4D6DE4;
-          color: #fff;
-          border: none;
-        }
-      }
-    }
-
-  }
-
-  .addBtn {
-    span {
-      display: inline-block;
-    }
-  }
-}
 :deep(.el-input__wrapper){
   height: 42px;
 }
diff --git a/src/views/inventory/check.vue b/src/views/inventory/check.vue
index a09b573..d7fc204 100644
--- a/src/views/inventory/check.vue
+++ b/src/views/inventory/check.vue
@@ -21,7 +21,7 @@
             <span class="iconfont icon-RectangleCopy1"></span>
             重置
           </div>
-          <div class="default-btn" @click="getCheck" style="margin-left: 24px">
+          <div class="default-btn" @click="getCheck">
             <span class="iconfont icon-RectangleCopy"></span>
             搜索
           </div>
@@ -175,11 +175,11 @@ const resetSearch = () => {
   display: flex;
   flex-direction: column;
   height: 100%;
-  padding: 24px;
+  padding: 24px 24px 0;
+  border-radius: 8px;
 
   .content_list {
     flex: 1;
-    margin-top: base.$margin-base;
     min-height: 0;
   }
 
@@ -197,10 +197,10 @@ const resetSearch = () => {
 }
 
 .top {
-  height: 110px;
   background: #fff;
   display: flex;
   flex-direction: column;
+  margin-bottom: 24px;
 
   .search {
     display: flex;
@@ -244,8 +244,9 @@ const resetSearch = () => {
 
   .addBtn {
     span {
-      display: inline-block;
-      margin-right: 24px;
+      &:first-child{
+        margin-left: 0;
+      }
     }
   }
 }
diff --git a/src/views/inventory/inventory.vue b/src/views/inventory/inventory.vue
index 7d5c9aa..eb01287 100644
--- a/src/views/inventory/inventory.vue
+++ b/src/views/inventory/inventory.vue
@@ -66,7 +66,7 @@
             <span class="iconfont icon-RectangleCopy1"></span>
             重置
           </div>
-          <div class="default-btn" @click="init" style="margin-left: 24px">
+          <div class="default-btn" @click="init">
             <span class="iconfont icon-RectangleCopy"></span>
             搜索
           </div>
@@ -290,6 +290,7 @@ const initAddOrderData = (initData: any) => {
     background: #fff;
     display: flex;
     flex-direction: column;
+    margin-bottom: 24px;
 
     .search {
       display: flex;
@@ -325,7 +326,6 @@ const initAddOrderData = (initData: any) => {
     width: 100%;
     flex: 1;
     overflow: hidden;
-    margin-top: base.$margin-base;
   }
 
   .bottom {
diff --git a/src/views/inventory/supplier.vue b/src/views/inventory/supplier.vue
index d7e1245..20a913c 100644
--- a/src/views/inventory/supplier.vue
+++ b/src/views/inventory/supplier.vue
@@ -21,7 +21,7 @@
             <span class="iconfont icon-RectangleCopy1"></span>
             重置
           </div>
-          <div class="default-btn" @click="getSupplier" style="margin-left: 24px">
+          <div class="default-btn" @click="getSupplier">
             <span class="iconfont icon-RectangleCopy"></span>
             搜索
           </div>
@@ -122,15 +122,15 @@ const resetSearch = () => {
 @use "@/assets/scss/base.scss";
 .container-wrapper {
   box-sizing: border-box;
-  padding: 24px;
+  padding: 24px 24px 0;
   overflow: hidden;
   display: flex;
   flex-direction: column;
   height: 100%;
+  border-radius: 8px;
   .content {
     width: 100%;
     flex: 1;
-    margin-top: base.$margin-base;
   }
   .bottom {
     width: 100%;
@@ -147,10 +147,10 @@ const resetSearch = () => {
 }
 
 .top {
-  height: 110px;
   background: #fff;
   display: flex;
   flex-direction: column;
+  margin-bottom: 24px;
 
   .search {
     display: flex;
@@ -189,7 +189,9 @@ const resetSearch = () => {
 
   .addBtn {
     span {
-      display: inline-block;
+      &:first-child{
+        margin-left: 0;
+      }
     }
   }
 }

From 08738c3559a250520f7bd16dc9ddc189b5d4fef0 Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Mon, 26 May 2025 14:34:07 +0800
Subject: [PATCH 24/33] dev

---
 src/assets/config/apiConfig.ts                | 45 ++++++++++---------
 src/components/outpatient/Case.vue            |  7 +--
 src/components/outpatient/MedicalQueue.vue    | 13 +++---
 ...ueExamInuput.vue => PhysiqueExamInput.vue} |  0
 src/components/registration/Edit.vue          |  4 +-
 src/views/outpatient/index.vue                | 13 ++----
 src/views/registration/index.vue              |  5 +--
 7 files changed, 43 insertions(+), 44 deletions(-)
 rename src/components/outpatient/{PhysiqueExamInuput.vue => PhysiqueExamInput.vue} (100%)

diff --git a/src/assets/config/apiConfig.ts b/src/assets/config/apiConfig.ts
index b963a44..6482e3d 100644
--- a/src/assets/config/apiConfig.ts
+++ b/src/assets/config/apiConfig.ts
@@ -1,42 +1,47 @@
-export enum apiConfig{
+export enum apiConfig {
     /**
      * 用户操作
      */
-    "ManagerUserLogin"="manager/user/login",//登录
-    "signIn"="sign/in",//签到
-    "signOut"="sign/out",//签退
-    "managerUserVerify"="manager/user/verify",//获取用户信息
+    "ManagerUserLogin" = "manager/user/login",//登录
+    "signIn" = "sign/in",//签到
+    "signOut" = "sign/out",//签退
+    "managerUserVerify" = "manager/user/verify",//获取用户信息
     /**
      * 挂号操作
      */
-    "registrationList"="registration/list",//挂号列表
+    "RegistrationList" = "registration/list",//挂号列表
+    "RegistrationAdd" = "registration/add",//添加挂号
+    "RegistrationEdit" = "registration/edit",//修改挂号
+
     /**
      * 接诊操作
      */
-    "RegistrationDetail" ="medical/record/getDetailByRegisId",//详情
-    "RegistrationList" ="registration/getListByType",//患者列表
-    "RegistrationChangeStatus"="registration/changeStatus",
-
+    "RegistrationChangeStatus" = "registration/changeStatus",//挂号状态
+    "MedicalDetailByRegisId" = "medical/record/getDetailByRegisId",//患者详情
+    "RegistrationListByType" = "registration/getListByType",//患者列表
+    "StatisticsGetTipCount" = "statistics/getTipCount",//患者状态数量
+    "MedicalRecordSave" = "medical/record/save",//保存接诊信息
+    "SocialDiagnoseSearch" = "social/diagnose/search",//接诊详情
     /**
      * 科室成员信息
      */
-    "OrganizationMemberSave"="organization/member/save",//添加 编辑成员信息
-    "OrganizationMemberSearch"="organization/member/search",//搜索成员
-    "OrganizationSectionAllList"="organization/section/allList",//获取所有科室列表
-    "OrganizationSectionListByMemberId"="organization/section/listByMemberId",//获取当前成员所属科室列表
-    "OrganizationMemberListBySectionId"="organization/member/listBySectionId",//获取当前科室的所有医生列表
+        "OrganizationMemberSave" = "organization/member/save",//添加 编辑成员信息
+    "OrganizationMemberSearch" = "organization/member/search",//搜索成员
+    "OrganizationSectionAllList" = "organization/section/allList",//获取所有科室列表
+    "OrganizationSectionListByMemberId" = "organization/section/listByMemberId",//获取当前成员所属科室列表
+    "OrganizationMemberListBySectionId" = "organization/member/listBySectionId",//获取当前科室的所有医生列表
 
     /**
      * 商品
      */
-    "GoodsDisableSale"="goods/goods/disableSale",
-    "GoodsEnableSale"="goods/goods/enableSale",
-    
+        "GoodsDisableSale" = "goods/goods/disableSale",
+    "GoodsEnableSale" = "goods/goods/enableSale",
+
 
     /**
      * 收费接口
      */
 
-    "ChargeListChargeLog"="charge/listChargeLog",//查询收费记录
-    "RecordGetChargeQueue"="medical/record/getChargeQueue"//查询收费记录
+        "ChargeListChargeLog" = "charge/listChargeLog",//查询收费记录
+    "RecordGetChargeQueue" = "medical/record/getChargeQueue"//查询收费记录
 }
diff --git a/src/components/outpatient/Case.vue b/src/components/outpatient/Case.vue
index 6d5f54a..71f9402 100644
--- a/src/components/outpatient/Case.vue
+++ b/src/components/outpatient/Case.vue
@@ -40,7 +40,7 @@
           <PopoverInput :disabled="props.disabled" v-model="formDate.allergyHistory" :list="allergyHistoryList"/>
         </el-form-item>
         <el-form-item label="体格检查:" v-if="!props.isShowFrom">
-          <PhysiqueExamInuput :disabled="props.disabled" v-model="formDate.exam" :list="physiqueExamList"/>
+          <PhysiqueExamInput :disabled="props.disabled" v-model="formDate.exam" :list="physiqueExamList"/>
         </el-form-item>
         <el-form-item label="望闻问切:" v-if="formDate.diagType==1&&!props.isShowFrom">
           <PopoverInput :disabled="props.disabled" v-model="formDate.chinaAdjunctCheck" :list="chinaAdjunctCheckList"/>
@@ -75,7 +75,8 @@ import {
 import Panel from "@/components/common/Panel.vue";
 import PopoverInput from "@/components/PopoverInput.vue";
 import DiagnosisSearchInput from "@/components/outpatient/DiagnosisSearchInput.vue";
-import PhysiqueExamInuput from "@/components/outpatient/PhysiqueExamInuput.vue";
+import PhysiqueExamInput from "@/components/outpatient/PhysiqueExamInput.vue";
+import {apiConfig} from "@/assets/config/apiConfig.ts";
 
 const props = defineProps({
   disabled: {
@@ -94,7 +95,7 @@ interface ShowConfig {
   prop: string;
 }
 
-const diagnosisSearchApi = "social/diagnose/search"
+const diagnosisSearchApi = apiConfig.SocialDiagnoseSearch
 const diagnosisShowConfig: ShowConfig[] = [
   {
     label: "诊断名称",
diff --git a/src/components/outpatient/MedicalQueue.vue b/src/components/outpatient/MedicalQueue.vue
index 57b5247..8692d26 100644
--- a/src/components/outpatient/MedicalQueue.vue
+++ b/src/components/outpatient/MedicalQueue.vue
@@ -35,7 +35,7 @@
                        alt="头像"/>
                   <img v-if="item.gender==2" class="avatar" src="/static/images/outpatient/women.png"
                        alt="头像"/>
-                   <span v-if="item.isAppointment" class="iconfont icon-yuyue yuYueIcon" ></span>
+                   <span v-if="item.isAppointment" class="iconfont icon-yuyue yuYueIcon"></span>
                 </span>
               <span class="item-name">{{ item.name }}</span>
               <span class="item-time">
@@ -144,7 +144,7 @@ const init = async () => {
   clickLi(null)
   loading.value = true
   try {
-    let data: any = await post(apiConfig.RegistrationList, {
+    let data: any = await post(apiConfig.RegistrationListByType, {
       query: {
         status: curStatus.value,
         beginTime: selectedDate.value,
@@ -168,7 +168,7 @@ const init = async () => {
   initStatusList()
 }
 const initStatusList = () => {
-  post('statistics/getTipCount', {
+  post(apiConfig.StatisticsGetTipCount, {
     beginTime: selectedDate.value,
     endTime: getEndOfDay(new Date(selectedDate.value))
   }).then((res: any) => {
@@ -192,12 +192,12 @@ const clickLi = (item: any, showBox: any = true) => {
           return
         }
         if (action == "confirm") {
-          post('registration/changeStatus', {id: item.id, status: 2}).then((res: any) => {
+          post(apiConfig.RegistrationChangeStatus, {id: item.id, status: 2}).then((res: any) => {
             curStatus.value = 2
             curItem.value = res
             initStatusList()
             emit('clickItem', curItem.value)
-            selectedDate.value=getCurrentDate()
+            selectedDate.value = getCurrentDate()
           })
         }
       },
@@ -405,7 +405,8 @@ watch(() => selectedDate.value, (newValue, oldValue) => {
   right: 0;
   top: 50px;
 }
-.yuYueIcon{
+
+.yuYueIcon {
   width: 13px;
   height: 13px;
   position: absolute;
diff --git a/src/components/outpatient/PhysiqueExamInuput.vue b/src/components/outpatient/PhysiqueExamInput.vue
similarity index 100%
rename from src/components/outpatient/PhysiqueExamInuput.vue
rename to src/components/outpatient/PhysiqueExamInput.vue
diff --git a/src/components/registration/Edit.vue b/src/components/registration/Edit.vue
index fad493a..70fc1c7 100644
--- a/src/components/registration/Edit.vue
+++ b/src/components/registration/Edit.vue
@@ -309,7 +309,7 @@ const save = () => {
 
       }
       if (edit_data.value.id) {
-        post('registration/edit', {
+        post(apiConfig.RegistrationEdit, {
           data: data, mdtrtCertNo: socialCard.value?.mdtrtCertNo,
           mdtrtCertType: socialCard.value?.mdtrtCertType
         }).then(() => {
@@ -317,7 +317,7 @@ const save = () => {
           close()
         })
       } else {
-        post('registration/add', {
+        post(apiConfig.RegistrationAdd, {
           data: data,
           mdtrtCertNo: socialCard.value?.mdtrtCertNo,
           mdtrtCertType: socialCard.value?.mdtrtCertType
diff --git a/src/views/outpatient/index.vue b/src/views/outpatient/index.vue
index f89057f..ab6fadb 100644
--- a/src/views/outpatient/index.vue
+++ b/src/views/outpatient/index.vue
@@ -40,10 +40,10 @@
 import MedicalQueue from "@/components/outpatient/MedicalQueue.vue";
 import MedicalHistory from "@/components/outpatient/MedicalHistory.vue";
 import Case from "@/components/outpatient/Case.vue";
-import {ref, watch, nextTick, onMounted} from "vue";
+import {ref, watch, nextTick} from "vue";
 import Settlement from "@/components/outpatient/Settlement.vue";
 import {post} from "@/utils/request.ts";
-import {type Action, ElMessage, ElMessageBox} from "element-plus";
+import {ElMessage} from "element-plus";
 import {apiConfig} from "@/assets/config/apiConfig.ts";
 import PatientCard from "@/components/charge/PatientCard.vue";
 import ServiceDetail from "@/components/common/service/ServiceDetail.vue";
@@ -52,8 +52,6 @@ import GoodsDetail from "@/components/common/goods/GoodsDetail.vue";
 const curRegister = ref<any>()
 const registerId = ref()
 const patientId = ref()
-const itemDetail = ref([])
-const goodsList = ref([])
 const formData = ref<any>({
   diagType: 0,
   itemDetail: [],
@@ -102,7 +100,7 @@ const save = () => {
   if (!formData.value.diagnosisDetail || JSON.parse(formData.value.diagnosisDetail).length == 0) {
     ElMessage.error("请填写诊断信息")
   } else {
-    post('medical/record/save', {data: data}).then((res: any) => {
+    post(apiConfig.MedicalRecordSave, {data: data}).then((res: any) => {
       ElMessage.success("接诊完毕,请到收费页面收费")
       debugger
       medicalQueueRef.value?.changeCurItemOrStatus(res, 3);
@@ -110,7 +108,6 @@ const save = () => {
     })
   }
 }
-const totalAmount = ref(0)
 const medicalHistoryRef = ref()
 const patientCardRef = ref()
 const patientRegistration = ref<any>({})//  当前挂号信息
@@ -127,7 +124,7 @@ const clickItem = (item: any) => {
     initFormData()
   }
   if (item.status == 3) {
-    post(apiConfig.RegistrationDetail, {
+    post(apiConfig.MedicalDetailByRegisId, {
       regisId: item.id
     }).then((res: any) => {
       formData.value = res.diagnosisMedicalRecord
@@ -142,9 +139,7 @@ const clickItem = (item: any) => {
     })
 
   }
-
   nextTick(() => {
-
     medicalHistoryRef.value?.init(patientId.value);
     patientCardRef.value?.init(curRegister.value?.id)
   })
diff --git a/src/views/registration/index.vue b/src/views/registration/index.vue
index 87583e5..6aca97c 100644
--- a/src/views/registration/index.vue
+++ b/src/views/registration/index.vue
@@ -91,8 +91,6 @@
 </template>
 <script setup lang="ts">
 import {nextTick, onMounted, ref} from 'vue'
-import Picker from "@/components/Picker.vue";
-import Mask from "@/components/common/Mask.vue";
 import Edit from "@/components/registration/Edit.vue";
 import List from "@/components/registration/List.vue";
 import {post} from "@/utils/request";
@@ -101,7 +99,6 @@ import Calendar from "@/components/common/Calendar.vue";
 import Panel from "@/components/common/Panel.vue";
 import {apiConfig} from "@/assets/config/apiConfig.ts";
 import {Search} from "@element-plus/icons-vue";
-import {ElMessage} from "element-plus";
 
 const dateName = ref<any>('挂号')
 const selectDate = (date: any) => {
@@ -161,7 +158,7 @@ const getPatientList = async () => {
   listLoading.value = true
   id.value = null
   try {
-    const data: any = await post(apiConfig.registrationList, {
+    const data: any = await post(apiConfig.RegistrationList, {
       page: page.value,
       size: size.value,
       startDate: selectedDate.value[0],

From 5fbe4a5180a5de50d1bf32be51bac070c71fe1a3 Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Mon, 26 May 2025 16:36:25 +0800
Subject: [PATCH 25/33] dev

---
 src/components/SearchInput.vue                | 111 +++---------------
 src/components/common/goods/GoodsDetail.vue   |  21 ++--
 .../common/service/ServiceDetail.vue          |  12 +-
 3 files changed, 30 insertions(+), 114 deletions(-)

diff --git a/src/components/SearchInput.vue b/src/components/SearchInput.vue
index f5e398a..ac3de17 100644
--- a/src/components/SearchInput.vue
+++ b/src/components/SearchInput.vue
@@ -17,47 +17,23 @@
           @click="changeInput"
       />
     </template>
-    <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>
-          <tr class="table-title">
-            <th
-                v-for="item in showConfig"
-                :key="item.prop"
-                style="background-color: #f5f7fa; padding: 8px;"
-            >
-              {{ item.label }}
-            </th>
-          </tr>
-          </thead>
-          <!-- 表体 -->
-          <tbody>
-          <tr class="table-body"
-              v-for="(item, index) in searchList"
-              :key="index"
-              @click="clickRow(item)"
-              style="cursor: pointer; transition: background-color 0.2s;"
-          >
-            <td
-                v-for="showItem in showConfig"
-                :key="showItem.prop"
-                style="vertical-align: middle; padding: 8px;"
-            >
-              {{ item[showItem.prop] }}
-            </td>
-          </tr>
-          </tbody>
-        </table>
-      </el-scrollbar>
+    <div class="container" style="max-height: 300px">
+      <el-table :data="searchList" max-height="300" :header-cell-style="{ backgroundColor: '#F1F5FB' }">
+        <el-table-column
+            v-for="(conf, index) in props.showConfig"
+            :key="index"
+            :label="conf.label"
+            :prop="conf.prop"
+            show-overflow-tooltip
+        />
+    </el-table>
     </div>
   </el-popover>
 
 </template>
 
 <script setup lang="ts">
-import {ref, unref} from "vue";
+import {ref, unref, computed, onMounted} from "vue";
 import {post} from "@/utils/request.ts";
 import {Plus} from "@element-plus/icons-vue";
 
@@ -97,7 +73,7 @@ const props = defineProps({
   }
 });
 
-const searchList = ref([]);
+const searchList = ref<any>([]);
 
 const changeInput = (inputStr: string) => {
   unref(popoverRef).popperRef?.delayHide?.()
@@ -105,11 +81,10 @@ const changeInput = (inputStr: string) => {
     return;
   }
   post(props.requestApi, {keyword: keyword.value}).then((res: any) => {
-    searchList.value = res;
+    searchList.value = res
   });
 
 };
-
 const emit = defineEmits(['selectedCallBack', 'focus']);
 
 const clickRow = (row: any) => {
@@ -150,62 +125,8 @@ const handlerBlur = () => {
     border: 1px solid #409eff !important;
   }
 }
-
-.table {
-  th {
-    background: none !important;
-  }
-
-  .table-title {
-    height: 52px;
-    font-weight: 500;
-    font-size: 14px;
-    color: #333333;
-    font-style: normal;
-
-    th {
-      text-align: left;
-
-      &:nth-child(1) {
-        width: 200px;
-        text-align: left;
-        border-radius: 8px 8px 0 0;
-        padding-left: 24px !important;
-      }
-    }
-  }
-
-  .table-body {
-    height: 52px;
-    font-weight: 500;
-    font-size: 14px;
-    color: #666666;
-    font-style: normal;
-
-    td {
-      &:nth-child(1) {
-        width: 200px;
-        text-align: left;
-        padding-left: 30px !important;
-        white-space: nowrap; /* 防止文本换行 */
-        overflow: hidden; /* 隐藏溢出的文本 */
-        text-overflow: ellipsis; /* 显示省略号 */
-      }
-    }
-
-
-    &:last-child {
-      border-radius: 0 0 8px 8px;
-    }
-
-    &:hover {
-      background-color: #4D6DE4;
-      color: #fff;
-    }
-  }
-}
-
-table thead tr {
-  background: #F5FAFF;;
+:deep(.el-table__cell) {
+  padding: 0 4px;
+  height: 36px;
 }
 </style>
\ No newline at end of file
diff --git a/src/components/common/goods/GoodsDetail.vue b/src/components/common/goods/GoodsDetail.vue
index 5d8a8b3..12765b8 100644
--- a/src/components/common/goods/GoodsDetail.vue
+++ b/src/components/common/goods/GoodsDetail.vue
@@ -51,8 +51,9 @@
         <el-table-column prop="number" label="数量" width="250">
           <template #default="scope">
             <div v-if="props.status">
-              <el-input-number v-model="scope.row.selectedNum" ref="inputRef" :min="0" @change="handleNumChange(scope.row)"
-                               style="margin-right: 5px"></el-input-number>
+              <el-input-number v-model="scope.row.selectedNum" ref="inputRef" :min="0"
+                               @change="handleNumChange(scope.row)"
+                               style="margin-right: 5px" size="small"></el-input-number>
               <el-dropdown v-if="scope.row.trdnFlag == 1">
                 <span style="line-height: 30px;margin-left: 10px;cursor: pointer">{{ scope.row.selectedUnit }}</span>
                 <template #dropdown>
@@ -130,7 +131,6 @@ const showTooltip = ref(false);
 const goodsDetail = defineModel<any>();
 const delGoods = (item: any) => {
   goodsDetail.value = goodsDetail.value.filter((i: any) => i.id != item.id)
-
 }
 
 const goodsSearchApi = "goods/goods/search";
@@ -168,7 +168,7 @@ const goodsShowConfig = [
     prop: "limit",
   }
 ]
-const inputRef=ref<any>()
+const inputRef = ref<any>()
 const goodsSelect = (row: any) => {
   row.selectedNum = 1
   row.selectedUnit = row.packagingUnit
@@ -225,10 +225,9 @@ const focus = (e: any) => {
 }
 const hilistInfo = ref<any>({})
 const getHilistInfo = (item: any) => {
-  console.log("item", item)
   if (item.hilistCode != null) {
     post("social/directory/getByCode", {code: item.hilistCode}).then((res: any) => {
-      if (!res){
+      if (!res) {
         hilistInfo.value = {}
         return
       }
@@ -243,18 +242,16 @@ const colosInfo = () => {
 }
 </script>
 <style scoped lang="scss">
-:deep(.el-table tr) {
-  font-size: 16px;
-  font-weight: 500;
-  color: #333333;
-  height: 40px;
+:deep(.el-table__cell) {
+  padding: 0 4px;
+  height: 36px;
 }
 
 .bottom {
   text-align: right;
   border-top: 1px solid #EAEAEC;
   display: flex;
-  height: 50px;
+  height: 36px;
   align-items: center;
 
   .search {
diff --git a/src/components/common/service/ServiceDetail.vue b/src/components/common/service/ServiceDetail.vue
index 5b7695b..00aee81 100644
--- a/src/components/common/service/ServiceDetail.vue
+++ b/src/components/common/service/ServiceDetail.vue
@@ -37,7 +37,7 @@
         <el-table-column label="数量" width="250">
           <template #default="scope">
             <el-input-number v-if="props.status" v-model="scope.row.selectedNum" :min="0"
-                             @change="handleNumChange" style="margin-right: 5px"></el-input-number>
+                             @change="handleNumChange" style="margin-right: 5px" size="small"></el-input-number>
             <span v-else>{{ scope.row.selectedNum }}</span>
             {{ scope.row.selectedUnit }}
           </template>
@@ -168,18 +168,16 @@ const hide = () => {
 }
 </script>
 <style scoped lang="scss">
-:deep(.el-table tr) {
-  font-size: 16px;
-  font-weight: 500;
-  color: #333333;
-  height: 40px;
+:deep(.el-table__cell) {
+  padding: 0 4px;
+  height: 36px;
 }
 
 .bottom {
   text-align: right;
   border-top: 1px solid #EAEAEC;
   display: flex;
-  height: 50px;
+  height: 36px;
   align-items: center;
 
   .search {

From 6c7616d52060acd3dbde8f56043a15f1738e2fe2 Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Tue, 27 May 2025 10:24:29 +0800
Subject: [PATCH 26/33] dev

---
 .../static}/iconfont/iconfont.css             |   9 +++--
 public/static/iconfont/iconfont.ttf           | Bin 0 -> 2828 bytes
 public/static/iconfont/iconfont.woff          | Bin 0 -> 1884 bytes
 src/assets/iconfont/iconfont.ttf              | Bin 2556 -> 0 bytes
 src/assets/iconfont/iconfont.woff             | Bin 1740 -> 0 bytes
 src/assets/scss/main.scss                     |  37 ++++++++++++++++++
 src/components/inventory/goods/Edit.vue       |   3 +-
 src/components/inventory/goods/SocialInfo.vue |  26 ++++++------
 src/components/outpatient/MedicalHistory.vue  |   1 -
 src/components/outpatient/MedicalQueue.vue    |  14 ++++++-
 src/components/outpatient/Settlement.vue      |   2 +-
 src/components/registration/Edit.vue          |  12 +++++-
 src/main.ts                                   |   2 +-
 src/views/outpatient/index.vue                |   7 +++-
 14 files changed, 89 insertions(+), 24 deletions(-)
 rename {src/assets => public/static}/iconfont/iconfont.css (74%)
 create mode 100644 public/static/iconfont/iconfont.ttf
 create mode 100644 public/static/iconfont/iconfont.woff
 delete mode 100644 src/assets/iconfont/iconfont.ttf
 delete mode 100644 src/assets/iconfont/iconfont.woff

diff --git a/src/assets/iconfont/iconfont.css b/public/static/iconfont/iconfont.css
similarity index 74%
rename from src/assets/iconfont/iconfont.css
rename to public/static/iconfont/iconfont.css
index db80712..aa1d1ff 100644
--- a/src/assets/iconfont/iconfont.css
+++ b/public/static/iconfont/iconfont.css
@@ -1,8 +1,7 @@
 @font-face {
   font-family: "iconfont"; /* Project id 4921806 */
-  src:
-       url('iconfont.woff?t=1747990278440') format('woff'),
-       url('iconfont.ttf?t=1747990278440') format('truetype');
+  src: url('iconfont.woff?t=1748312335696') format('woff'),
+       url('iconfont.ttf?t=1748312335696') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +12,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-yuyueh:before {
+  content: "\e60d";
+}
+
 .icon-yuyue:before {
   content: "\e606";
 }
diff --git a/public/static/iconfont/iconfont.ttf b/public/static/iconfont/iconfont.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..b2f6fd7b80599c2a80f82d782d8173d148fe2afe
GIT binary patch
literal 2828
zcmd^B?Qc_67=O;a?Y-@`+pb-2$IIAC=h}^R-PW}o>&BdnZ6RzKFJl%m16_OD4!gE=
z?Vw1)e8Yfb7!zVlgb4Bl69X6%Vq%Qn41^CFNsNg>V@T1728|d$xX$O?d&{!Hf8e<}
z=lq_xbDo!T@3}w#pd99ag|?wRd$-!&Y&Zr$HY0azbWf|Nr)K0`q|YFIFgzVf59~<{
z05Ce_-Hj#k(VfX#e*m!m0BCyRQYg}V=l*)s{SmuAjtu?>_6@|JVSgq*ojqCuOG{|`
z0O^`UDjZ^ynsK!M8R^RD(9tvzVIRuZAZ<&ArlracdaeQJytrp9otnwseeo9&pzJ-A
zrvZIu=a%MRLW8R=EolhltZ2N<LGGVF%{vYldmcf#Mpn4D|Le09&>2lnXbAf<k~&~y
zF}i>=4<n$cQ*IeP0O-BksJsl?pcj~JgTrHBNQAOUSf}bM_KK~7Nn$D%!u3@O^{A8}
zhXAK?H5wpqffi#u#oR{TS!E`_f`_0b16mfjPiZ@&0}=S5z%AUA^8xJlK%=2PE;oj5
zsC3NLW32Fy#C`D;0JszpIjP#uA(yV?!WlDwd<~2tZIH9Y6}W;>xKy}YxUz7Q)^;_G
znx#h2X8EB35!{u-^>AN8v+#d!6><WCY8o&j1+~+2SrC*?t5LY5bXv8-Wu?<|RJfva
zTIhwFN|&ojmz;$=BtRnMbEcNcmu|D4us*Or6Q1H>tbnK5T5YxP9M9RE4yVK0>Bq-T
zX$zHjDD9;Z=hK)~^(L?1W8FYHJXQ<GfD|0_baZ&eg11UQnvG5dy1N6D(FY|k`y{LP
z8}mBzxeBwH`Fn-6yv&vr*77n;Pghv_O_~h!^aLgmgu8l*Jn;x-v+&5g){JqpkKgb$
z&;s2Ushu|v8dWW!Vf7Lkmzy{p>~i4C$)JHb?3`%Y=<$0U48#vi%sU$!o%0h1zFLOy
zBhd(TArk$)1p01>bs_<yD6(^_)fLNsx34geEy)cuv09BqYEA2e0Sq$tU_CgY6Nb=x
zucMiW9koO>S-AR*c8AkfFIub}=$?;s`0DK(*1*?G8oUnYMvT)`OJrHSqV2;nA#D}e
z!IrxAc7w%YEPiaXkVcn{jMlXjrSs=)u0~=ZjLTNMUgsjjRYyjVB^ry@4WeiuqehWD
zlyzi|#prg|wY1ccnZ}m73m1%**A=7URmznucF|G!wz78SBfN3&3s2B>#T5%j><;P|
zdWA8u<%<h?gF(+&aV$R23xZh?NREzXq4<|jCJXe73uS`xjbcx*I_Lsua60TpVj%R0
zI`Fj8!qzgPmFH>+o?V~U&B%r4IXusp6_39Y>+kon`K!DM&&+G51KaBD8g0wk!KT4;
z$A?HY%U4#i>vqk5INCP4!K>w*O(V^d-rk)1B4-jD*Eo)C-&EyvZyy@n+263)RAU-@
zZAW*fu9D|<&u-iM&Ox)y+}Aw(!oFQ&-VL>`ri+|lqTfAQ(;)L5*q{&dP)m3NQ;&5N
zEu3Qu@%p=o2mNC_=s%XxjU!X-w^sYSetf;KiWr`ov14fsgdNoD7%_5YbmILsQLNCj
zd^uAUeCgEjpqVi)zM|K$*2wAM{TF1RUe8*B`IGseg{dSi)~Mfc<hlJLZ&wIH#Y26C
zp4%Gj3dH+$`gx{OxBYN0A<qw=Q-us$)))5s!+m;shneB7l6k~c*p-`x-ey%QX7Ki0
zuVNPYb`@(7Z&I-q&w)q99P+oQxD1+MK*i;_Vw&DS8a?jgfLB#apc1aAn891+Qx&tw
z|5C*o#NVn|3s$(VVh;I>DlUU@BB;0=93<SIkwRH1Vw=p{royRYG?mPj=G{^(mk4D_
zWN99kGBZ=Dq^;fER$>iFNhwoWW@a|#$!4RrXeKpn8^rabL?UHNXHtixaMm5qX48Sz
zR=N-6yThqz=!XnQ5P~d@5j-T5kjHTf!jOU_MCCF21ic%zV~~RcT4tV*uC^XW?F`JI
z9$nK0?cm1WnblfDsFjp8S9>#q*GUY^m&GTF_EB6d1=ENIRsSUPB!Sq51*Eb=xK0?g
z-4K_p(hz`Fd`j_@^xblt)9QPIRj2=5Pis732un0XOE|*g9}<_(<#SS8D^G^Qx#Y22
fHk3LR&xMjP_Rv&F*o_HCoRIoc>AYbD)ei6<WzFBq

literal 0
HcmV?d00001

diff --git a/public/static/iconfont/iconfont.woff b/public/static/iconfont/iconfont.woff
new file mode 100644
index 0000000000000000000000000000000000000000..c183d1214a852ccf90a0a42a42817252bdad7319
GIT binary patch
literal 1884
zcmY+Ec{r4N8^@n9W+=lb>nnz`Ga(!uOOmB1jAd{L%^2&8A^Xx{EF*+WD6%i5d2M4z
zWE&$+M4gypNlii;$ridAapryWo`2r^y1v)%_x(Kg{kwn9b6w9Ji@A6afB;|!cmhI)
zs}SOU{&4^Qamm@m8~`AKAT<VsRk)>`fN|E=1(_x24}~+4wJRZn;=@6f33?K^vaOs$
ztO7#f{Q-avtc9uq0KbU?ada!t5AO>AFdZ=O3@8Il)~6GJAOso60Td`Df%njxfuT`x
zAWH|m1SnZqfX537BOK<HfnM}bP$Iu;C_WDC3u^?uJSYW-1mI4@hx&nR47`UK*grtD
z)`S)w78wP;F9OWLfC^^^uSmp|5pcdZ+`Nwtjz+*mT;D!|pMPP49wFrW;P50M-$b|c
zjH=!_N(yusI@(GK5>fC^%j5%8jA7QmVJ#kyD`PN584T7)R7OflwY<4rpTCaJ5|FJ+
z)78VlAVJOQ2!V>$UZat>oBb&%DO?c?MTg>JR>#DEge$`Oab;_i0b!;N!m83HOSGmu
z{rayu_85fI?u6shOr%%MK_10yj8rSNl04M9ge*%rwO#{F#9QV@G;ztn+s3E~sFXdn
zh5cixO?&R?#%4qRC~MpB(VYI{&*#S<kM<MSlKNb7Lsi~LuvIA;7@NA~$O*Q#jZ$aR
zk&i$uQ%x_fEY$gZ@SLl-=_fXpe*6ku+$(-fa*mR<gzgCPb$9>5+MZevy}tl+`dpMF
zqG}K?S9=;yCf1&4%rQYQD`cjo2RKIX1NmVTJn>Cp<z?eN+FFofjMCZkMyv4e>)h+y
zzHP4oX~u_^{Qz$PA^&Pv1HcJbYYZK^gEp*K?HVw*t`w_m>RkBalR|S`%Vm4XT!o!A
z^+s-o@)_x!sRNJkYa0g<{P43G2N&CBImk*>$_edykN(ntvEKF|da}K(>ipZRDSq06
zq49yX3;nI_ERNWWr)ReBj>{yLXMiaM7)T^C?Dk0>!aMD#z716|SX$^gzOjnjny!(c
zbzU;5C+D}~RcmJPw?T#<?e|c^v}RGyyWHS@xxuy4!KPy7)aEP2Ka-Tc@?DThP2S^u
zJGLMD@tGOl=CRzF4%E=3nJI-Nl89(Y6A+@=eu2h{Se?Gfq}467FDC5P(7wpLZXh&y
zM=5=+Vlzt^yAN&ZDT8&cveDBcDn@guu^L=%{5XAwqxz2N)J1xCLs{l+x0~9%Kh0gW
zERoxO&mvIWg~t<i9K_5Ao3%FMCklMgy&mIk8u9y`*pZEm)hVgkYR-i+JC&&gLG<ed
znmjJG3{cWl)VQ0j=>05Pe=93ZHT$9Z*hA@aF4(`YE<LDA&bfa({ZWt_vFYmxvt92Q
zccuyIEOzDP$qZvy%3=gUr0op7(1PBM!n*tPpebGL66ZY?c!Q)3lYHR>z1VdFE%EYJ
z=c38-*_Z4lzp)6zf)4>xG5s4AYxb~urLb=kp63I-TG;mxe;qj9`MzIT;2rJP^@GhV
zd6IKBXV+M&REU~`u4ng!bLWubsk0SV59SXZ@8UGvDtfi4@SYiq+XoO>;3O(SEx6Iz
z^yrm{S9no_*Q!Zls(<?uicY=Ai0MG3?<7)gDYcBsI@O%qP*Ydw=vyb=h;_|uXMQ|l
zF#BVv;p(}96@f}kbz;~%uimGX;u7Smz2(}m36d{xC99)Dr5m2TJ9Zu}ldp=}PxTsm
zhJ;jN)Vt9I9^6OdIKSu(E6Uc^H-BkjM-eOe-@((<KmT=bP5=v-+k319ZfKuwc$*H1
zQSj*2fzBR}$J<5cjOChX2|&fH#etX};lrWz&uk%nf6ovdWNyj}{wDn|(kV5P98fh3
z5B>QZkHg_0i#(qDe25?%Q0n440oMJD7=Q&ag7`xE_)!0xgA3U7!{Gslio!CVIXr`h
zGlc@897q`0hfFy~WSWVRD+luV3)L>y=?A&0s~sQNFSMpQRMl4rv@KuinD)@NW*OS$
z<%=x|t^`JATgT5>K&^V-%!aZ1O5{d>b=u9FU%NkP%?>KJ-O=o1)P@)B70@tAlFijw
z72)N34dGDjI58rfFf3A$Jk&^z#Ur157j2%0S2A5bUt^kbuXbh#><dm)c}LIcY&DZh
z1LHq1K2s+nf0?7Y1Wr7!TaU}z^%29YQB7VOTr0swr@eHPS;5W`N^f*?45g^g?^_DT
zH!RLP8oU2k#ETZCwfba^!nqK59D%DoLnf42;4|bFkDf$0Sz1K}aEsSr2AS?byl4!k
z<2hA6f~>_C_0m)E=>#+0$S&{nwN=OHC{5yv`|0|H9^*DX^aZ5J+a_u{3yQw=AH?tN
zT{U9K4rBTIkePxox5Mx2LjttmUr6PYEJ_K5Oevz|Qpzc5DNXcty8bU|61H0scb8p?
r?kX+2`4y@xKhO*CQ~3&ipmGnGHKe}e!isLFnOMN#fKZ>*ufTr+EAvZb

literal 0
HcmV?d00001

diff --git a/src/assets/iconfont/iconfont.ttf b/src/assets/iconfont/iconfont.ttf
deleted file mode 100644
index 31dec3822b5ea2a4166eb128d21f3a5d5417ab1a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2556
zcmd^B|8G-O6hG&^_Pusn+jZ;fCb0F<xpuIw+e+8L7;`e{Kt{@7;3QKh{W{WbbS+TC
zFcnEaGL=Y-KR^WeK}-zbFT}(j{J}(tn&=P4m>Bg3Qj$psKj3e!^W67dB^&$)-sax>
zIiGvZx#ym9ds{#NsD)YJp=Wf@-p%sc?I!?mJ+Tv^J>9;+RXaZ<`8>%7Bk6GNjC|n%
z0H-7F+eE4qe{X!{&j9>y)ORIg;b`Y~jYiV_lX@UYg!l)4hVYlvpG~F<$D3hsk!<gi
z+?>ir!rUXSj%>dt*_;j^&!G(_XuX+aITKFD>OUU52_SlC&qOXeQ~1g4nFcVvPwNSw
z*!kJTS(wt1*TqF0GG<8=6o%MF`wy=junhhUwG=wFyL<1kxRjYpPw9|<okRn0jHSjr
z39t=Rb;j1v2Y{ki8e6Y{9vA{{OK@xg%&Bl811mIr)n2t#F{Y*yVe+p@q{mi~7^HnP
zeI4Mtpr^B*<yc1EQD^)Md`OlY=y_tF(ssqSM&YZnFn>qM2df7=4U6${V@0D)DNoAG
zu-a*&J?RDjP@Wl$CpFun#4;})n(6e!>)-{F>y%9C%0l^S`C9q<{2f-+r4nhW4N1HD
zVKM1wH=gAg*}4Dktxie6n3e{rLz%L|I?H?cs@hpi%GcD+YE{0jc2=|bJ8IW%?kn&$
zJiu-E33=fEyV=dq1slnwQ#7L}*qU0g$?oeP!v28Y?M1hXce-6}m%l&IAMiEVo9s4G
z5QWAztKa1mB<pHl!0+N9d0=YJ-O=Hmn>z60W0*V^j}8nD4n*S*s$lrG<d6_7lElw0
zS640n*}lX;vBcYCVz*l=%$l8;4iMz-!b)&MKa5iJepe?->snE=+Jv^%PM5o{O|se7
zQFwj0uCL80w9qt!?S7YgHJ#JiippA>s@-Sx2S~O{e6Y*W+iSMjES1kKHtg`o7;<z~
zVwWz-o({Aj=aDP793DiE14BefmdY)&B$+W}k?^6SqcAp$*X!u&a^Orym*etfi|sAd
zsB(j`ip4k^)ynWr?lXF6>19I-T@A%1pwq?TqNwOheC@)#(QGzyb{Z@9jV4or$%I8V
zHkc}pOf|}aabdp3q<%m7Q@jB-0JOVZP79imYUp-R5m{kdIms>xtw<&9^Lsg^@S;G)
zrL6b@{Z#*epD*1Its?qPpBvcH=G5uCo(ZlAUOYL9O}toN&#xGt`!v)OYVqp@_nMuZ
zhx|iD?-jvna@`aJzISb-+q-=<v}>e&y>*p!;`EM<{f2r`G(5Lu?*|7P<c8tSv6o*O
zpYXS|de&SKOjh=Qv6@bDzk&?Il!sOn&0HJRQL+iHP3RA7L?6Y+`6zxWqnAdmDPV8v
z^9SrLNL8fcc{wMQ){K16XyByi`OwryJ(5&s<i%R9aq`u(Cnp;?%fcH*18<L>8{2<b
zSu`4X+hplXY0}2kqldQ`cN}|u|IQ0_CR5!*W1Ugh9N#dI95EQ@xO&6(BSVNUj$PCi
zIlg8%5(q?wjqL4ifZx^36K<rgzOd{SZ`3dcBHdV(=ZSY}SVwrRhV^t0d>R&r-=yIh
z=!C5rt|gB-_WJ7B@2Lyk)G$IlT-PuMX81zGJn`RXSV#C54eP-U_cSaJzo6k7*oP(!
z*MbWpBl%dk5R1x(O7e6hn~7&Lh3dRJmMEse`Knl*_r>xv)7gyN>+Pvhqp?gZUv)Ec
zG~p{0;&MEnP0K;@7fYqGaxR}e9E%jZ$wDDF(A~}UVZ1kzO~VM}AqHV6&={platKN^
zPD2E;kb$@|7M_rIlXe1%kRr?c6RXRu_mOrUW=N0ul%W^A^fSI(Ym~GyistfYX5c98
z=A#%36p>6lPoC0*f?9kriX=r?rUJ6H!{jGI+FnR1Ryi1eZu(TuQ`Pq>=S*wg6RJA<
zzwxvtAcs8aP>%wNpf43m#hCd>F>|6=2xm_ui{VUyKRg{a?WQ~vPQ^yDxsrK_)JuN<
E1t-9q@Bjb+

diff --git a/src/assets/iconfont/iconfont.woff b/src/assets/iconfont/iconfont.woff
deleted file mode 100644
index 0d2c7029d53c17198134cd641adc4e1925cbe921..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1740
zcmY+E2{hZ;9>@P#iH0IxMYR>BN_mnHjM7$XDOE2zv}&nrEite5AeJGKCZbfu(y7>W
zA?l?;EnP+}t;#TFT1+W3F&$b<(MD&Krp^4#n{(cI_ngnU_xruS-~HWl@3}XH?BxYO
z0I(s4fGwLnO7&m8IsX54G~nbB0Dx$Mt_w&YE^kj7IRI}5dLE$OgzCD(uZ$5*ivv9&
zs99h?AixzZN1jiO0LLl-fJy)W<}W&7JjOgnI|~5t1~85Y;%GgHK`}uS^rk?)3&dPQ
z0TVEzS!~b)a{&VoEEZ6!&&M*rID{^!bvA*%hoYltY_Ki@2Wk@#9K-+!jG;xJ13fpe
zHV8CQ_nNCLE;bR|7m@?U90Q4by4NO(UBRH9rBbKq1geZdO^9Db(WVD|Y~+kWI+ex&
z3SI5WiF@r2h`6wR*mupGC>>k`PY4ApToB&CW-g6Jt?2IluDg3w&Ju9BwI)aGyCMkm
z8Q`Lw%+8*QfJ8~H&>B_E-|m-By?w~#a@Td-&HS(GdFo++G+%8JyJAVygW|iPJt$Kr
zJ!~Eydz9uHe2Lv`U@Y&kAWf+7<2+0_RbaCP<qwl%^U*E1&IsQdGr7{4vZonjU(cVs
zf_`Qly1ba(k#6qz37;~N>HEj_s1Kvx9Q+iv6pGGRxrfZe{G4sqs*%~cs@V|p%+p+p
zU2#UFAdmPPJXyJG7!z8vv_H)yD|+V{X3lx-d}%Q^QOn5G%>vc$L%^0@2x4fO7S$mA
z%p<m1JlZRKAjUp2{H#s+dMy{*$GiOHgGGYZ$GEh#Op;<{9hZ=t+&+PvalXfCVZu#i
za0I;ZiN3CV0$<-C<A?a3=G@uwf~9|`va9oqi0+0BZubMkk)b6~2b>kH#E{@H<`?sK
zMoynrDV@#)he{2P9?koG)+DP)sb_D5D<vx5sNbF1__wl}PvDw$(Xn6sIOP>BJaj$#
zVeR0+VFamXEIs*<tQJo2tC#E=OjcUmG<FXQ-z895<@K-Mf`41J^ggaS1lk+k=ur9G
zwK~f<Kd|N1bWPpjS8s#IOe=kkj13_#C#Mvbk>)t|^64LkfV0ONl==ZYcRmr(xQ|yH
zXVEm*xG0`zLXn>ZC&rS;DD79Wc@Yj%SEIcyxZ}5d7VdXO!NZRGUi??>jl5egtGr*&
zH($5ZcVwfxd|P&uo;w}g->^ef;?gT%rA?WdX{zt~c#!h_Z!<#oSyG*>5`=y-)DW6$
z!7=+j-Bzb(OG)2skbE66tXLb^;MSlDCtuhW)Hk*N@#gU{%DG4el<pz)7`QRfpR?fR
zu-q0<AA3_>8x)eXCb5{Tw%o%Dy1z3ep)M`GX-%B$Sw1P=ZY9(^tQ(uJNL|B;^RIlY
zUs04-uD;AYt~glgz{<?o{`q22!_Z10aJa{6STsM{rBihX>MY&*x-+xj>8#$946`e1
z8D=^ayE|Uf^IT4F0?qYWH_8`!KSKKNneS%3Tz)a~+_=s16q(|^o47DJvYJi{C=!N;
zX0?Tn#KY}8N^kxYGyKDYrJ`9WM&eu7aV00uno&2}trxG1M@=ukA5O&-7buHX@TGg+
zInDP~g@BLr@AnDNY0a%|?^KQyqt0Ng+qBQzsw4K3TCGmo=Jm=8_YIGWGS>n;pP;k;
zmlN|r(XHFp`_@GBG}ef-+mfRV)I3I>|7%Sel}e?3P*)?4n-KtWPpBc71_0r}BVZZg
z4FP|qzw1&NZ^1wSVu5=FJ%SXdsRv<zu0JFSoac)U#Pqu9@~e9a;U$*Gu9KopSy}4K
zRVCgM|C;(5jn-F3+n<Nvy+@t>3JNhZn)A%Wi{7c@?l8{>FD7Dt=_=bP2bN_yIm-L5
zZ72Hnv=&)+c3+Dt-6)okGq*`=bF1PiH*Uqj@N7&>3!`7BD(i6*KZUln<Abhr8d=?Y
za)Hu&a6PnBprO)yE>UYa5#CAp<;>JyyB8!Qi4K#JlgwuW*O%D^ztb_~C5h`(M@m^>
z5^wm#_W8g`MtR2lIcG!3fY?Jj_116W4MXBKoij3)?PABIXznmmA5E<#@);HGG{Mf_
zv`o=odU&!T*RL)k9EHJA>Ll`9`+&qGfo}_C4TqWCd)Aw}->=}Gl*JQCEbEv-@dZ*z
z$oD?<mX}*yr~V_kFbcEDYeav2=WZP)%YUd)1sN}n4ca_kItQ>tzTsRF<%-Hgd{L?B
zlBkl~)^ewXRC-%Ry4`rkocM6xH4+hD>1=H;a<X)|3m+KvNgBpC%((w*WJdtMa90EH
G!v6$i!RR^w

diff --git a/src/assets/scss/main.scss b/src/assets/scss/main.scss
index 84e7dd9..6e6bcec 100644
--- a/src/assets/scss/main.scss
+++ b/src/assets/scss/main.scss
@@ -148,6 +148,25 @@ $lighter-color: rgba(#4D6DE4, 0.5);
     background: $lighter-color;
   }
 }
+.default-close-btn{
+  cursor: pointer;
+  display: inline-block;
+  width: 119px;
+  height: 42px;
+  line-height: 42px;
+  background: #fff;
+  border-radius: 6px;
+  color: #333333;
+  font-size: 16px;
+  text-align: center;
+  margin-left: 9px;
+  border:1px solid #D8D8D8;
+  &:hover{
+    background: $lighter-color;
+    color: #fff;
+    border:none;
+  }
+}
 
 .small-btn{
     cursor: pointer;
@@ -180,3 +199,21 @@ $lighter-color: rgba(#4D6DE4, 0.5);
     background:  rgba(#EB5757, 0.5);
   }
 }
+.close-btn{
+  cursor: pointer;
+  display: inline-block;
+  line-height: 1;
+  background: #fff;
+  border-radius: 4px;
+  color: #333;
+  font-size: 14px;
+  text-align: center;
+  margin-left: 9px;
+  padding: 7px 14px;
+  border:1px solid #D8D8D8;
+  &:hover{
+    background:  rgba(#4D6DE4, 0.5);
+    color: #fff;
+    border:1px solid rgba(#4D6DE4, 0.5);
+  }
+}
diff --git a/src/components/inventory/goods/Edit.vue b/src/components/inventory/goods/Edit.vue
index 0f92641..16b82dc 100644
--- a/src/components/inventory/goods/Edit.vue
+++ b/src/components/inventory/goods/Edit.vue
@@ -690,7 +690,8 @@ const contrastCodeConfirm = (data: any) => {
 }
 let save = async (isClose: Boolean) => {
   try {
-    await formRef.value.validate()
+    const isOk = await formRef.value.validate()
+    if (!isOk) return
     if (!edit_data.value.purchaseUnitPrice || edit_data.value.purchaseUnitPrice < 1) {
       ElMessage.error('参考进价不能为空或小于1');
       return
diff --git a/src/components/inventory/goods/SocialInfo.vue b/src/components/inventory/goods/SocialInfo.vue
index 275ae15..5aaf9b6 100644
--- a/src/components/inventory/goods/SocialInfo.vue
+++ b/src/components/inventory/goods/SocialInfo.vue
@@ -8,7 +8,7 @@
   <div v-if="hilistInfo" class="hilist-detail">
     <div class="name">
       {{ hilistInfo.name }}
-      {{ hilistInfo.json?.category ? '[' + hilistInfo.json.category + ']' : '-' }}
+      {{ hilistInfo.json?.category ? '[' + hilistInfo.json.category + ']' : '' }}
     </div>
     <div>
       {{ hilistInfo.code }}
@@ -86,17 +86,16 @@ onMounted(() => {
 .hilist-code {
   cursor: pointer;
   width: 100%;
-  height: 25px;
-  border: 1px #ddd solid;
+  height: 38px;
   display: flex;
   justify-content: space-between;
   align-items: center;
-  padding: 8px;
-  border-radius: 10px;
+  padding: 16px;
+  border-radius: 6px;
+  border: 1px solid #EAEAEC;
 
   .name {
     display: flex;
-
   }
 
   .code {
@@ -107,14 +106,15 @@ onMounted(() => {
 
 }
 .hilist-detail {
-  padding: base.$padding-base;
-  margin-top: 3px;;
+  padding: 16px;
+  margin-top: 8px;
   width: 100%;
-  height: 250px;
-  border: 1px base.$border-color-base solid;
   font-size: 12px;
-  border-radius: 8px;
+  background: #F5F6F7;
+  border-radius: 6px;
+  border: 1px solid #EAEAEC;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
 }
-
-
 </style>
\ No newline at end of file
diff --git a/src/components/outpatient/MedicalHistory.vue b/src/components/outpatient/MedicalHistory.vue
index afd51a3..2b965d5 100644
--- a/src/components/outpatient/MedicalHistory.vue
+++ b/src/components/outpatient/MedicalHistory.vue
@@ -34,7 +34,6 @@ const props = defineProps({
     default: 0
   }
 })
-console.log(props.status)
 const list = ref<any>([])
 const init = (patientId: any) => {
   post("medical/record/listByPatient", {patientId: patientId}).then((res: any) => {
diff --git a/src/components/outpatient/MedicalQueue.vue b/src/components/outpatient/MedicalQueue.vue
index 8692d26..5a082df 100644
--- a/src/components/outpatient/MedicalQueue.vue
+++ b/src/components/outpatient/MedicalQueue.vue
@@ -209,7 +209,14 @@ const clickLi = (item: any, showBox: any = true) => {
 }
 const changeCurItemOrStatus = (item: any, status: any) => {
   curStatus.value = status
-  if (item != null) {
+  curItem.value = item
+  clickTab({status: status})
+  if (status == 1) {
+    // selectedDate.value = formatDate(item.appointmentTime)
+    init()
+    return
+  }
+  if (item != null && status != 1) {
     clickLi(item);
   }
   init()
@@ -218,6 +225,11 @@ defineExpose({changeCurItemOrStatus})
 watch(() => curStatus.value, () => {
   init() // 重新初始化数据
 })
+const formatDate = (isoStr: any) => {
+  if (!isoStr) return ''
+  const date = new Date(isoStr);
+  return `${date.getFullYear()}-${(date.getMonth() + 1).toString().padStart(2, '0')}-${date.getDate().toString().padStart(2, '0')}`;
+}
 const setDateTip = () => {
   const seletctedDateObj = new Date(selectedDate.value);
   //如果选择的日期是今天
diff --git a/src/components/outpatient/Settlement.vue b/src/components/outpatient/Settlement.vue
index 25e5367..f813114 100644
--- a/src/components/outpatient/Settlement.vue
+++ b/src/components/outpatient/Settlement.vue
@@ -20,7 +20,7 @@ const editItem= () => {
     <div class="footer">
       <div>总金额：<span class="text icon">￥</span><span class="text">{{ totalAmount || '0' }}</span></div>
       <div class="btn-group">
-        <span class="default-btn" v-if="status" @click="deleteItem">取消接诊</span>
+        <span class="default-close-btn" v-if="status" @click="deleteItem">取消接诊</span>
         <span class="default-btn" v-if="status" @click="save">完成接诊</span>
 <!--        <el-button v-if="status == 3" type="primary" @click="editItem">修改</el-button>-->
       </div>
diff --git a/src/components/registration/Edit.vue b/src/components/registration/Edit.vue
index 70fc1c7..38ed523 100644
--- a/src/components/registration/Edit.vue
+++ b/src/components/registration/Edit.vue
@@ -141,7 +141,9 @@
                         style="width: 50%"
                     />
                   </div>
-                  <span v-if="dateName!='预约'" class="small-btn" @click="changeBtn">{{
+                  <span v-if="dateName!='预约'"
+                        :class="{disabled:edit_data.status==1||edit_data.status==3||edit_data.status==0}"
+                        class="small-btn" @click="changeBtn">{{
                       isBtnShow ? '挂号' : '预约'
                     }}</span>
                 </div>
@@ -202,9 +204,9 @@
           退出医保
         </div>
         <div class="bottom-right">
+          <span class="close-btn" @click="close">取消</span>
           <span class="danger-btn" v-if="edit_data.status==1" @click="registrationCancel">退号</span>
           <span class="small-btn" @click="save">保存</span>
-          <span class="small-btn" @click="close">取消</span>
         </div>
       </div>
     </template>
@@ -452,6 +454,7 @@ const changeLoading = (e: any) => {
 }
 const isBtnShow = ref(true)
 const changeBtn = () => {
+  if (edit_data.value.status == 1 || edit_data.value.status == 3 || edit_data.value.status == 0) return
   isBtnShow.value = !isBtnShow.value
   if (isBtnShow.value) {
     time.value = ''
@@ -547,4 +550,9 @@ defineExpose({init})
 :deep(.el-form-item) {
   margin-bottom: 2px !important;
 }
+
+.disabled {
+  cursor: not-allowed;
+  background: rgba(#4D6DE4,.5);
+}
 </style>
\ No newline at end of file
diff --git a/src/main.ts b/src/main.ts
index 285f36c..2df7930 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -3,7 +3,7 @@ import './assets/scss/main.scss'
 import {createApp} from 'vue'
 import ElementPlus from 'element-plus'
 import 'element-plus/dist/index.css'
-import '../src/assets/iconfont/iconfont.css'
+import '../public/static/iconfont/iconfont.css'
 import {createPinia} from 'pinia'
 
 import App from './App.vue'
diff --git a/src/views/outpatient/index.vue b/src/views/outpatient/index.vue
index ab6fadb..5abe4cd 100644
--- a/src/views/outpatient/index.vue
+++ b/src/views/outpatient/index.vue
@@ -148,7 +148,12 @@ const clickItem = (item: any) => {
 const medicalQueueRef = ref();
 const cancelReception = () => {
   post(apiConfig.RegistrationChangeStatus, {id: registerId.value, status: 1}).then((res: any) => {
-    medicalQueueRef.value?.changeCurItemOrStatus(res, 1);
+    nextTick(() => {
+      medicalQueueRef.value?.changeCurItemOrStatus(res, 1);
+      initFormData()
+      medicalHistoryRef.value?.clearList();
+      patientCardRef.value?.clear();
+    })
   })
 }
 const changeTab = (e: any) => {

From 0465206aeeef5140967c4ac44649883cf530db95 Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Tue, 27 May 2025 10:51:47 +0800
Subject: [PATCH 27/33] dev

---
 src/components/outpatient/MedicalQueue.vue | 40 ++++++++++++----------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/src/components/outpatient/MedicalQueue.vue b/src/components/outpatient/MedicalQueue.vue
index 5a082df..5d105d8 100644
--- a/src/components/outpatient/MedicalQueue.vue
+++ b/src/components/outpatient/MedicalQueue.vue
@@ -30,13 +30,13 @@
           <el-scrollbar style="height: 100%">
             <li class="list-item" :class="curItem?.id == item.id ? 'active' : ''" v-for="(item, index) in list"
                 :key="index" @click="clickLi(item)">
-                <span class="item-avatar" style="position: relative">
-                  <img v-if="item.gender==1" class="avatar" src="/static/images/outpatient/man.png"
-                       alt="头像"/>
-                  <img v-if="item.gender==2" class="avatar" src="/static/images/outpatient/women.png"
-                       alt="头像"/>
-                   <span v-if="item.isAppointment" class="iconfont icon-yuyue yuYueIcon"></span>
-                </span>
+              <div class="item-avatar">
+                <img v-if="item.gender==1" class="avatar" src="/static/images/outpatient/man.png"
+                     alt="头像"/>
+                <img v-if="item.gender==2" class="avatar" src="/static/images/outpatient/women.png"
+                     alt="头像"/>
+                <i v-if="item.isAppointment" class="iconfont icon-yuyueh yuYueIcon"></i>
+              </div>
               <span class="item-name">{{ item.name }}</span>
               <span class="item-time">
                 {{ formatListTime(item.appointmentTime) }}
@@ -343,6 +343,21 @@ watch(() => selectedDate.value, (newValue, oldValue) => {
       .item-avatar {
         width: 26px;
         margin-right: 10px;
+        position: relative;
+
+        .yuYueIcon {
+          display: inline-block;
+          width: 12px;
+          height: 12px;
+          position: absolute;
+          bottom: 11px;
+          right: -1px;
+          color: #31e3ca;
+          font-size: 12px;
+          z-index: 99;
+          background: #fff;
+          border-radius: 12px;
+        }
 
         .avatar {
           margin-top: 11px;
@@ -417,15 +432,4 @@ watch(() => selectedDate.value, (newValue, oldValue) => {
   right: 0;
   top: 50px;
 }
-
-.yuYueIcon {
-  width: 13px;
-  height: 13px;
-  position: absolute;
-  top: -8px;
-  color: rgb(255, 102, 0);
-  font-size: 12px;
-  right: 0;
-  z-index: 99;
-}
 </style>
\ No newline at end of file

From aed4bcc77122ba937ad0ebc74a72cdc12c3108c8 Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Tue, 27 May 2025 11:30:03 +0800
Subject: [PATCH 28/33] dev

---
 src/components/SearchInput.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/SearchInput.vue b/src/components/SearchInput.vue
index ac3de17..ba13c44 100644
--- a/src/components/SearchInput.vue
+++ b/src/components/SearchInput.vue
@@ -18,13 +18,15 @@
       />
     </template>
     <div class="container" style="max-height: 300px">
-      <el-table :data="searchList" max-height="300" :header-cell-style="{ backgroundColor: '#F1F5FB' }">
+      <el-table :data="searchList" max-height="300" @row-click="clickRow" :header-cell-style="{ backgroundColor: '#F1F5FB' }">
         <el-table-column
             v-for="(conf, index) in props.showConfig"
             :key="index"
             :label="conf.label"
             :prop="conf.prop"
             show-overflow-tooltip
+        >
+        </el-table-column>
         />
     </el-table>
     </div>

From 32edf96dd34aa91099fbd8cadbbe687e9f70fbbb Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Tue, 27 May 2025 11:48:15 +0800
Subject: [PATCH 29/33] dev

---
 .../config/directory/drugMedcWayCode.json     | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 src/assets/config/directory/drugMedcWayCode.json

diff --git a/src/assets/config/directory/drugMedcWayCode.json b/src/assets/config/directory/drugMedcWayCode.json
new file mode 100644
index 0000000..435476f
--- /dev/null
+++ b/src/assets/config/directory/drugMedcWayCode.json
@@ -0,0 +1,26 @@
+{
+  "1": "口服",
+  "2": "直肠给药",
+  "3": "舌下给药",
+  "4": "注射给药",
+  "401": "皮下注射",
+  "402": "皮内注射",
+  "403": "肌肉注射",
+  "404": "静脉注射或静脉滴注",
+  "5": "吸入给药",
+  "6": "局部用药",
+  "601": "椎管内用药",
+  "602": "关节腔内用药",
+  "603": "胸膜腔用药",
+  "604": "腹腔用药",
+  "605": "阴道用药",
+  "606": "气管内用药",
+  "607": "滴眼",
+  "608": "滴鼻",
+  "609": "喷喉",
+  "610": "含化",
+  "611": "敷伤口",
+  "612": "擦皮肤",
+  "699": "其他局部给药途径",
+  "9": "其他给药途径"
+}

From 0560eb2b37b3023fde54a3a2fda8536e5c86ae70 Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Tue, 27 May 2025 12:06:37 +0800
Subject: [PATCH 30/33] dev

---
 src/assets/config/API.ts                      | 295 ++++++++++++++++++
 .../{inventory => }/UnitSelector.vue          |   1 -
 src/components/common/goods/GoodsDetail.vue   |  18 ++
 src/components/inventory/goods/Edit.vue       |   2 +-
 src/components/settings/item/ItemEdit.vue     |   2 +-
 .../settings/item/group/GroupAdd.vue          |   2 +-
 6 files changed, 316 insertions(+), 4 deletions(-)
 create mode 100644 src/assets/config/API.ts
 rename src/components/{inventory => }/UnitSelector.vue (99%)

diff --git a/src/assets/config/API.ts b/src/assets/config/API.ts
new file mode 100644
index 0000000..9319009
--- /dev/null
+++ b/src/assets/config/API.ts
@@ -0,0 +1,295 @@
+export namespace API {
+    // 收费模块
+    export namespace Charge {
+        export const Log = {
+            list: '/charge/log/list', // 收费记录
+            reportWithDays: '/charge/log/reportWithDays', // 每日收费报表
+            listByDatetime: '/charge/log/listByDatetime', // 获取收退费记录
+            listByPatientId: '/charge/log/listByPatientId' // 病人付费记录
+        };
+
+        export const Order = {
+            list: '/charge/order/list', // 查询list 只有订单信息
+            save: '/charge/order/save', // 保存收费订单
+            complete: '/charge/order/complete', // 完成订单
+            refund: '/charge/order/refund', //
+            getPrintInfoByCode: '/charge/order/getPrintInfoByCode', // 根据订单号获取订单详情,小票打印用
+            getByDiagnosisCode: '/charge/order/getByDiagnosisCode', // 根据诊断code和状态获取诊断信息
+            getByCode: '/charge/order/getByCode', // 根据code查询订单详情
+            listWithDetail: '/charge/order/listWithDetail' // 查询list 带详情
+        };
+
+        export const Social = {
+            prePay: 'charge/social/prePay', // 医保预支付
+            realPay: 'charge/social/realPay', // 医保真实支付
+            upload: 'charge/social/upload' // 医保上传支付明细
+        };
+    }
+
+    // 通用模块
+    export namespace Common {
+        export const Auth = {
+            get: '/common/auth/get', // 获取认证信息
+            set: '/common/auth/set', // 设置认证信息
+            check: '/common/auth/check' //
+        };
+
+        export const Config = {
+            get: '/common/config/get', // 根据key获取配置信息
+            list: '/common/config/list', // 查询配置信息
+            getAll: '/common/config/getAll', // 查询所有配置信息
+            edit: '/common/config/edit', // 修改配置信息
+            savePrinter: '/common/config/savePrinter', // 保存打印机配置
+            getPrintConfig: '/common/config/getPrintConfig' // 获取打印机配置
+        };
+
+        export const Log = {
+            list: '/common/log/list' // 查询操作日志
+        };
+
+        export const File = {
+            download: (token: string) => `common/file/download/${token}`, // 下载文件
+            uploadToTemp: 'common/file/uploadToTemp', // 上传临时文件
+            upload: 'common/file/upload', // 上传文件
+            getImage: (fileName: string) => `common/file/getImage/${fileName}` // 获取图片
+        };
+
+        export const ManagerUser = {
+            list: '/common/ManagerUser/list', // 所有人员信息
+            _data: '/common/ManagerUser/' // 登录
+        };
+
+        export const Sign = {
+            out: '/common/sign/out', // 医保签退
+            in: '/common/sign/in' // 医保签到
+        };
+    }
+
+    // 诊断模块
+    export namespace Diagnosis {
+        export const Base = {
+            save: '/diagnosis/base/save', // 保存诊断
+            getRegistrationDetail: '/diagnosis/base/getRegistrationDetail', // 获取挂号信息
+            getByDiagnosisCode: '/diagnosis/base/getByDiagnosisCode', // 获取诊断信息
+            ChargeQueueList: '/diagnosis/base/ChargeQueueList', // 获取收费队列
+            listByPatient: '/diagnosis/base/listByPatient', // 查询患者病历
+            getByRegisId: '/diagnosis/base/getByRegisId' // 根据挂单号回显病历详情
+        };
+    }
+
+    // 商品模块
+    export namespace Goods {
+        export const Cate = {
+            list: '/goods/cate/list', // 根据type获取商品二级分类列表
+            save: '/goods/cate/save', // 保存二级分类
+            del: '/goods/cate/del', // 删除二级分类
+            getAllList: '/goods/cate/getAllList' // 获取所有分类
+        };
+
+        export const Base = {
+            get: '/goods/base/get', // 根据商品id获取商品
+            save: '/goods/base/save', // 商品建档或修改
+            search: '/goods/base/search', // 商品搜索一键建档内的搜索
+            disableSale: '/goods/base/disableSale', // 停售商品
+            addIdCode: '/goods/base/addIdCode', // 商品添加标识码
+            enableSale: '/goods/base/enableSale', // 起售商品
+            returnInit: '/goods/base/returnInit', // 商品重新初始化医保库存
+            getByCateId: '/goods/base/getByCateId', // 获取二级分类绑定的商品数量
+            DetailWithSearch: '/goods/base/DetailWithSearch' // 商品搜索
+        };
+    }
+
+    // 库存模块
+    export namespace Inventory {
+        export const Apply = {
+            list: '/inventory/apply/list', // 分页查询领用单
+            create: '/inventory/apply/create', // 创建领用单并领用
+            getDetail: '/inventory/apply/getDetail' // 获取领用单详情
+        };
+
+        export const Check = {
+            list: '/inventory/check/list', // 盘点列表分页查询
+            save: '/inventory/check/save', // 保存盘点记录
+            getDetail: '/inventory/check/getDetail' // 获取盘点单详情
+        };
+
+        export const Goods = {
+            log: '/inventory/goods/log', // 获取库存日志
+            update: '/inventory/goods/update', // 修改库存采购信息
+            listByIds: '/inventory/goods/listByIds', // 根据库存id集合获取库存信息
+            statistics: '/inventory/goods/statistics', // 库存统计
+            getByGoodsId: '/inventory/goods/getByGoodsId', // 获取商品库存信息 根据goodsId
+            listByGoodsId: '/inventory/goods/listByGoodsId', // 获取商品库存信息 根据goodsId
+            listByOrderCode: '/inventory/goods/listByOrderCode' // 获取采购单信息 根据code
+        };
+
+        export const Order = {
+            update: '/inventory/order/update', // 更新采购单基本信息
+            list: '/inventory/order/list', // 分页查询采购单
+            create: '/inventory/order/create', // 创建采购单
+            detail: '/inventory/order/detail', // 获取采购单详情
+            refund: '/inventory/order/refund', // 采购单退货
+            toExcel: '/inventory/order/toExcel', // 采购一键导入，生成excel
+            fromExcel: '/inventory/order/fromExcel', // 采购一键导入，解析excel
+            addGoods: '/inventory/order/addGoods' // 采购单修改时 添加采购的商品
+        };
+
+        export const Supplier = {
+            list: '/inventory/supplier/list', // 分页查询供货商
+            save: '/inventory/supplier/save' // 保存供货商
+        };
+    }
+
+    // 项目模块
+    export namespace Item {
+        export const get = '/item/get'; // 获取项目详情
+        export const search = '/item/search'; // 搜索项目
+        export const del = '/item/del'; // 删除项目
+        export const list = '/item/list'; // 获取非组套列表
+        export const deleteGroup = '/item/deleteGroup'; // 删除组套
+        export const edit = '/item/edit'; // 修改项目
+        export const groupList = '/item/groupList'; // 获取组套列表
+        export const add = '/item/add'; // 添加项目
+        export const getGroup = '/item/getGroup'; // 获取组套
+        export const saveGroup = '/item/saveGroup'; // 保存组套
+    }
+
+    // 组织模块
+    export namespace Organization {
+        export const Member = {
+            get: '/organization/member/get', // 获取成员信息
+            list: '/organization/member/list', // 分页查询成员列表
+            save: '/organization/member/save', // 保存成员信息
+            search: '/organization/member/search', // 搜索成员
+            del: '/organization/member/del', // 删除成员
+            listBySectionId: '/organization/member/listBySectionId' // 获取当前科室的所有医生
+        };
+
+        export const Section = {
+            add: '/organization/section/add', // 添加科室
+            get: '/organization/section/get', // 获取科室信息
+            list: '/organization/section/list', //
+            allList: '/organization/section/allList', // 获取所有科室
+            del: '/organization/section/del', // 删除科室
+            edit: '/organization/section/edit', // 修改科室信息
+            listByMemberId: '/organization/section/listByMemberId' // 获取当前成员的所属科室
+        };
+    }
+
+    // 患者模块
+    export namespace Patient {
+        export const Base = {
+            get: '/patient/base/get', // 获取患者信息
+            update: '/patient/base/update', // 修改患者信息
+            create: '/patient/base/create', // 创建患者
+            search: '/patient/base/search', // 搜索患者
+            del: '/patient/base/del', // 删除患者
+            changeLevel: '/patient/base/changeLevel', // 改变会员等级
+            list: '/patient/base/list' // 分页查询患者列表
+        };
+
+        export const Integral = {
+            add: '/patient/integral/add', // 添加会员积分
+            list: '/patient/integral/list' // 分页查询会员积分记录
+        };
+
+        export const LevelConfig = {
+            get: '/patient/levelConfig/get', // 根据leveId获取会员等级配置
+            save: '/patient/levelConfig/save', // 保存会员等级配置
+            create: '/patient/levelConfig/create', // 新增会员等级配置
+            del: '/patient/levelConfig/del', // 删除一个会员等级配置
+            edit: '/patient/levelConfig/edit', // 修改会员等级配置
+            list: '/patient/levelConfig/list' // 分页查询会员等级配置
+        };
+
+        export const Registration = {
+            add: '/patient/registration/add', // 挂号
+            get: '/patient/registration/get', // 获取挂号信息 根据挂号id
+            list: '/patient/registration/list', // 分页查询挂号列表
+            cancel: '/patient/registration/cancel', // 取消挂号
+            allList: '/patient/registration/allList', // 获取挂号信息列表
+            del: '/patient/registration/del', // 删除挂号信息
+            changeStatus: '/patient/registration/changeStatus', // 更改挂号单状态
+            getWithPatient: '/patient/registration/getWithPatient', // 根据id返回挂号详细信息 包含患者信息
+            edit: '/patient/registration/edit', // 修改挂号信息
+            listByType: '/patient/registration/listByType' // 挂号信息分页搜索
+        };
+    }
+
+    // 社保模块
+    export namespace Social {
+        export const Recipe = {
+            download: '/social/recipe/download' // 下载中药颗粒
+        };
+
+        export const Disease = {
+            download: '/social/disease/download' //
+        };
+
+        export const Diagnose = {
+            search: '/social/diagnose/search' // 诊断搜索
+        };
+
+        export const Directory = {
+            search: '/social/directory/search', // 搜索目录信息
+            _data: '/social/directory/', // 同步到MongoDB
+            getByCode: '/social/directory/getByCode', // 根据医保码，获取医保商品信息
+            searchProducer: '/social/directory/searchProducer', // 搜索企业信息
+            get_doc_list: '/social/directory/get_doc_list', // 获取目录列表
+            itemSearch: '/social/directory/itemSearch', // 服务项目搜索
+            column_list: '/social/directory/column_list', // 获取目录列 列表
+            getItemByCode: '/social/directory/getItemByCode' // 根据医保码，获取医保服务项目信息
+        };
+
+        export const DirectoryLimit = {
+            get_page: '/social/directory_limit/get_page' // 分页查询目录限制信息
+        };
+
+        export const DirectorySelf = {
+            get_page: '/social/directory_self/get_page' // 分页查询自付比例信息
+        };
+
+        export const DirectoryUpinfo = {
+            get_page: '/social/directory_upinfo/get_page' // 分页查询更新信息
+        };
+
+        export const DirectoryVersion = {
+            list: '/social/directory_version/list', // 获取医保目录版本列表
+            get_current: '/social/directory_version/get_current' // 获取当前医保目录版本
+        };
+
+        export const Person = {
+            getCustomSocialInfo: '/social/person/getCustomSocialInfo', // 获取社保人员信息
+            getSocialInfoByPsnNo: '/social/person/getSocialInfoByPsnNo' // 根据社保人员编号获取医保人员信息 redis
+        };
+
+        export const Reconciliation = {
+            list: '/social/reconciliation/list', // 医保-对账列表
+            doDetail: '/social/reconciliation/doDetail', // 明细对账
+            doTotal: '/social/reconciliation/doTotal', // 对总账
+            reversal: '/social/reconciliation/reversal', // 冲正
+            historyList: '/social/reconciliation/historyList' // 自动对账历史记录列表
+        };
+
+        export const Upload = {
+            getNotDoNumber: '/social/upload/getNotDoNumber', // 获取进销存 3501-3506 未上报数量
+            get3503List: '/social/upload/get3503List', // 分页查询 库存采购数据
+            get3501List: '/social/upload/get3501List', // 分页查询 商品初始化数据
+            get3502List: '/social/upload/get3502List', // 分页查询 商品库存变更记录
+            get3505List: '/social/upload/get3505List', // 获取3505列表
+            quickUpload: '/social/upload/quickUpload' // 进销存一键上报接口
+        };
+    }
+
+    // 统计模块
+    export namespace Statistics {
+        export const getSalesVolumeOverview = '/statistics/getSalesVolumeOverview'; // 销售人次趋势
+        export const numberEarlyWarning = '/statistics/numberEarlyWarning'; // 库存预警
+        export const goodsStatistics = '/statistics/goodsStatistics'; // 商品统计
+        export const expiryDateWarning = '/statistics/expiryDateWarning'; // 有效期预警
+        export const getRevenueOverview = '/statistics/getRevenueOverview'; // 营收概况
+        export const getPayOverview = '/statistics/getPayOverview'; // 经营概况
+        export const salePerson = '/statistics/salePerson'; // 销售人员统计
+        export const getQueueCount = '/statistics/getQueueCount'; // 获取收费队列 就诊队列数量
+    }
+}
\ No newline at end of file
diff --git a/src/components/inventory/UnitSelector.vue b/src/components/UnitSelector.vue
similarity index 99%
rename from src/components/inventory/UnitSelector.vue
rename to src/components/UnitSelector.vue
index 8167d0e..0865bd7 100644
--- a/src/components/inventory/UnitSelector.vue
+++ b/src/components/UnitSelector.vue
@@ -1,5 +1,4 @@
 
-
 <template>
     <div class="box">
       <ul class="item-list">
diff --git a/src/components/common/goods/GoodsDetail.vue b/src/components/common/goods/GoodsDetail.vue
index 12765b8..cb13106 100644
--- a/src/components/common/goods/GoodsDetail.vue
+++ b/src/components/common/goods/GoodsDetail.vue
@@ -43,6 +43,22 @@
             <span v-else>{{ scope.row.name }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="使用方法" width="200">
+          <template #default="scope">
+            <el-input ref="minPackagingRef" v-model="scope.row.minPackagingNumber" type="number"
+                      class="input"
+                      style="width: 200px;">
+            </el-input>
+            <el-popover
+                placement="bottom"
+                title="Title"
+                :width="200"
+                trigger="click"
+            >
+              <UnitSelector :units="packagingUnit" v-model="scope.row.minPackagingUnit"></UnitSelector>
+            </el-popover>
+          </template>
+        </el-table-column>
         <el-table-column prop="selectedPrice" label="单价" width="200">
           <template #default="scope">
             ￥{{ scope.row.selectedPrice }}
@@ -116,6 +132,8 @@ import {nextTick, onMounted, ref} from "vue";
 import {post} from "@/utils/request.ts";
 import {ElMessage} from "element-plus";
 import {Delete} from "@element-plus/icons-vue";
+import {packagingUnit} from "@/utils/unitList.ts";
+import UnitSelector from "@/components/UnitSelector.vue";
 
 const props = defineProps({
   status: {
diff --git a/src/components/inventory/goods/Edit.vue b/src/components/inventory/goods/Edit.vue
index 16b82dc..7fe5e43 100644
--- a/src/components/inventory/goods/Edit.vue
+++ b/src/components/inventory/goods/Edit.vue
@@ -451,7 +451,7 @@ import {post} from "@/utils/request.ts";
 import Cate from "@/components/inventory/goods/Cate.vue";
 import {ElMessage, ElMessageBox} from "element-plus";
 import Divider from "@/components/Divider.vue";
-import UnitSelector from "@/components/inventory/UnitSelector.vue";
+import UnitSelector from "@/components/UnitSelector.vue";
 import SocialInfo from "@/components/inventory/goods/SocialInfo.vue";
 import {apiConfig} from "@/assets/config/apiConfig.ts";
 
diff --git a/src/components/settings/item/ItemEdit.vue b/src/components/settings/item/ItemEdit.vue
index 22d260f..5ab2dad 100644
--- a/src/components/settings/item/ItemEdit.vue
+++ b/src/components/settings/item/ItemEdit.vue
@@ -74,7 +74,7 @@ import {post} from "@/utils/request.ts";
 import {ElMessage} from "element-plus";
 import Mask from "@/components/common/Mask.vue";
 import ItemSearch from "@/components/settings/item/ItemSearch.vue";
-import UnitSelector from "@/components/inventory/UnitSelector.vue";
+import UnitSelector from "@/components/UnitSelector.vue";
 import {itemUnitList} from "@/utils/unitList.ts"
 
 const props = defineProps({
diff --git a/src/components/settings/item/group/GroupAdd.vue b/src/components/settings/item/group/GroupAdd.vue
index c9d537d..000a50c 100644
--- a/src/components/settings/item/group/GroupAdd.vue
+++ b/src/components/settings/item/group/GroupAdd.vue
@@ -101,7 +101,7 @@ import ItemSearch from "@/components/settings/item/ItemSearch.vue";
 
 const createSearchRef = ref<any>('')
 import {itemUnitList} from "@/utils/unitList.ts"
-import UnitSelector from "@/components/inventory/UnitSelector.vue";
+import UnitSelector from "@/components/UnitSelector.vue";
 import {post} from "@/utils/request.ts";
 
 const isShow = ref<any>(false)

From 414a3a2a7336ab1d902565386fb506ca7295ec99 Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Tue, 27 May 2025 12:18:54 +0800
Subject: [PATCH 31/33] dev

---
 src/components/UnitSelector.vue                   |  2 +-
 src/components/common/goods/GoodsDetail.vue       | 14 +++++++-------
 src/components/common/goods/goodsDetail/Usage.vue | 11 +++++++++++
 3 files changed, 19 insertions(+), 8 deletions(-)
 create mode 100644 src/components/common/goods/goodsDetail/Usage.vue

diff --git a/src/components/UnitSelector.vue b/src/components/UnitSelector.vue
index 0865bd7..153b6f1 100644
--- a/src/components/UnitSelector.vue
+++ b/src/components/UnitSelector.vue
@@ -2,7 +2,7 @@
 <template>
     <div class="box">
       <ul class="item-list">
-        <div v-for="(item, index) in units" :class="['item',(index+1)%4 == 0 ? 'last-item' : '',item==curItem?'active':'']" @click="selectItem(item)">{{item}}</div>
+        <div v-for="(item, index) in props.units" :class="['item',(index+1)%4 == 0 ? 'last-item' : '',item==curItem?'active':'']" @click="selectItem(item)">{{item}}</div>
       </ul>
     </div>
 
diff --git a/src/components/common/goods/GoodsDetail.vue b/src/components/common/goods/GoodsDetail.vue
index cb13106..fbd7e46 100644
--- a/src/components/common/goods/GoodsDetail.vue
+++ b/src/components/common/goods/GoodsDetail.vue
@@ -45,17 +45,16 @@
         </el-table-column>
         <el-table-column label="使用方法" width="200">
           <template #default="scope">
-            <el-input ref="minPackagingRef" v-model="scope.row.minPackagingNumber" type="number"
-                      class="input"
-                      style="width: 200px;">
-            </el-input>
+            <el-input v-model="usage" placeholder="请输入使用方法" style="width: 100px"></el-input>
             <el-popover
                 placement="bottom"
                 title="Title"
                 :width="200"
                 trigger="click"
             >
-              <UnitSelector :units="packagingUnit" v-model="scope.row.minPackagingUnit"></UnitSelector>
+              <template #default>
+                <Usage></Usage>
+              </template>
             </el-popover>
           </template>
         </el-table-column>
@@ -132,8 +131,8 @@ import {nextTick, onMounted, ref} from "vue";
 import {post} from "@/utils/request.ts";
 import {ElMessage} from "element-plus";
 import {Delete} from "@element-plus/icons-vue";
-import {packagingUnit} from "@/utils/unitList.ts";
-import UnitSelector from "@/components/UnitSelector.vue";
+import Usage from "./goodsDetail/Usage.vue"
+import usageList from "@/assets/config/directory/drugMedcWayCode.json"
 
 const props = defineProps({
   status: {
@@ -145,6 +144,7 @@ const props = defineProps({
     default: false
   }
 })
+const usage = ref('')
 const showTooltip = ref(false);
 const goodsDetail = defineModel<any>();
 const delGoods = (item: any) => {
diff --git a/src/components/common/goods/goodsDetail/Usage.vue b/src/components/common/goods/goodsDetail/Usage.vue
new file mode 100644
index 0000000..c0d8a70
--- /dev/null
+++ b/src/components/common/goods/goodsDetail/Usage.vue
@@ -0,0 +1,11 @@
+<script setup lang="ts">
+
+</script>
+
+<template>
+<div>11111111</div>
+</template>
+
+<style scoped lang="scss">
+
+</style>
\ No newline at end of file

From b75d9bd6f6fd83e32d3ad193beaa0787496d16c1 Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Tue, 27 May 2025 12:23:47 +0800
Subject: [PATCH 32/33] dev

---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 0eb2d5c..40f2e75 100644
--- a/index.html
+++ b/index.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="UTF-8">
     <link rel="icon" href="/favicon.ico">
-    <link rel="stylesheet" href="@/assets/iconfont/iconfont.css">
+    <link rel="stylesheet" href="/static/iconfont/iconfont.css">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>药慧精灵智慧诊所</title>
 </head>

From 9d584330dc0cd4dc69029fffebc055b53709cafa Mon Sep 17 00:00:00 2001
From: NiuZiYuan <niuziyuan@jizhiweb.cn>
Date: Tue, 27 May 2025 13:18:51 +0800
Subject: [PATCH 33/33] dev

---
 src/assets/config/API.ts | 479 ++++++++++++++++++++-------------------
 src/views/Login.vue      |   3 +-
 2 files changed, 242 insertions(+), 240 deletions(-)

diff --git a/src/assets/config/API.ts b/src/assets/config/API.ts
index 9319009..ef52a26 100644
--- a/src/assets/config/API.ts
+++ b/src/assets/config/API.ts
@@ -1,295 +1,296 @@
 export namespace API {
-    // 收费模块
     export namespace Charge {
-        export const Log = {
-            list: '/charge/log/list', // 收费记录
-            reportWithDays: '/charge/log/reportWithDays', // 每日收费报表
-            listByDatetime: '/charge/log/listByDatetime', // 获取收退费记录
-            listByPatientId: '/charge/log/listByPatientId' // 病人付费记录
-        };
+        export namespace Log {
+            export const List = 'charge/log/list'//收费记录;
+            export const ReportWithDays = 'charge/log/reportWithDays'//每日收费报表;
+            export const ListByPatientId = 'charge/log/listByPatientId'//病人付费记录;
+            export const ListByDatetime = 'charge/log/listByDatetime'//获取收退费记录;
+        }
 
-        export const Order = {
-            list: '/charge/order/list', // 查询list 只有订单信息
-            save: '/charge/order/save', // 保存收费订单
-            complete: '/charge/order/complete', // 完成订单
-            refund: '/charge/order/refund', //
-            getPrintInfoByCode: '/charge/order/getPrintInfoByCode', // 根据订单号获取订单详情,小票打印用
-            getByDiagnosisCode: '/charge/order/getByDiagnosisCode', // 根据诊断code和状态获取诊断信息
-            getByCode: '/charge/order/getByCode', // 根据code查询订单详情
-            listWithDetail: '/charge/order/listWithDetail' // 查询list 带详情
-        };
+        export namespace Order {
+            export const List = 'charge/order/list'//查询list 只有订单信息;
+            export const Save = 'charge/order/save'//保存收费订单;
+            export const Complete = 'charge/order/complete'//完成订单;
+            export const GetPrintInfoByCode = 'charge/order/getPrintInfoByCode'//根据订单号获取订单详情,小票打印用;
+            export const GetByCode = 'charge/order/getByCode'//根据code查询订单详情;
+            export const Refund = 'charge/order/refund';
+            export const ListWithDetail = 'charge/order/listWithDetail'//查询list 带详情;
+            export const GetByDiagnosisCode = 'charge/order/getByDiagnosisCode'//根据诊断code和状态获取诊断信息;
+        }
+
+        export namespace Social {
+            export const PrePay = 'charge/social/prePay'//医保预支付;
+            export const RealPay = 'charge/social/realPay'//医保真实支付;
+            export const Upload = 'charge/social/upload'//医保上传支付明细;
+        }
 
-        export const Social = {
-            prePay: 'charge/social/prePay', // 医保预支付
-            realPay: 'charge/social/realPay', // 医保真实支付
-            upload: 'charge/social/upload' // 医保上传支付明细
-        };
     }
 
-    // 通用模块
     export namespace Common {
-        export const Auth = {
-            get: '/common/auth/get', // 获取认证信息
-            set: '/common/auth/set', // 设置认证信息
-            check: '/common/auth/check' //
-        };
+        export namespace Auth {
+            export const Get = 'common/auth/get'//获取认证信息;
+            export const Set = 'common/auth/set'//设置认证信息;
+            export const Check = 'common/auth/check';
+        }
 
-        export const Config = {
-            get: '/common/config/get', // 根据key获取配置信息
-            list: '/common/config/list', // 查询配置信息
-            getAll: '/common/config/getAll', // 查询所有配置信息
-            edit: '/common/config/edit', // 修改配置信息
-            savePrinter: '/common/config/savePrinter', // 保存打印机配置
-            getPrintConfig: '/common/config/getPrintConfig' // 获取打印机配置
-        };
+        export namespace Config {
+            export const Get = 'common/config/get'//根据key获取配置信息;
+            export const List = 'common/config/list'//查询配置信息;
+            export const GetAll = 'common/config/getAll'//查询所有配置信息;
+            export const SavePrinter = 'common/config/savePrinter'//保存打印机配置;
+            export const Edit = 'common/config/edit'//修改配置信息;
+            export const GetPrintConfig = 'common/config/getPrintConfig'//获取打印机配置;
+        }
 
-        export const Log = {
-            list: '/common/log/list' // 查询操作日志
-        };
+        export namespace Log {
+            export const List = 'common/log/list'//查询操作日志;
+        }
 
-        export const File = {
-            download: (token: string) => `common/file/download/${token}`, // 下载文件
-            uploadToTemp: 'common/file/uploadToTemp', // 上传临时文件
-            upload: 'common/file/upload', // 上传文件
-            getImage: (fileName: string) => `common/file/getImage/${fileName}` // 获取图片
-        };
+        export namespace File {
+            export const GetImage = 'common/file/getImage'//获取图片;
+            export const Download = 'common/file/download'//下载文件;
+            export const Upload = 'common/file/upload'//上传文件;
+            export const UploadToTemp = 'common/file/uploadToTemp'//上传临时文件;
+        }
 
-        export const ManagerUser = {
-            list: '/common/ManagerUser/list', // 所有人员信息
-            _data: '/common/ManagerUser/' // 登录
-        };
+        export namespace ManagerUser {
+            export const List = 'common/ManagerUser/list'//所有人员信息;
+            export const Verify = 'common/ManagerUser/verify'//验证token;
+            export const Login = 'common/ManagerUser/login'//登录;
+        }
+
+        export namespace Sign {
+            export const SignOut = 'common/sign/signOut'//医保签退;
+            export const SignIn = 'common/sign/signIn'//医保签到;
+        }
 
-        export const Sign = {
-            out: '/common/sign/out', // 医保签退
-            in: '/common/sign/in' // 医保签到
-        };
     }
 
-    // 诊断模块
     export namespace Diagnosis {
-        export const Base = {
-            save: '/diagnosis/base/save', // 保存诊断
-            getRegistrationDetail: '/diagnosis/base/getRegistrationDetail', // 获取挂号信息
-            getByDiagnosisCode: '/diagnosis/base/getByDiagnosisCode', // 获取诊断信息
-            ChargeQueueList: '/diagnosis/base/ChargeQueueList', // 获取收费队列
-            listByPatient: '/diagnosis/base/listByPatient', // 查询患者病历
-            getByRegisId: '/diagnosis/base/getByRegisId' // 根据挂单号回显病历详情
-        };
+        export namespace Base {
+            export const Save = 'diagnosis/base/save'//保存诊断;
+            export const GetByDiagnosisCode = 'diagnosis/base/getByDiagnosisCode'//获取诊断信息;
+            export const GetByRegisId = 'diagnosis/base/getByRegisId'//根据挂单号回显病历详情;
+            export const ChargeQueueList = 'diagnosis/base/ChargeQueueList'//获取收费队列;
+            export const ListByPatient = 'diagnosis/base/listByPatient'//查询患者病历;
+            export const GetRegistrationDetail = 'diagnosis/base/getRegistrationDetail'//获取挂号信息;
+        }
+
     }
 
-    // 商品模块
     export namespace Goods {
-        export const Cate = {
-            list: '/goods/cate/list', // 根据type获取商品二级分类列表
-            save: '/goods/cate/save', // 保存二级分类
-            del: '/goods/cate/del', // 删除二级分类
-            getAllList: '/goods/cate/getAllList' // 获取所有分类
-        };
+        export namespace Cate {
+            export const List = 'goods/cate/list'//根据type获取商品二级分类列表;
+            export const Save = 'goods/cate/save'//保存二级分类;
+            export const Del = 'goods/cate/del'//删除二级分类;
+            export const GetAllList = 'goods/cate/getAllList'//获取所有分类;
+        }
+
+        export namespace Base {
+            export const Get = 'goods/base/get'//根据商品id获取商品;
+            export const Save = 'goods/base/save'//商品建档或修改;
+            export const Search = 'goods/base/search'//商品搜索一键建档内的搜索;
+            export const ReturnInit = 'goods/base/returnInit'//商品重新初始化医保库存;
+            export const DetailWithSearch = 'goods/base/DetailWithSearch'//商品搜索;
+            export const EnableSale = 'goods/base/enableSale'//起售商品;
+            export const DisableSale = 'goods/base/disableSale'//停售商品;
+            export const AddIdCode = 'goods/base/addIdCode'//商品添加标识码;
+            export const GetByCateId = 'goods/base/getByCateId'//获取二级分类绑定的商品数量;
+        }
 
-        export const Base = {
-            get: '/goods/base/get', // 根据商品id获取商品
-            save: '/goods/base/save', // 商品建档或修改
-            search: '/goods/base/search', // 商品搜索一键建档内的搜索
-            disableSale: '/goods/base/disableSale', // 停售商品
-            addIdCode: '/goods/base/addIdCode', // 商品添加标识码
-            enableSale: '/goods/base/enableSale', // 起售商品
-            returnInit: '/goods/base/returnInit', // 商品重新初始化医保库存
-            getByCateId: '/goods/base/getByCateId', // 获取二级分类绑定的商品数量
-            DetailWithSearch: '/goods/base/DetailWithSearch' // 商品搜索
-        };
     }
 
-    // 库存模块
     export namespace Inventory {
-        export const Apply = {
-            list: '/inventory/apply/list', // 分页查询领用单
-            create: '/inventory/apply/create', // 创建领用单并领用
-            getDetail: '/inventory/apply/getDetail' // 获取领用单详情
-        };
+        export namespace Apply {
+            export const List = 'inventory/apply/list'//分页查询领用单;
+            export const Create = 'inventory/apply/create'//创建领用单并领用;
+            export const GetDetail = 'inventory/apply/getDetail'//获取领用单详情;
+        }
 
-        export const Check = {
-            list: '/inventory/check/list', // 盘点列表分页查询
-            save: '/inventory/check/save', // 保存盘点记录
-            getDetail: '/inventory/check/getDetail' // 获取盘点单详情
-        };
+        export namespace Check {
+            export const List = 'inventory/check/list'//盘点列表分页查询;
+            export const Save = 'inventory/check/save'//保存盘点记录;
+            export const GetDetail = 'inventory/check/getDetail'//获取盘点单详情;
+        }
 
-        export const Goods = {
-            log: '/inventory/goods/log', // 获取库存日志
-            update: '/inventory/goods/update', // 修改库存采购信息
-            listByIds: '/inventory/goods/listByIds', // 根据库存id集合获取库存信息
-            statistics: '/inventory/goods/statistics', // 库存统计
-            getByGoodsId: '/inventory/goods/getByGoodsId', // 获取商品库存信息 根据goodsId
-            listByGoodsId: '/inventory/goods/listByGoodsId', // 获取商品库存信息 根据goodsId
-            listByOrderCode: '/inventory/goods/listByOrderCode' // 获取采购单信息 根据code
-        };
+        export namespace Goods {
+            export const Log = 'inventory/goods/log'//获取库存日志;
+            export const Update = 'inventory/goods/update'//修改库存采购信息;
+            export const Statistics = 'inventory/goods/statistics'//库存统计;
+            export const GetByGoodsId = 'inventory/goods/getByGoodsId'//获取商品库存信息 根据goodsId;
+            export const ListByOrderCode = 'inventory/goods/listByOrderCode'//获取采购单信息 根据code;
+            export const ListByIds = 'inventory/goods/listByIds'//根据库存id集合获取库存信息;
+            export const ListByGoodsId = 'inventory/goods/listByGoodsId'//获取商品库存信息 根据goodsId;
+        }
 
-        export const Order = {
-            update: '/inventory/order/update', // 更新采购单基本信息
-            list: '/inventory/order/list', // 分页查询采购单
-            create: '/inventory/order/create', // 创建采购单
-            detail: '/inventory/order/detail', // 获取采购单详情
-            refund: '/inventory/order/refund', // 采购单退货
-            toExcel: '/inventory/order/toExcel', // 采购一键导入，生成excel
-            fromExcel: '/inventory/order/fromExcel', // 采购一键导入，解析excel
-            addGoods: '/inventory/order/addGoods' // 采购单修改时 添加采购的商品
-        };
+        export namespace Order {
+            export const Update = 'inventory/order/update'//更新采购单基本信息;
+            export const List = 'inventory/order/list'//分页查询采购单;
+            export const Create = 'inventory/order/create'//创建采购单;
+            export const Refund = 'inventory/order/refund'//采购单退货;
+            export const Detail = 'inventory/order/detail'//获取采购单详情;
+            export const ToExcel = 'inventory/order/toExcel'//采购一键导入，生成excel;
+            export const FromExcel = 'inventory/order/fromExcel'//采购一键导入，解析excel;
+            export const AddGoods = 'inventory/order/addGoods'//采购单修改时 添加采购的商品;
+        }
+
+        export namespace Supplier {
+            export const List = 'inventory/supplier/list'//分页查询供货商;
+            export const Save = 'inventory/supplier/save'//保存供货商;
+        }
 
-        export const Supplier = {
-            list: '/inventory/supplier/list', // 分页查询供货商
-            save: '/inventory/supplier/save' // 保存供货商
-        };
     }
 
-    // 项目模块
     export namespace Item {
-        export const get = '/item/get'; // 获取项目详情
-        export const search = '/item/search'; // 搜索项目
-        export const del = '/item/del'; // 删除项目
-        export const list = '/item/list'; // 获取非组套列表
-        export const deleteGroup = '/item/deleteGroup'; // 删除组套
-        export const edit = '/item/edit'; // 修改项目
-        export const groupList = '/item/groupList'; // 获取组套列表
-        export const add = '/item/add'; // 添加项目
-        export const getGroup = '/item/getGroup'; // 获取组套
-        export const saveGroup = '/item/saveGroup'; // 保存组套
+        export const Get = 'item/get'//获取项目详情;
+        export const Search = 'item/search'//搜索项目;
+        export const Del = 'item/del'//删除项目;
+        export const Edit = 'item/edit'//修改项目;
+        export const GroupList = 'item/groupList'//获取组套列表;
+        export const GetGroup = 'item/getGroup'//获取组套;
+        export const Add = 'item/add'//添加项目;
+        export const DeleteGroup = 'item/deleteGroup'//删除组套;
+        export const SaveGroup = 'item/saveGroup'//保存组套;
+        export const List = 'item/list'//获取非组套列表;
     }
 
-    // 组织模块
     export namespace Organization {
-        export const Member = {
-            get: '/organization/member/get', // 获取成员信息
-            list: '/organization/member/list', // 分页查询成员列表
-            save: '/organization/member/save', // 保存成员信息
-            search: '/organization/member/search', // 搜索成员
-            del: '/organization/member/del', // 删除成员
-            listBySectionId: '/organization/member/listBySectionId' // 获取当前科室的所有医生
-        };
+        export namespace Member {
+            export const Get = 'organization/member/get'//获取成员信息;
+            export const List = 'organization/member/list'//分页查询成员列表;
+            export const Save = 'organization/member/save'//保存成员信息;
+            export const Search = 'organization/member/search'//搜索成员;
+            export const Del = 'organization/member/del'//删除成员;
+            export const ListBySectionId = 'organization/member/listBySectionId'//获取当前科室的所有医生;
+        }
+
+        export namespace Section {
+            export const Add = 'organization/section/add'//添加科室;
+            export const Get = 'organization/section/get'//获取科室信息;
+            export const List = 'organization/section/list';
+            export const AllList = 'organization/section/allList'//获取所有科室;
+            export const Del = 'organization/section/del'//删除科室;
+            export const Edit = 'organization/section/edit'//修改科室信息;
+            export const ListByMemberId = 'organization/section/listByMemberId'//获取当前成员的所属科室;
+        }
 
-        export const Section = {
-            add: '/organization/section/add', // 添加科室
-            get: '/organization/section/get', // 获取科室信息
-            list: '/organization/section/list', //
-            allList: '/organization/section/allList', // 获取所有科室
-            del: '/organization/section/del', // 删除科室
-            edit: '/organization/section/edit', // 修改科室信息
-            listByMemberId: '/organization/section/listByMemberId' // 获取当前成员的所属科室
-        };
     }
 
-    // 患者模块
     export namespace Patient {
-        export const Base = {
-            get: '/patient/base/get', // 获取患者信息
-            update: '/patient/base/update', // 修改患者信息
-            create: '/patient/base/create', // 创建患者
-            search: '/patient/base/search', // 搜索患者
-            del: '/patient/base/del', // 删除患者
-            changeLevel: '/patient/base/changeLevel', // 改变会员等级
-            list: '/patient/base/list' // 分页查询患者列表
-        };
+        export namespace Base {
+            export const Get = 'patient/base/get'//获取患者信息;
+            export const Update = 'patient/base/update'//修改患者信息;
+            export const Create = 'patient/base/create'//创建患者;
+            export const Search = 'patient/base/search'//搜索患者;
+            export const Del = 'patient/base/del'//删除患者;
+            export const List = 'patient/base/list'//分页查询患者列表;
+            export const ChangeLevel = 'patient/base/changeLevel'//改变会员等级;
+        }
 
-        export const Integral = {
-            add: '/patient/integral/add', // 添加会员积分
-            list: '/patient/integral/list' // 分页查询会员积分记录
-        };
+        export namespace Integral {
+            export const Add = 'patient/integral/add'//添加会员积分;
+            export const List = 'patient/integral/list'//分页查询会员积分记录;
+        }
 
-        export const LevelConfig = {
-            get: '/patient/levelConfig/get', // 根据leveId获取会员等级配置
-            save: '/patient/levelConfig/save', // 保存会员等级配置
-            create: '/patient/levelConfig/create', // 新增会员等级配置
-            del: '/patient/levelConfig/del', // 删除一个会员等级配置
-            edit: '/patient/levelConfig/edit', // 修改会员等级配置
-            list: '/patient/levelConfig/list' // 分页查询会员等级配置
-        };
+        export namespace LevelConfig {
+            export const Get = 'patient/levelConfig/get'//根据leveId获取会员等级配置;
+            export const Save = 'patient/levelConfig/save'//保存会员等级配置;
+            export const Create = 'patient/levelConfig/create'//新增会员等级配置;
+            export const Del = 'patient/levelConfig/del'//删除一个会员等级配置;
+            export const Edit = 'patient/levelConfig/edit'//修改会员等级配置;
+            export const List = 'patient/levelConfig/list'//分页查询会员等级配置;
+        }
+
+        export namespace Registration {
+            export const Add = 'patient/registration/add'//挂号;
+            export const Get = 'patient/registration/get'//获取挂号信息 根据挂号id;
+            export const List = 'patient/registration/list'//分页查询挂号列表;
+            export const Cancel = 'patient/registration/cancel'//取消挂号;
+            export const AllList = 'patient/registration/allList'//获取挂号信息列表;
+            export const Del = 'patient/registration/del'//删除挂号信息;
+            export const Edit = 'patient/registration/edit'//修改挂号信息;
+            export const ListByType = 'patient/registration/listByType'//挂号信息分页搜索;
+            export const ChangeStatus = 'patient/registration/changeStatus'//更改挂号单状态;
+            export const GetWithPatient = 'patient/registration/getWithPatient'//根据id返回挂号详细信息 包含患者信息;
+        }
 
-        export const Registration = {
-            add: '/patient/registration/add', // 挂号
-            get: '/patient/registration/get', // 获取挂号信息 根据挂号id
-            list: '/patient/registration/list', // 分页查询挂号列表
-            cancel: '/patient/registration/cancel', // 取消挂号
-            allList: '/patient/registration/allList', // 获取挂号信息列表
-            del: '/patient/registration/del', // 删除挂号信息
-            changeStatus: '/patient/registration/changeStatus', // 更改挂号单状态
-            getWithPatient: '/patient/registration/getWithPatient', // 根据id返回挂号详细信息 包含患者信息
-            edit: '/patient/registration/edit', // 修改挂号信息
-            listByType: '/patient/registration/listByType' // 挂号信息分页搜索
-        };
     }
 
-    // 社保模块
     export namespace Social {
-        export const Recipe = {
-            download: '/social/recipe/download' // 下载中药颗粒
-        };
+        export namespace Recipe {
+            export const Download = 'social/recipe/download'//下载中药颗粒;
+        }
 
-        export const Disease = {
-            download: '/social/disease/download' //
-        };
+        export namespace Disease {
+            export const Download = 'social/disease/download';
+        }
 
-        export const Diagnose = {
-            search: '/social/diagnose/search' // 诊断搜索
-        };
+        export namespace Diagnose {
+            export const Search = 'social/diagnose/search'//诊断搜索;
+        }
 
-        export const Directory = {
-            search: '/social/directory/search', // 搜索目录信息
-            _data: '/social/directory/', // 同步到MongoDB
-            getByCode: '/social/directory/getByCode', // 根据医保码，获取医保商品信息
-            searchProducer: '/social/directory/searchProducer', // 搜索企业信息
-            get_doc_list: '/social/directory/get_doc_list', // 获取目录列表
-            itemSearch: '/social/directory/itemSearch', // 服务项目搜索
-            column_list: '/social/directory/column_list', // 获取目录列 列表
-            getItemByCode: '/social/directory/getItemByCode' // 根据医保码，获取医保服务项目信息
-        };
+        export namespace Directory {
+            export const Search = 'social/directory/search'//搜索目录信息;
+            export const GetByCode = 'social/directory/getByCode'//根据医保码，获取医保商品信息;
+            export const Download = 'social/directory/download'//下载目录;
+            export const SearchProducer = 'social/directory/searchProducer'//搜索企业信息;
+            export const Column_list = 'social/directory/column_list'//获取目录列 列表;
+            export const GetItemByCode = 'social/directory/getItemByCode'//根据医保码，获取医保服务项目信息;
+            export const ItemSearch = 'social/directory/itemSearch'//服务项目搜索;
+            export const Get_doc_list = 'social/directory/get_doc_list'//获取目录列表;
+            export const SyncToMongo = 'social/directory/syncToMongo'//同步到MongoDB;
+        }
 
-        export const DirectoryLimit = {
-            get_page: '/social/directory_limit/get_page' // 分页查询目录限制信息
-        };
+        export namespace Directory_limit {
+            export const Get_page = 'social/directory_limit/get_page'//分页查询目录限制信息;
+        }
 
-        export const DirectorySelf = {
-            get_page: '/social/directory_self/get_page' // 分页查询自付比例信息
-        };
+        export namespace Directory_self {
+            export const Get_page = 'social/directory_self/get_page'//分页查询自付比例信息;
+        }
 
-        export const DirectoryUpinfo = {
-            get_page: '/social/directory_upinfo/get_page' // 分页查询更新信息
-        };
+        export namespace Directory_upinfo {
+            export const Get_page = 'social/directory_upinfo/get_page'//分页查询更新信息;
+        }
 
-        export const DirectoryVersion = {
-            list: '/social/directory_version/list', // 获取医保目录版本列表
-            get_current: '/social/directory_version/get_current' // 获取当前医保目录版本
-        };
+        export namespace Directory_version {
+            export const List = 'social/directory_version/list'//获取医保目录版本列表;
+            export const Get_current = 'social/directory_version/get_current'//获取当前医保目录版本;
+        }
 
-        export const Person = {
-            getCustomSocialInfo: '/social/person/getCustomSocialInfo', // 获取社保人员信息
-            getSocialInfoByPsnNo: '/social/person/getSocialInfoByPsnNo' // 根据社保人员编号获取医保人员信息 redis
-        };
+        export namespace Person {
+            export const GetCustomSocialInfo = 'social/person/getCustomSocialInfo'//获取社保人员信息;
+            export const GetSocialInfoByPsnNo = 'social/person/getSocialInfoByPsnNo'//根据社保人员编号获取医保人员信息 redis;
+        }
 
-        export const Reconciliation = {
-            list: '/social/reconciliation/list', // 医保-对账列表
-            doDetail: '/social/reconciliation/doDetail', // 明细对账
-            doTotal: '/social/reconciliation/doTotal', // 对总账
-            reversal: '/social/reconciliation/reversal', // 冲正
-            historyList: '/social/reconciliation/historyList' // 自动对账历史记录列表
-        };
+        export namespace Reconciliation {
+            export const List = 'social/reconciliation/list'//医保-对账列表;
+            export const DoTotal = 'social/reconciliation/doTotal'//对总账;
+            export const HistoryList = 'social/reconciliation/historyList'//自动对账历史记录列表;
+            export const Reversal = 'social/reconciliation/reversal'//冲正;
+            export const DoDetail = 'social/reconciliation/doDetail'//明细对账;
+        }
+
+        export namespace Upload {
+            export const Get3501List = 'social/upload/get3501List'//分页查询 商品初始化数据;
+            export const Get3502List = 'social/upload/get3502List'//分页查询 商品库存变更记录;
+            export const Get3505List = 'social/upload/get3505List'//获取3505列表;
+            export const QuickUpload = 'social/upload/quickUpload'//进销存一键上报接口;
+            export const Get3503List = 'social/upload/get3503List'//分页查询 库存采购数据;
+            export const GetNotDoNumber = 'social/upload/getNotDoNumber'//获取进销存 3501-3506 未上报数量;
+        }
 
-        export const Upload = {
-            getNotDoNumber: '/social/upload/getNotDoNumber', // 获取进销存 3501-3506 未上报数量
-            get3503List: '/social/upload/get3503List', // 分页查询 库存采购数据
-            get3501List: '/social/upload/get3501List', // 分页查询 商品初始化数据
-            get3502List: '/social/upload/get3502List', // 分页查询 商品库存变更记录
-            get3505List: '/social/upload/get3505List', // 获取3505列表
-            quickUpload: '/social/upload/quickUpload' // 进销存一键上报接口
-        };
     }
 
-    // 统计模块
     export namespace Statistics {
-        export const getSalesVolumeOverview = '/statistics/getSalesVolumeOverview'; // 销售人次趋势
-        export const numberEarlyWarning = '/statistics/numberEarlyWarning'; // 库存预警
-        export const goodsStatistics = '/statistics/goodsStatistics'; // 商品统计
-        export const expiryDateWarning = '/statistics/expiryDateWarning'; // 有效期预警
-        export const getRevenueOverview = '/statistics/getRevenueOverview'; // 营收概况
-        export const getPayOverview = '/statistics/getPayOverview'; // 经营概况
-        export const salePerson = '/statistics/salePerson'; // 销售人员统计
-        export const getQueueCount = '/statistics/getQueueCount'; // 获取收费队列 就诊队列数量
+        export const GetSalesVolumeOverview = 'statistics/getSalesVolumeOverview'//销售人次趋势;
+        export const ExpiryDateWarning = 'statistics/expiryDateWarning'//有效期预警;
+        export const GoodsStatistics = 'statistics/goodsStatistics'//商品统计;
+        export const NumberEarlyWarning = 'statistics/numberEarlyWarning'//库存预警;
+        export const GetRevenueOverview = 'statistics/getRevenueOverview'//营收概况;
+        export const SalePerson = 'statistics/salePerson'//销售人员统计;
+        export const GetQueueCount = 'statistics/getQueueCount'//获取收费队列 就诊队列数量;
+        export const GetPayOverview = 'statistics/getPayOverview'//经营概况;
     }
-}
\ No newline at end of file
+
+}
diff --git a/src/views/Login.vue b/src/views/Login.vue
index 1070257..32c96ef 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -8,6 +8,7 @@ import Auth from "@/components/manger/Auth.vue";
 import {apiConfig} from "@/assets/config/apiConfig";
 import type {Request, Response} from "@/utils/ws.ts";
 import {useWsStore} from "@/stores/wsStore.ts";
+import {API} from "@/assets/config/API.ts";
 
 const username = ref('')
 const password = ref('')
@@ -40,7 +41,7 @@ const handleLogin = async () => {
 }
 
 const loginCore=async ()=>{
-  let token:any=await post(apiConfig.ManagerUserLogin, {username: username.value, password: password.value},{catch_error: true})
+  let token:any=await post(API.Common.ManagerUser.Login, {username: username.value, password: password.value},{catch_error: true})
   localStorage.setItem('token', token)
   try{
     await post(apiConfig.signIn, {mac: netWork.value.mac, ip: netWork.value.ip}, {catch_error: true})