From fb66c7aafd8d7ef6f4be05a0c12cfa3c4ca84863 Mon Sep 17 00:00:00 2001
From: qinxianzhangyao <11053546+qinxianzhangyao@user.noreply.gitee.com>
Date: 星期一, 15 七月 2024 13:48:41 +0800
Subject: [PATCH] qxtj

---
 src/views/reservation/reservations/index.vue |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/views/reservation/reservations/index.vue b/src/views/reservation/reservations/index.vue
index 280ab4b..c1c568f 100644
--- a/src/views/reservation/reservations/index.vue
+++ b/src/views/reservation/reservations/index.vue
@@ -1110,7 +1110,10 @@
       }
       if (this.formIn.isExpire === 2) {
         this.drawer = true;
-        this.discount = this.formIn.discount;
+        if( this.formIn.discount!= null){
+          this.discount = this.formIn.discount;
+        }
+        
         //鍏ㄩ儴濂楅
         if (this.formIn.sex != null) {
           let cusSex = this.formIn.sex;
@@ -1218,7 +1221,10 @@
         this.tijiao1 = false;
       }
       this.drawer1 = true;
-      this.discount = this.formIn.discount;
+      if( this.formIn.discount != null){
+        this.discount = this.formIn.discount;
+
+      }
       //鍏ㄩ儴濂楅
       if (this.formIn.sex != null) {
         let cusSex = this.formIn.sex;
@@ -1256,10 +1262,13 @@
           this.loading = false;
         });
       }
-      let cusId = this.formIn.idCard;
+      let id = this.formIn.id;
       this.list1 = true;
       (this.tableData1 = []),
         (this.newpacName = []),
+        getReservation(id).then((response) => {
+            if (response.data) {
+              let cusId = response.data.idCard;
         getTransitionList(cusId).then((response) => {
           if (response.data) {
             this.tableData1 = response.data;
@@ -1286,6 +1295,8 @@
             this.list1 = true;
           }
         });
+      }
+    })
 
       /** 鏌ヨ閮ㄩ棬涓嬫媺鏍戠粨鏋� */
       projectGetList().then((response) => {

--
Gitblit v1.8.0