From a4965736d3f6e0293f16fafd044de08882958413 Mon Sep 17 00:00:00 2001 From: qx <1084500556@qq.com> Date: 星期一, 11 八月 2025 18:08:48 +0800 Subject: [PATCH] :qx --- src/views/doctor/check/index.vue | 66 +++++++++++++++++++++++--------- 1 files changed, 47 insertions(+), 19 deletions(-) diff --git a/src/views/doctor/check/index.vue b/src/views/doctor/check/index.vue index 74de0ab..a35f190 100644 --- a/src/views/doctor/check/index.vue +++ b/src/views/doctor/check/index.vue @@ -742,7 +742,7 @@ activeNames: "first", taocan: false, minedis: false, - lastClickedTab:null, + lastClickedTab: null, creatobj: {}, dataText: [], propform: {}, @@ -1330,17 +1330,28 @@ bzxz() { this.taocan = true; + var deptAdviceList1 =[] let data = { proId: this.proId, tjNum: this.tableAll.tjNumber }; getAdviceByTjNumAndPro(data).then((res) => { if (res.data) { this.deptAdviceList3 = res.data; - this.deptAdviceList1 = [ - ...new Set(this.deptAdviceList2.concat(this.deptAdviceList3)), + this.proParentList.xiaoJieIds.forEach(item => { + this.deptAdviceList3.forEach((items) => { + if (item == items.id) { + deptAdviceList1.push(items) + } + }); + }) + this.deptAdviceList1 = [ + ...new Set(deptAdviceList1), ]; - this.deptAdviceList3.forEach((items) => { - this.idss.push(items.id); - this.remakes += items.advice + ","; - }); + // this.deptAdviceList1 = [ + // ...new Set(this.deptAdviceList2.concat(this.deptAdviceList3)), + // ]; + // this.deptAdviceList3.forEach((items) => { + // this.idss.push(items.id); + // this.remakes += items.advice + ","; + // }); } }); }, @@ -1380,26 +1391,42 @@ handleDelete(row) { this.deptAdviceList1.forEach((item, index) => { - if (item.id == row.id) this.deptAdviceList1.splice(index, 1); + if (item.id == row.id) { + this.deptAdviceList1.splice(index, 1); + this.$refs.multipleTable.toggleRowSelection(item, false); + } + }); }, handleSelectionChanges(selection) { - this.deptAdviceList2 = this.deptAdviceList1; + if (this.deptAdviceList1.length != 0) { + this.deptAdviceList2 = this.deptAdviceList1; + } if (selection.length > 1) { const del_row = selection.shift(); this.$refs.multipleTable.toggleRowSelection(del_row, false); } selection.forEach((item) => this.deptAdviceList2.push(item)); - this.deptAdviceList1 = [ - ...new Set(this.deptAdviceList2.concat(this.deptAdviceList3)), - ]; + // this.deptAdviceList1 = [ + // ...new Set(this.deptAdviceList2), + // ]; + this.deptAdviceList1 = [...new Set( + this.deptAdviceList2.map(item => JSON.stringify(item)) +)].map(str => JSON.parse(str)); + // if( this.deptAdviceList1.length == 0){ + // this.deptAdviceList1 = selection + // }else{ + // selection.forEach((item) => this.deptAdviceList1.push(item)); + // } + }, queding() { if (this.proParentList.xiaoJie.length != 0) { this.remakes = ""; this.titles = ""; + this.vaids = [] this.deptAdviceList1.forEach((item1) => { if (this.proParentList.remark != null) { this.titles += item1.title + ","; @@ -1853,6 +1880,7 @@ this.loading = true; this.drawer = true; this.isLoading = true; + this.titles = "" this.Parent = [] this.tableAll = [] this.proParentList = {} @@ -1962,11 +1990,11 @@ //鍒ゆ柇鏂版暟缁勬槸鍚︽湁杩欎釜鍏冪礌鍊硷紝娌℃湁鐨勮瘽锛屽氨鎶奱rr[i]缁檖ush鍒版柊鏁扮粍newArr涓� if (this.proParentList.sons[i].proResult == "" || this.proParentList.sons[i].proResult == null) { this.radio = this.lastClickedTab.name - this.$modal.msgError("璇峰~鍐欒祫鏂�"); + this.$modal.msgError("璇锋鏌ラ」鐩槸鍚﹀~鍐欏畬鎴�"); this.minedis = true return } else if (this.proParentList.sons[i].proResult.includes(" ")) { - this.$modal.msgError("璇锋煡鐪嬫槸鍚︽湁绌烘牸"); + this.$modal.msgError("璇锋鏌ュ~鍐欓」鐩腑鏄惁鏈夌┖鏍�"); this.radio = this.lastClickedTab.name this.minedis = true return @@ -1994,7 +2022,7 @@ proId: this.proId, remark: this.proParentList.remark, proName: this.proName, - summaryList: this.value, + summaryList: this.vaids, doctorName: this.doctorName, tjOrderDetailList: this.tjOrderDetail, }]; @@ -2045,14 +2073,14 @@ // rulesList: item.rulesList, // }); }); - for (var i = 0; i < this.proParentList.sons.length; i++) { + for (var i = 0; i < this.proParentList.sons.length; i++) { //鍒ゆ柇鏂版暟缁勬槸鍚︽湁杩欎釜鍏冪礌鍊硷紝娌℃湁鐨勮瘽锛屽氨鎶奱rr[i]缁檖ush鍒版柊鏁扮粍newArr涓� if (this.proParentList.sons[i].proResult == "" || this.proParentList.sons[i].proResult == null) { - this.$modal.msgError("璇峰~鍐欒祫鏂�"); + this.$modal.msgError("璇锋鏌ラ」鐩槸鍚﹀~鍐欏畬鎴�"); this.minedis = true return } else if (this.proParentList.sons[i].proResult.includes(" ")) { - this.$modal.msgError("璇锋煡鐪嬫槸鍚︽湁绌烘牸"); + this.$modal.msgError("璇锋鏌ュ~鍐欓」鐩腑鏄惁鏈夌┖鏍�"); this.minedis = true return } else { @@ -2079,7 +2107,7 @@ proId: this.proId, remark: this.proParentList.remark, proName: this.proName, - summaryList: this.vaids1, + summaryList: this.vaids, doctorName: this.doctorName, tjOrderDetailList: this.tjOrderDetail, }, -- Gitblit v1.8.0