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 |   32 +++++++++++++++++++++++---------
 1 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/views/reservation/reservations/index.vue b/src/views/reservation/reservations/index.vue
index 5007044..c1c568f 100644
--- a/src/views/reservation/reservations/index.vue
+++ b/src/views/reservation/reservations/index.vue
@@ -60,8 +60,7 @@
         </template>
       </el-table-column>
       <el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="phoe" width="110px" :show-overflow-tooltip="true" />
-      <el-table-column label="閭" align="center" prop="email" :show-overflow-tooltip="true" width="160px" />
-      <el-table-column label="鍦板潃" align="center" prop="address" :show-overflow-tooltip="true" width="160px" />
+      
       <el-table-column label="棰勭害鏃堕棿" align="center" prop="reservationTime" width="100px" :show-overflow-tooltip="true"
         sortable>
         <template slot-scope="scope">
@@ -92,6 +91,8 @@
         </template>
       </el-table-column>
       <el-table-column label="鍗曚綅鍚嶇О" align="center" prop="company" :show-overflow-tooltip="true" />
+      <el-table-column label="閭" align="center" prop="email" :show-overflow-tooltip="true" width="160px" />
+      <el-table-column label="鍦板潃" align="center" prop="address" :show-overflow-tooltip="true" width="160px" />
       <el-table-column label="鎿嶄綔" align="center" width="90px" fixed="right">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-s-order" @click="handleUpdate1(scope.row)"
@@ -1091,6 +1092,7 @@
 
     /** 淇敼鎸夐挳鎿嶄綔 */
     handleUpdate(row) {
+      console.log(row)
       this.title = "淇敼浣撴棰勭害";
       this.formIn = row;
       this.form.tjType = this.formIn.tjType
@@ -1108,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;
@@ -1158,6 +1163,7 @@
                     this.TotalPrice1 = 0;
                     this.tableData1.forEach((item) => {
                       this.TotalPrice1 += item.nowPrice;
+                      console.log(this.discount)
                       this.TotalPrice = (
                         this.TotalPrice1 *
                         (this.discount / 10)
@@ -1215,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;
@@ -1253,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;
@@ -1283,6 +1295,8 @@
             this.list1 = true;
           }
         });
+      }
+    })
 
       /** 鏌ヨ閮ㄩ棬涓嬫媺鏍戠粨鏋� */
       projectGetList().then((response) => {
@@ -1455,7 +1469,7 @@
     // 鏈�鍚庢彁浜ゆ寜閽�
     submitPrice() {
       let _this = this;
-      if (_this.tableData1.length > 0) {
+      // if (_this.tableData1.length > 0) {
         if (this.tableData[0]) {
           var pacId = this.tableData[0].pacId;
         }
@@ -1537,9 +1551,9 @@
         });
         this.getList();
         this.$tab.refreshPage();
-      } else {
-        this.$message.warning("璇烽�夋嫨鎮ㄨ浣撴鐨勫唴瀹�");
-      }
+      // } else {
+      //   this.$message.warning("璇烽�夋嫨鎮ㄨ浣撴鐨勫唴瀹�");
+      // }
     },
     // 鏈�鍚庢彁浜ゆ寜閽�
     submitPrice1() {

--
Gitblit v1.8.0