From e6af7e6f95fb49115bf593daff0bee48648f99cf Mon Sep 17 00:00:00 2001 From: WXL <1785969728@qq.com> Date: 星期五, 31 五月 2024 14:46:55 +0800 Subject: [PATCH] 测试完成 --- src/views/patient/propaganda/particty.vue | 113 ++++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 76 insertions(+), 37 deletions(-) diff --git a/src/views/patient/propaganda/particty.vue b/src/views/patient/propaganda/particty.vue index 54a2be1..5e0a46a 100644 --- a/src/views/patient/propaganda/particty.vue +++ b/src/views/patient/propaganda/particty.vue @@ -88,7 +88,7 @@ <div style="display: flex"> <div style="margin-right: 10px"> <span style="font-size: 18px; margin-right: 10px" - >涓婂崍</span + >鏃堕棿娈典竴</span > <el-time-picker is-range @@ -105,7 +105,7 @@ </div> <div style="margin-right: 10px"> <span style="font-size: 18px; margin-right: 10px" - >涓嬪崍</span + >鏃堕棿娈典簩</span > <el-time-picker is-range @@ -122,7 +122,7 @@ </div> <div style="margin-right: 10px"> <span style="font-size: 18px; margin-right: 10px" - >鏅氶棿</span + >鏃堕棿娈典笁</span > <el-time-picker is-range @@ -334,7 +334,7 @@ :total="total" :page.sync="topqueryParams.pageNum" :limit.sync="topqueryParams.pageSize" - @pagination="getList" + @pagination="Acquisitiontype" /> </el-row> </div> @@ -531,10 +531,10 @@ <SFtable @details="detailhz" @handleUpdate="handleUpdate" - @handleSelectionChange="handleSelectionChange" - :currentList="form.patTaskRelevances" + :currentList="overallCase" :tableLabel="tableLabelhz" :serialnumber="false" + :multiplechoice="false" :controlxz="false" :typeinfo="2" /> @@ -619,6 +619,7 @@ </el-form> <!-- 閫夋嫨鎮h�呭垪琛� --> <SFtable + ref="multipleTable" @handleUpdate="handleUpdate" @handleSelectionChange="handleSelectionChange" :currentList="patientuserList" @@ -709,10 +710,12 @@ return { title: "瀹f暀鍐呭鍒楄〃", currenttype: 1, //1瀹f暀2闂ㄨ瘖3鍑洪櫌4澶嶈瘖5浣撴6闂嵎 - id: "", - previewid: "", + id: "", // + previewid: "", //浠诲姟妯$増浼犻�抜d libName: "", - libId: null, + overallCase: [], //閫夋嫨鎮h�呮�� + allpids: [], + libId: null, //妯℃澘搴撴ā鐗坕d Editprogress: 1, //缂栬緫杩涘害 previewtf: false, //棰勮 loading: false, // 閬僵灞� @@ -722,7 +725,6 @@ checkboxlist: [], tableLabel: [], questionList: [], - // 鎮h�呰〃鍗� tableLabelhz: [ { label: "搴忓彿", width: "", prop: "patid" }, @@ -922,8 +924,8 @@ // 鑾峰彇褰撳墠绫诲瀷 Acquisitiontype() { let queryParams = { - pageNum: 1, - pageSize: 10, + pageNum: this.topqueryParams.pageNum, + pageSize: this.topqueryParams.pageSize, isavailable: "", }; this.currenttype = this.$route.query.type; @@ -1007,7 +1009,7 @@ }); }, // ----------------------琛ㄦ牸瀛愮粍浠朵簨浠� - // 閫夋嫨妯$増 + // 纭閫夋嫨妯$増鏀惧叆浠诲姟妯$増 selectfn(row, type) { // 妯$増鎯呭喌涓嬭幏鍙栨ā鐗堜俊鎭� if (type == 1) { @@ -1070,18 +1072,22 @@ }, // 瀛愪换鍔′簩绾у脊妗� handleAddpatient(row) { + console.log(this.overallCase, "ssaaa"); getTaskpatient(this.patientqueryParams).then((response) => { console.log(response); this.patientuserList = response.rows; this.patienttotal = response.total; this.loading = false; + this.Restorecheck(); }); this.dialogVisiblepatient = true; }, handleUpdate() {}, handleDelete() {}, handleExport() {}, - // 澶氶�夋閫変腑鏁版嵁 + // 閫変腑鎮h�呰〃 + handlePitchionChange() {}, + // 閫夋嫨鎮h�呰〃鏁版嵁 handleSelectionChange(selection) { console.log("澶氶�夋偅鑰�"); this.SelectPatientslist = selection; @@ -1089,10 +1095,57 @@ this.ids = selection.map((item) => item.patid).join(","); // let result = this.ids.join(","); this.multiple = !selection.length; - console.log(this.ids); + + // 璧嬪�肩粰鏁翠綋閫変腑鏁扮粍 + this.SelectPatientslist.forEach((item) => { + const isExist = this.overallCase.find((obj) => obj.name == item.name); + if (!isExist) { + item.isoperation = 1; + this.overallCase.push(item); + this.form.patTaskRelevances.push(item); + } + }); + }, + // 鍒囨崲椤靛悗鎭㈠閫変腑 + Restorecheck() { + console.log(this.overallCase, "this.overallCase"); + const allid = this.overallCase.map((item) => item.patid); + const overlap = this.patientuserList.filter((value) => { + return allid.includes(value.patid); + }); + // 淇濇寔ids鍜屽綋鍓嶉〉闈㈢殑鍚屾鎬� + this.SelectPatientslist = overlap; + console.log(this.SelectPatientslist, "杩涘叆鍒嗛〉SelectPatientslist"); + + this.toggleSelection(overlap); + }, + // 鎸傝浇閫夋嫨鐘舵�� + toggleSelection(rows) { + if (rows) { + this.decision = true; + this.$nextTick(() => { + rows.forEach((row) => { + this.$refs.multipleTable.toggleRowSelection(row, true); + }); + this.decision = false; + }); + console.log(123); + } else { + this.$refs.multipleTable.clearSelection(); + } }, // 鍒犻櫎閫変腑鎮h�� - detailhz(row, info) {}, + detailhz(row, info) { + this.$modal + .confirm('鏄惁纭鍒犻櫎鎮h��"' + row.name + '"鐨勬湇鍔¢」锛�') + .then(() => { + let indexa = this.overallCase.indexOf(row); + let indexb = this.form.patTaskRelevances.indexOf(row); + this.overallCase.splice(indexa, 1); + this.form.patTaskRelevances[indexb].isoperation = 3; + this.$modal.msgSuccess("鍒犻櫎鎴愬姛"); + }); + }, getList() {}, handleQuery() { this.handleAddpatient(); @@ -1121,6 +1174,7 @@ let filteredArray = ""; if (res.code == 200) { this.form = res.data; + this.overallCase = this.form.patTaskRelevances; this.checkList = this.form.serviceform.split(","); this.daytime = this.form.sendlimitabegin.split(","); if (this.form.sendlimitaend) @@ -1135,7 +1189,6 @@ } else { this.$modal.msgError(res.code); } - console.log(res); }); } }, @@ -1148,28 +1201,14 @@ }, // 鏂板娲鹃�佹偅鑰� AddDispatchpatients() { - this.SelectPatientslist.forEach((item) => { - item.isoperation = 1; - }); - this.form.patTaskRelevances.push(...this.SelectPatientslist); + // this.SelectPatientslist.forEach((item) => { + // item.isoperation = 1; + // }); + // this.form.patTaskRelevances.push(...this.SelectPatientslist); + // this.overallCase.push(...this.SelectPatientslist); this.dialogVisiblepatient = false; - this.assignedVariable(); - }, - // 鍙橀噺澶勭悊璧嬪�兼湇鍔� - assignedVariable() { - // 鑾峰彇鎮h�呭垪琛ㄤ俊鎭惊鐜� - console.log(this.variableList, "this.variableList"); - this.form.patTaskRelevances.forEach((item) => { - this.variableList.forEach((item1) => {}); - }); - // 鍙栨暟鎹~鍏呭彉閲忔暟缁� - // 鏁扮粍杞璞″瓨鍏� }, - // 鍙橀噺--------------- - // variableEdit(index, row) { - // console.log(index, row); - // }, variableDelete(index, row) { this.variableList.splice(index, 1); row.isoperation = 3; @@ -1267,7 +1306,7 @@ this.form.templateid = response.data; this.form.libtemplateid = this.libId; this.form.templatename = this.libName; - this.$modal.msgSuccess("閫夋嫨鎴愬姛"); + this.$modal.msgSuccess("閫夋嫨妯$増鎴愬姛"); }); }, }, -- Gitblit v1.9.3