From f169a06cea16bc6215743a7be07febdb1d4fdc38 Mon Sep 17 00:00:00 2001 From: qinxianzhangyao <11053546+qinxianzhangyao@user.noreply.gitee.com> Date: 星期五, 12 七月 2024 17:16:55 +0800 Subject: [PATCH] qxtj --- src/views/reservation/reservations/index.vue | 75 +++++++++++++++++++------------------ 1 files changed, 39 insertions(+), 36 deletions(-) diff --git a/src/views/reservation/reservations/index.vue b/src/views/reservation/reservations/index.vue index dda05d6..280ab4b 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,7 +42,7 @@ </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"> @@ -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 @@ -1114,33 +1116,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; }); } @@ -1158,6 +1160,7 @@ this.TotalPrice1 = 0; this.tableData1.forEach((item) => { this.TotalPrice1 += item.nowPrice; + console.log(this.discount) this.TotalPrice = ( this.TotalPrice1 * (this.discount / 10) @@ -1181,12 +1184,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("宸茶繃鏈熻閲嶆柊棰勭害"); } @@ -1455,7 +1458,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 +1540,9 @@ }); this.getList(); this.$tab.refreshPage(); - } else { - this.$message.warning("璇烽�夋嫨鎮ㄨ浣撴鐨勫唴瀹�"); - } + // } else { + // this.$message.warning("璇烽�夋嫨鎮ㄨ浣撴鐨勫唴瀹�"); + // } }, // 鏈�鍚庢彁浜ゆ寜閽� submitPrice1() { -- Gitblit v1.8.0