From 628fd01beea81bac2f0299472d528860ae07cf3f Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期日, 02 六月 2024 10:52:30 +0800
Subject: [PATCH] 测试完成
---
src/views/patient/propaganda/particty.vue | 147 ++++++++++++++++++++++++++++++++----------------
1 files changed, 97 insertions(+), 50 deletions(-)
diff --git a/src/views/patient/propaganda/particty.vue b/src/views/patient/propaganda/particty.vue
index 82d4805..8f06dbc 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
@@ -342,7 +342,7 @@
</div>
</div>
<el-button type="success" @click="nextstep('ruleForm')">{{
- quote ? "绔嬪嵆鍒涘缓" : "浠诲姟璇︽儏璁剧疆"
+ quote ? "绔嬪嵆鍒涘缓" : "浠诲姟璇︽儏閰嶇疆"
}}</el-button>
<el-button @click="resetForm('ruleForm')">閲嶇疆</el-button>
</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"
/>
@@ -551,9 +551,9 @@
</div>
</div>
<el-button type="primary" @click="laststep()">涓婁竴姝�</el-button>
- <el-button type="success" @click="submitForm('ruleForm')"
- >绔嬪嵆鍒涘缓</el-button
- >
+ <el-button type="success" @click="submitForm('ruleForm')">{{
+ quote ? "绔嬪嵆鍒涘缓" : "纭浠诲姟閰嶇疆"
+ }}</el-button>
<el-button @click="resetForm('ruleForm')">閲嶇疆</el-button>
</div>
</div>
@@ -563,6 +563,7 @@
:visible.sync="dialogVisiblepatient"
width="70%"
:before-close="handleClosehz"
+ :close-on-click-modal="false"
>
<div class="examine-jic">
<div class="jic-value">
@@ -619,6 +620,7 @@
</el-form>
<!-- 閫夋嫨鎮ｈ�呭垪琛� -->
<SFtable
+ ref="multipleTable"
@handleUpdate="handleUpdate"
@handleSelectionChange="handleSelectionChange"
:currentList="patientuserList"
@@ -712,6 +714,8 @@
id: "", //
previewid: "", //浠诲姟妯＄増浼犻�抜d
libName: "",
+ overallCase: [], //閫夋嫨鎮ｈ�呮��
+ allpids: [],
libId: null, //妯℃澘搴撴ā鐗坕d
Editprogress: 1, //缂栬緫杩涘害
previewtf: false, //棰勮
@@ -722,7 +726,6 @@
checkboxlist: [],
tableLabel: [],
questionList: [],
-
// 鎮ｈ�呰〃鍗�
tableLabelhz: [
{ label: "搴忓彿", width: "", prop: "patid" },
@@ -990,14 +993,14 @@
);
console.log(filteredArray, "瀛樺墠鍙橀噺");
this.form.textParam = this.convertFormat2ToFormat1(filteredArray);
- if (this.form.id) {
+ if (this.form.taskid) {
this.form.isoperation = 2;
} else {
this.form.isoperation = 1;
}
Editsingletask(this.form).then((res) => {
if (res.code == 200) {
- if (this.form.id) {
+ if (this.form.taskid) {
this.$modal.msgSuccess("鏂板鎴愬姛");
} else {
this.$modal.msgSuccess("淇敼鎴愬姛");
@@ -1070,32 +1073,89 @@
},
// 瀛愪换鍔′簩绾у脊妗�
handleAddpatient(row) {
+ console.log(this.overallCase, "ssaaa");
+ this.allpids = [];
+ this.overallCase.forEach((item) => {
+ this.allpids.push(item.patid);
+ });
+ if (this.allpids[0]) {
+ this.patientqueryParams.pids = this.allpids;
+ console.log(this.patientqueryParams.pids);
+ } else {
+ this.patientqueryParams.pids = null;
+ }
+
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() {},
- // 澶氶�夋閫変腑鏁版嵁
+ // 閫変腑鎮ｈ�呰〃
+ handlePitchionChange() {},
+ // 閫夋嫨鎮ｈ�呰〃鏁版嵁
handleSelectionChange(selection) {
console.log("澶氶�夋偅鑰�");
this.SelectPatientslist = selection;
- this.ids = null;
- 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();
+ }
},
// 鍒犻櫎閫変腑鎮ｈ��
- detailhz(row, info) {},
- getList() {
-
+ detailhz(row, info) {
+ this.$modal
+ .confirm('鏄惁纭鍒犻櫎鎮ｈ��"' + 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();
},
@@ -1123,14 +1183,15 @@
let filteredArray = "";
if (res.code == 200) {
this.form = res.data;
+ this.overallCase = this.form.patTaskRelevances.concat();
this.checkList = this.form.serviceform.split(",");
- this.daytime = this.form.sendlimitabegin.split(",");
- if (this.form.sendlimitaend)
- this.time1 = this.form.sendlimitaend.split(",");
- if (this.form.sendlimitnbegin)
- this.time2 = this.form.sendlimitaend.split(",");
- if (this.form.sendlimitnend)
- this.time3 = this.form.sendlimitaend.split(",");
+ this.daytime = this.form.showDate.split(",");
+ if (this.form.showTimeMorn)
+ this.time1 = this.form.showTimeMorn.split(",");
+ if (this.form.showTimeNoon)
+ this.time2 = this.form.showTimeNoon.split(",");
+ if (this.form.showTimeNight)
+ this.time3 = this.form.showTimeNight.split(",");
filteredArray = this.convertFormat1ToFormat2(this.form.textParam);
console.log(filteredArray, "filteredArray");
this.variableList = this.transitionList.concat(filteredArray);
@@ -1149,28 +1210,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() {
- // 鑾峰彇鎮ｈ�呭垪琛ㄤ俊鎭惊鐜�
- 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;
@@ -1237,10 +1284,10 @@
this.form.sendTimeslot = combinedData;
// 灞曠ず鏁版嵁涓存椂瀛樺偍鏃ユ湡銆佹棭銆佷腑銆佹櫄
- this.form.sendlimitabegin = this.daytime.join(",");
- if (this.time1) this.form.sendlimitaend = this.time1.join(",");
- if (this.time2) this.form.sendlimitnbegin = this.time2.join(",");
- if (this.time3) this.form.sendlimitnend = this.time3.join(",");
+ this.form.showDate = this.daytime.join(",");
+ if (this.time1) this.form.showTimeMorn = this.time1.join(",");
+ if (this.time2) this.form.showTimeNoon = this.time2.join(",");
+ if (this.time3) this.form.showTimeNight = this.time3.join(",");
console.log(combinedData, "combinedData");
},
// 鏌ョ湅妯＄増
--
Gitblit v1.9.3