From c2b56ed357481d89807003e3e887ed236bf707ba Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Sun, 27 Apr 2025 16:16:24 +0800
Subject: [PATCH] dev

---
 src/components/outpatient/MedicalHistory.vue  |  5 +++-
 .../outpatient/PharmaceuticalConsumables.vue  |  6 ++---
 src/components/registration/Edit.vue          | 22 ++++++++--------
 src/views/outpatient/index.vue                | 26 +++++++++++--------
 src/views/registration/index.vue              |  2 +-
 5 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/src/components/outpatient/MedicalHistory.vue b/src/components/outpatient/MedicalHistory.vue
index ddd7e35..3be39e9 100644
--- a/src/components/outpatient/MedicalHistory.vue
+++ b/src/components/outpatient/MedicalHistory.vue
@@ -38,7 +38,10 @@ const init = (patientId: any) => {
     list.value = res
   })
 }
-defineExpose({init})
+const clearList = () => {
+  list.value = []
+}
+defineExpose({init,clearList})
 </script>
 <style scoped lang="scss">
 .list {
diff --git a/src/components/outpatient/PharmaceuticalConsumables.vue b/src/components/outpatient/PharmaceuticalConsumables.vue
index 8606e8d..4b6d3ba 100644
--- a/src/components/outpatient/PharmaceuticalConsumables.vue
+++ b/src/components/outpatient/PharmaceuticalConsumables.vue
@@ -8,7 +8,7 @@
             <span class="name">{{ item.name }}</span>
             <span class="type">{{ item.type }}</span>
             <span class="unit">
-              <el-input-number v-model="item.selectNum" min="0"></el-input-number>
+              <el-input-number v-model="item.selectedNum" min="0"></el-input-number>
                 <el-dropdown>
                 <span style="line-height: 30px;margin-left: 10px">{{ item.selectedUnit }}</span>
                 <template #dropdown>
@@ -70,7 +70,7 @@ const itemShowConfig = [
   },
 ]
 const itemSelect = (row: any) => {
-  row.selectNum = 1
+  row.selectedNum = 1
   row.selectedUnit = row.packagingUnit
   row.selectedPrice = row.unitPrice
   list.value.push(row)
@@ -94,7 +94,7 @@ const selectUnit = (item: any, unit: any) => {
 const sumPrice = ref(0)
 watch(()=>list.value, (newList) => {
   sumPrice.value = newList.reduce((total, item) => {
-    return total + (item.selectNum || 0) * (item.selectedPrice || 0);
+    return total + (item.selectedNum || 0) * (item.selectedPrice || 0);
   }, 0);
 }, {deep: true})
 </script>
diff --git a/src/components/registration/Edit.vue b/src/components/registration/Edit.vue
index e6787c3..31aedc3 100644
--- a/src/components/registration/Edit.vue
+++ b/src/components/registration/Edit.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="title">
+  <div class="title" style="margin-top: 24px">
     <el-button type="primary">读卡</el-button>
   </div>
   <el-form
@@ -12,7 +12,7 @@
         border
         direction="vertical"
         label-width="100"
-        :column="2"
+        :column="4"
         style="margin-top: 20px"
     >
       <el-descriptions-item label="名称">
@@ -51,15 +51,15 @@
         <el-input v-model="edit_data.memo" placeholder="备注"></el-input>
       </el-descriptions-item>
     </el-descriptions>
-    <div class="content">
+    <div class="content" style="margin-top: 24px">
       <CardDefault v-model="socialCard" @socialCardUpdate="socialCardUpdate"/>
     </div>
-    <div class="bottom_btn">
-      <el-button type="primary" @click="save">保存</el-button>
-      <el-button @click="close">取消</el-button>
-      <el-button v-if="id" type="danger" @click="deleteDetail">删除</el-button>
-    </div>
   </el-form>
+  <div class="bottom_btn">
+    <el-button type="primary" @click="save">保存</el-button>
+    <el-button @click="close">取消</el-button>
+    <el-button v-if="id" type="danger" @click="deleteDetail">删除</el-button>
+  </div>
 </template>
 <script setup lang="ts">
 import {onMounted, ref} from 'vue'
@@ -164,8 +164,8 @@ onMounted(() => {
 }
 
 .bottom_btn {
-  display: flex;
-  justify-content: flex-end;
-  margin-top: 10px;
+  right: 0;
+  position: absolute;
+  bottom: 0;
 }
 </style>
\ No newline at end of file
diff --git a/src/views/outpatient/index.vue b/src/views/outpatient/index.vue
index 0a1ed7a..3218be3 100644
--- a/src/views/outpatient/index.vue
+++ b/src/views/outpatient/index.vue
@@ -6,20 +6,21 @@
     <div class="middle">
       <el-scrollbar>
         <div class="case">
-          <CaseDetail v-if="registerId&&formData.status == 3" v-model="formData"></CaseDetail>
+          <CaseDetail v-if="patientRegistration.status==3" v-model="formData"></CaseDetail>
           <Case v-else v-model="formData"></Case>
         </div>
         <div class="service-items">
-          <ServiceItemsDetail v-if="registerId&&formData.status == 3" v-model="itemList"></ServiceItemsDetail>
+          <ServiceItemsDetail v-if="patientRegistration.status==3" v-model="itemList"></ServiceItemsDetail>
           <ServiceItems v-else v-model="itemList"></ServiceItems>
         </div>
         <div class="pharmaceutical-consumables">
-          <PharmaceuticalConsumablesDetail v-if="registerId&&formData.status == 3"
+          <PharmaceuticalConsumablesDetail v-if="patientRegistration.status==3"
                                            v-model="goodsList"></PharmaceuticalConsumablesDetail>
           <PharmaceuticalConsumables v-else v-model="goodsList"></PharmaceuticalConsumables>
         </div>
         <div class="bottom">
-          <Settlement v-if="status!=1" v-model="totalAmount" @deleteItem="deleteItem" @save="save" :status="status" @edit="edit"></Settlement>
+          <Settlement v-if="status!=1" v-model="totalAmount" @deleteItem="deleteItem" @save="save" :status="status"
+                      @edit="edit"></Settlement>
         </div>
       </el-scrollbar>
     </div>
@@ -121,25 +122,28 @@ const deleteItem = () => {
 }
 const getStatus = (e: any) => {
   status.value = e
+  formData.value = {}
+  goodsList.value = []
+  itemList.value = []
+  patientRegistration.value = {}
+  nextTick(() => {
+    medicalHistoryRef.value?.clearList();
+  })
 }
-const edit=()=>{
+const edit = () => {
   post('registration/changeStatus', {id: registerId.value, status: 2}).then((res: any) => {
     status.value = 2
   })
 }
 // 使用 watch 监听 goodsList 和 itemList 的变化
-watch([()=>goodsList.value, itemList,status], ([newGoodsList, newItemList,newStatus]) => {
+watch([() => goodsList.value, itemList], ([newGoodsList, newItemList]) => {
   const pharmaceuticalTotalAmount = newItemList.reduce((pre: any, cur: any) => {
     return pre + cur.unitPrice
   }, 0);
   const serviceTotalAmount = newGoodsList.reduce((pre: any, cur: any) => {
-
-    return pre + cur.selectNum * cur.selectedPrice
+    return pre + cur.selectedNum * cur.selectedPrice
   }, 0);
   totalAmount.value = pharmaceuticalTotalAmount + serviceTotalAmount;
-  if (newStatus) {
-    registerId.value=''
-  }
 }, {deep: true});
 </script>
 <style scoped lang="scss">
diff --git a/src/views/registration/index.vue b/src/views/registration/index.vue
index f07308d..c9e0098 100644
--- a/src/views/registration/index.vue
+++ b/src/views/registration/index.vue
@@ -47,7 +47,7 @@
         </div>
       </div>
     </div>
-    <Mask :is-show="isShow" width="400" title="挂号" @close="isShow=false">
+    <Mask :is-show="isShow" width="800" title="挂号" @close="isShow=false">
       <Edit :id="id" :doctorList="roleList" @close="getPatientList"></Edit>
     </Mask>
   </div>