From bbd8b70f2544e07ce6ce4247ebb13f892dd86112 Mon Sep 17 00:00:00 2001
From: qinxianzhangyao <11053546+qinxianzhangyao@user.noreply.gitee.com>
Date: 星期四, 27 六月 2024 15:11:51 +0800
Subject: [PATCH] qxtj

---
 src/views/reservation/reservations/index.vue |   83 +++++++++++++++++++++--------------------
 1 files changed, 42 insertions(+), 41 deletions(-)

diff --git a/src/views/reservation/reservations/index.vue b/src/views/reservation/reservations/index.vue
index 8da22f1..61d3bf0 100644
--- a/src/views/reservation/reservations/index.vue
+++ b/src/views/reservation/reservations/index.vue
@@ -29,7 +29,7 @@
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
       </el-form-item>
     </el-form>
-    <el-row :gutter="10" class="mb8">
+    <el-row :gutter="10" style="margin: 10px 15px;">
       <el-col :span="1.5">
         <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="multiple" @click="batch"
           v-hasPermi="['reservation:reservation:remove']">鎾ら攢棰勭害</el-button>
@@ -42,13 +42,14 @@
     </el-row>
 
     <el-table border v-loading="loading" :data="reservationList" @selection-change="handleSelectionChange"
-      :default-sort="{ prop: 'reservationTime', order: 'descending' }" highlight-current-row>
+      :default-sort="{ prop: 'reservationTime', order: 'descending' }" highlight-current-row style="margin-left: 15px;">
       <el-table-column type="selection" width="40px" align="center" fixed="left" :selectable="selectHandle" />
       <el-table-column label="濮撳悕" align="center" prop="name" width="90px" :show-overflow-tooltip="true" fixed="left" />
       <el-table-column label="鎬у埆" align="center" prop="sex" width="60px" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <span v-if="scope.row.sex == '0'">鐢�</span>
           <span v-if="scope.row.sex == '1'">濂�</span>
+          <span v-if="scope.row.sex == '2'">鏈煡</span>
         </template>
       </el-table-column>
       <el-table-column label="骞撮緞" align="center" prop="age" width="60px" :show-overflow-tooltip="true" />
@@ -276,7 +277,7 @@
                     <!-- <div class="tab1"> -->
                     <!-- <el-form :inline="true" class="tab1"> -->
                     <el-form-item label="搴旀敹閲戦">
-                      <el-input placeholder="搴旀敹閲戦" :value="TotalPrice1 + '.00'" disabled style="width: 160px"></el-input>
+                      <el-input placeholder="搴旀敹閲戦" :value="TotalPrice1 " disabled style="width: 160px"></el-input>
                     </el-form-item>
                     <el-form-item label="浼樻儬鎶樻墸">
                       <!-- <el-input style="width: 100px" type="number" v-model="discount" :value="discount"></el-input> -->
@@ -284,7 +285,7 @@
                         :step="0.1" :max="10" :min="1" @change="numberChange" :disabled="isfalse"></el-input-number>
                     </el-form-item>
                     <el-form-item label="瀹炴敹閲戦">
-                      <el-input placeholder="瀹炴敹閲戦" v-model="TotalPrice" style="width: 120px"></el-input>
+                      <el-input placeholder="瀹炴敹閲戦" v-model="TotalPrice" style="width: 120px" disabled></el-input>
                     </el-form-item>
 
                     <el-form-item>
@@ -315,9 +316,9 @@
                             item.parentName +
                             " (搴旀敹閲戦:" +
                             item.ordPrice +
-                            ".00鍏� / 瀹炴敹閲戦:" +
+                            " / 瀹炴敹閲戦:" +
                             item.nowPrice +
-                            ".00鍏�)"
+                            "鍏�)"
                           }}
                         </template>
                         <el-table :data="item.list" border style="width: 100%" height="270">
@@ -522,7 +523,7 @@
               <el-form-item label="鍗″彿" prop="indexCard">
                 <el-input v-model="formIn.indexCard" placeholder="璇疯緭鍏ュ崱鍙�" style="width: 190px" />
               </el-form-item>
-              <el-button type="primary" @click="Package" size="mini">閫夋嫨濂楅</el-button>
+              <!-- <el-button type="primary" @click="Package" size="mini">閫夋嫨濂楅</el-button> -->
             </el-form>
           </div>
 
