From 2e0566e90f1941f19f8c34cf770a7324e0ef433e Mon Sep 17 00:00:00 2001 From: wwl <xchao828@163.com> Date: 星期四, 13 二月 2025 20:16:46 +0800 Subject: [PATCH] 1 --- src/views/hosp/order/index.vue | 100 +++++++++++++++++++++++++++++++------------------- 1 files changed, 62 insertions(+), 38 deletions(-) diff --git a/src/views/hosp/order/index.vue b/src/views/hosp/order/index.vue index be4a6e1..2056b76 100644 --- a/src/views/hosp/order/index.vue +++ b/src/views/hosp/order/index.vue @@ -243,6 +243,15 @@ >寮哄埗鎾ら攢</el-button > </el-col> + <el-col :span="1.5"> + <el-button + type="primary" + size="mini" + @click="ResumeAppointment" + :disabled="multiple" + >鎭㈠棰勭害</el-button + > + </el-col> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" @@ -1662,6 +1671,7 @@ getOrderList, getNewDateList, revokeTjOrderByTjNum, + huifuyuyuejilu, getTransitionInfo, getBlproByTjh, revokeBlProByBldhAndTjh, @@ -1782,6 +1792,7 @@ activeNames: "first", // 闈炲涓鐢� multiple: true, + tjNUms:[], // 鏄剧ず鎼滅储鏉′欢 showSearch: true, userId: "", @@ -2132,6 +2143,34 @@ }); }, + ResumeAppointment(){ + this.isLoading = true; + this.$confirm("鎮ㄧ‘璁よ鎭㈠棰勭害锛�", "纭淇℃伅", { + distinguishCancelAndClose: true, + confirmButtonText: "纭", + cancelButtonText: "鍙栨秷", + }) + .then(() => { + huifuyuyuejilu(this.tjNUms).then((res) => { + this.$modal.msgSuccess("鎭㈠鎴愬姛"); + // this.isLoading = false; + this.getList(); + }); + }) + .catch((action) => { + if (action === "cancel") { + this.$message({ + type: "warning", + message: "宸插彇娑�", + }); + } + }) + .finally(() => { + // 涓嶈鎿嶄綔鎴愬姛杩樻槸澶辫触锛岄兘浼氭墽琛� + this.isLoading = false; + }); + }, + handleRevoke() { this.isLoading = true; this.$confirm("鎮ㄧ‘璁よ鎾ら攢锛�", "纭淇℃伅", { @@ -2294,36 +2333,6 @@ // return [rowspan, 1]; // } }, - objectspanmethod({ row, column, rowIndex, columnIndex }) { - let fields = ["propinName"]; - let cellValue = row[column.property]; - if (cellValue && fields.includes(column.property)) { - let prevRow = this.Datalists[rowIndex - 1]; - let nextRow = this.Datalists[rowIndex + 1]; - if (prevRow && prevRow[column.property] === cellValue) { - return { rowspan: 0, colspan: 0 }; - } else { - let countRowspan = 1; - while (nextRow && nextRow[column.property] === cellValue) { - nextRow = this.Datalists[++countRowspan + rowIndex]; - } - - if (countRowspan > 1) { - return { rowspan: countRowspan, colspan: 1 }; - } - } - } - - // if (columnIndex == 3) { - // let rowspan = 0; - // this.DataLists.forEach((element) => { - // if (element.propinName === row.propinName) { - // rowspan++; - // } - // }); - // return [rowspan, 1]; - // } - }, filterpackage(value, data) { if (!value) return true; if (data.zhmc.indexOf(value) !== -1) { @@ -2355,6 +2364,7 @@ // 澶氶�夋閫変腑鏁版嵁 handleSelectionChange(selection) { let tjNUms = selection.map((item) => item.tjNumber); + this.tjNUms = selection.map((item) => item.tjNumber); selection.forEach((item) => { this.orderIds = item.orderId; this.tjnumbers = item.tjNumber; @@ -2527,6 +2537,8 @@ // this.marryalls = 0; // this.Datalists = []; this.checkedkeys = []; + + this.DataList3 = []; getZhList().then((response) => { if (response.data) { this.packageList = response.data; @@ -2535,8 +2547,10 @@ }); } else { // this.TotalPrice1 = 0; - this.checkedkey = []; + this.checkedkeys = []; // this.DataList = []; + this.Datalists = []; + this.DataList3 = []; this.getDataList(); // if (this.marryalls != 0) { // this.TotalPrice1 += this.marryalls; @@ -2549,7 +2563,7 @@ let datas = { zhId: data.id, }; - + getlistByZhId(datas).then((res) => { this.packagedataList = res.data.tjProjectList; for (var i = 0; i < this.packagedataList.length; i++) { @@ -2841,15 +2855,19 @@ if (checked === true) { // this.$refs.tree.setCheckedKeys([data.proId]); let proId = data.proId; - console.log(data,9898); - getProSonDxList(proId).then((res) => { this.TreedataList = res.data.list; + this.TreedataList.forEach((item) => { // item.disabled = true; - this.checkedListkey.push(item.proId); + // this.checkedListkey.push(item.proId); + if (!this.checkedListkey.includes(item.proId)) { + this.checkedListkey.push(item.proId); + } this.Datalists.push(item); + this.DataList3.push(item); + this.spliceData(); this.DataList3.forEach((item1) => { this.TotalPrice1 += item1.proPrice * item1.sl; @@ -2872,9 +2890,15 @@ getProSonDxList(proId).then((res) => { this.TreedataList = res.data.list; - // 浠庡凡閫夊垪琛ㄤ腑绉婚櫎璇ラ」鐩殑 ID - this.checkedListkey = this.checkedListkey.filter( - (id) => id !== proId + // 閬嶅巻 TreedataList 骞剁Щ闄ょ浉鍏崇殑瀛愰」 ID + this.TreedataList.forEach((item) => { + this.checkedListkey = this.checkedListkey.filter( + (id) => id !== item.proId + ); + }); + + this.Datalists = this.Datalists.filter( + (item) => item.proParentId !== proId ); // 浠� DataList3 涓Щ闄ょ浉鍏崇殑瀛愰」 -- Gitblit v1.8.0