From f68f2e75bab747e9580559b926d1e4a2515c72fa Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Wed, 1 Mar 2023 14:20:45 +0800
Subject: [PATCH] 2023-3-1

---
 src/views/finance/component/serveDraw.vue | 47 +++++++++++++++--------
 src/views/finance/serveDetail.vue         | 10 ++---
 2 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/src/views/finance/component/serveDraw.vue b/src/views/finance/component/serveDraw.vue
index badc591..c47b859 100644
--- a/src/views/finance/component/serveDraw.vue
+++ b/src/views/finance/component/serveDraw.vue
@@ -4,7 +4,7 @@
       <template>
         <div style="overflow-y: scroll; height: 100%; padding-bottom: 100px">
           <drawInfoItem title="被护理人" :info="rowFormat[0]"></drawInfoItem>
-          <drawInfoItem title="护理人" :info="rowFormat[1]"></drawInfoItem>
+          <drawInfoItem v-if="type === 2" title="护理人" :info="rowFormat[1]"></drawInfoItem>
           <div class="draw-title">
             {{ type === 1 ? "服务列表" : "本次服务信息" }}
           </div>
@@ -180,22 +180,35 @@ export default {
   computed: {
     rowFormat() {
       if (this.selectedRow()) {
-        return [
-          {
-            姓名: this.selectedRow().customer?.name,
-            性别: this.selectedRow().customer?.sex,
-            年龄: getAgeByIdcard(this.selectedRow().customer?.idcard),
-            地址: this.selectedRow().customer_address?.address,
-            联系人: this.selectedRow().customer?.contact_name,
-            联系人电话: this.selectedRow().customer?.contact_phone,
-          },
-          {
-            姓名: this.selectedRow().nurse?.name,
-            性别: this.selectedRow().nurse?.sex,
-            年龄: getAgeByIdcard(this.selectedRow().nurse?.idcard),
-            手机号: this.selectedRow().nurse?.mobile,
-          },
-        ];
+        if(this.type === 1){
+          return [
+            {
+              姓名: this.selectedRow().customer?.name,
+              性别: this.selectedRow().customer?.sex,
+              年龄: getAgeByIdcard(this.selectedRow().customer?.idcard),
+              联系人: this.selectedRow().customer?.contact_name,
+              联系人电话: this.selectedRow().customer?.contact_phone,
+            }
+          ]
+        }
+        if(this.type === 2){
+          return [
+            {
+              姓名: this.selectedRow().customer?.name,
+              性别: this.selectedRow().customer?.sex,
+              年龄: getAgeByIdcard(this.selectedRow().customer?.idcard),
+              地址: this.selectedRow().customer_address?.address,
+              联系人: this.selectedRow().customer?.contact_name,
+              联系人电话: this.selectedRow().customer?.contact_phone,
+            },
+            {
+              姓名: this.selectedRow().nurse?.name,
+              性别: this.selectedRow().nurse?.sex,
+              年龄: getAgeByIdcard(this.selectedRow().nurse?.idcard),
+              手机号: this.selectedRow().nurse?.mobile,
+            },
+          ];
+        }
       }
     },
     typeFormat() {
diff --git a/src/views/finance/serveDetail.vue b/src/views/finance/serveDetail.vue
index 2173fbd..08400cd 100644
--- a/src/views/finance/serveDetail.vue
+++ b/src/views/finance/serveDetail.vue
@@ -96,7 +96,7 @@
       </template>
     </xy-table>
 
-    <serveDraw ref="serveDraw"></serveDraw>
+    <serveDraw :type="1" ref="serveDraw"></serveDraw>
   </div>
 </template>
 
@@ -221,11 +221,9 @@ export default {
     },
 
     detail(scope) {
-      this.$refs["serveDraw"].row = scope.row;
-      this.$refs["serveDraw"].select.id = scope.row.id;
-      this.$refs["serveDraw"].select.customer_id = scope.row.customer.id;
-      this.$refs["serveDraw"].select.year = this.select.year;
-      this.$refs["serveDraw"].select.month = this.select.month;
+      this.selectedRow = scope.row;
+      this.$refs["serveDraw"].select.order_id = scope.row.id;
+      //this.$refs["serveDraw"].select.customer_id = scope.row.customer.id;
       this.$refs["serveDraw"].isShow = true;
     },
     async getList() {