@@ -615,7 +616,7 @@
                     <!-- <div class="tab1"> -->
                     <!-- <el-form :inline="true" class="tab1"> -->
                     <el-form-item label="搴旀敹閲戦">
-                      <el-input placeholder="搴旀敹閲戦" :value="TotalPrice1 + '.00'" disabled style="width: 160px"></el-input>
+                      <el-input placeholder="搴旀敹閲戦" :value="TotalPrice1" disabled style="width: 160px"></el-input>
                     </el-form-item>
                     <el-form-item label="浼樻儬鎶樻墸">
                       <!-- <el-input style="width: 100px" type="number" v-model="discount" :value="discount"></el-input> -->
@@ -627,7 +628,7 @@
                     </el-form-item>
 
                     <el-form-item>
-                      <el-button type="primary" @click="submitPrice" :disabled="confirm" size="mini">绛惧埌鐧昏</el-button>
+                      <el-button type="primary" @click="submitPrice" :disabled="confirm" size="mini">棰勭害淇敼</el-button>
                     </el-form-item>
                     <!-- </el-form> -->
                     <!-- </div> -->
@@ -1113,33 +1114,33 @@
           let cusSex = this.formIn.sex;
           deptTreeSelect(cusSex).then((response) => {
             this.newpacName = response.rows;
-            this.newpacName.forEach((item3) => {
-              this.tableData1.forEach((item4) => {
-                item4.list.forEach((item6) => {
-                  if (item6.pacName === item3.pacName) {
-                    this.$refs.tb.toggleRowSelection(item3, true);
-                    throw Error();
-                  }
-                });
-              });
-            });
+            // this.newpacName.forEach((item3) => {
+            //   this.tableData1.forEach((item4) => {
+            //     item4.list.forEach((item6) => {
+            //       if (item6.pacName === item3.pacName) {
+            //         this.$refs.tb.toggleRowSelection(item3, true);
+            //         throw Error();
+            //       }
+            //     });
+            //   });
+            // });
             this.loading = false;
           });
         } else {
           deptTreeSelect().then((response) => {
             this.newpacName = response.rows;
-            this.newpacName.forEach((item3) => {
-              this.tableData1.forEach((item4) => {
-                item4.list.forEach((item6) => {
-                  if (item6.pacName === item3.pacName) {
-                    this.$nextTick(() => {
-                      this.$refs.tb.toggleRowSelection(item3, true);
-                    });
-                    throw Error();
-                  }
-                });
-              });
-            });
+            // this.newpacName.forEach((item3) => {
+            //   this.tableData1.forEach((item4) => {
+            //     item4.list.forEach((item6) => {
+            //       if (item6.pacName === item3.pacName) {
+            //         this.$nextTick(() => {
+            //           this.$refs.tb.toggleRowSelection(item3, true);
+            //         });
+            //         throw Error();
+            //       }
+            //     });
+            //   });
+            // });
             this.loading = false;
           });
         }
@@ -1180,12 +1181,12 @@
             }
           });
 
-        /** 鏌ヨ閮ㄩ棬涓嬫媺鏍戠粨鏋� */
-        projectGetList().then((response) => {
-          this.treedataList = response.data.list;
-          this.dXData = response.data.list;
-          return;
-        });
+        // /** 鏌ヨ閮ㄩ棬涓嬫媺鏍戠粨鏋� */
+        // projectGetList().then((response) => {
+        //   this.treedataList = response.data.list;
+        //   this.dXData = response.data.list;
+        //   return;
+        // });
       } else {
         this.$message.warning("宸茶繃鏈熻閲嶆柊棰勭害");
       }
@@ -1454,7 +1455,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;
         }
@@ -1536,9 +1537,9 @@
         });
         this.getList();
         this.$tab.refreshPage();
-      } else {
-        this.$message.warning("璇烽�夋嫨鎮ㄨ浣撴鐨勫唴瀹�");
-      }
+      // } else {
+      //   this.$message.warning("璇烽�夋嫨鎮ㄨ浣撴鐨勫唴瀹�");
+      // }
     },
     // 鏈�鍚庢彁浜ゆ寜閽�
     submitPrice1() {

--
Gitblit v1.8.0