From 711c995d7307b4a2d56e55095e3f81ffbdfc4d39 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期三, 05 六月 2024 11:08:10 +0800
Subject: [PATCH] 测试完成
---
src/views/patient/propaganda/particty.vue | 106 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 77 insertions(+), 29 deletions(-)
diff --git a/src/views/patient/propaganda/particty.vue b/src/views/patient/propaganda/particty.vue
index 4bdbae5..4e89da8 100644
--- a/src/views/patient/propaganda/particty.vue
+++ b/src/views/patient/propaganda/particty.vue
@@ -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>
@@ -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">
@@ -714,6 +715,7 @@
previewid: "", //浠诲姟妯＄増浼犻�抜d
libName: "",
overallCase: [], //閫夋嫨鎮ｈ�呮��
+ allpids: [],
libId: null, //妯℃澘搴撴ā鐗坕d
Editprogress: 1, //缂栬緫杩涘害
previewtf: false, //棰勮
@@ -777,6 +779,17 @@
{ label: "鍙橀噺鍚嶇О", width: "", prop: "variablename" },
{ label: "鍖归厤绗�", width: "", prop: "character" },
{ label: "鏇挎崲鍊�", width: "", prop: "Replacementvalue" },
+ ],
+ Serviceform: [
+ { label: "澶氬獟浣�", value: 1 },
+ { label: "绾歌川", value: 2 },
+ { label: "鐢佃瘽", value: 3 },
+ { label: "鐭俊", value: 4 },
+ { label: "寰俊鍏紬鍙�", value: 5 },
+ { label: "寰俊灏忕▼搴�", value: 6 },
+ { label: "鏀粯瀹�", value: 7 },
+ { label: "鏅鸿兘灏忕▼搴�", value: 8 },
+ { label: "閽夐拤", value: 9 },
],
// 鏃堕棿澶勭悊
daytime: [], //鏃ユ湡
@@ -857,7 +870,6 @@
tasktopic: null, //鏂板绫诲瀷
SelectPatientslist: [],
form: {
- serviceform: [],
patTaskRelevances: [],
sendType: 1,
templatename: "",
@@ -933,10 +945,7 @@
// 鍖绘妧瀹ｆ暀锛屾櫘閫氬鏁�
this.title = "瀹ｆ暀鍐呭鍒楄〃";
this.tableLabel = this.tableLabelxj;
- this.checkboxlist = [
- "绾夸笅锛堝彛澶村鏁欍�佺數瑙嗗鏁欍�佺焊璐級",
- "绾夸笂锛堢煭淇�/閽夐拤鐨勬枃鏈�佸浘鏂囬摼鎺ワ級",
- ];
+ this.checkboxlist = ["澶氬獟浣�", "绾歌川"];
getlibrarylist(queryParams).then((response) => {
this.userList = response.rows;
this.total = response.total;
@@ -949,7 +958,7 @@
// 鍑洪櫌銆侀棬璇娿�佷笓鐥呴殢璁�
this.title = "闅忚鍐呭鍒楄〃";
this.tableLabel = this.tableLabelmz;
- this.checkboxlist = ["绾夸笅", "AI璇煶澶栧懠", "浜哄伐鐢佃瘽"];
+ this.checkboxlist = ["绾歌川", "澶氬獟浣�", "鐢佃瘽", "寰俊鍏紬鍙�"];
getFollowuplist(queryParams).then((response) => {
this.userList = response.rows;
this.total = response.total;
@@ -983,7 +992,8 @@
},
// 淇濆瓨
submitForm(formName) {
- this.form.serviceform = this.checkList.join(",");
+ // this.form.serviceform = this.checkList.join(",");
+ this.formatFn(1);
this.form.hospType = this.currenttype;
const filteredArray = this.variableList.filter(
(item) =>
@@ -991,14 +1001,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("淇敼鎴愬姛");
@@ -1071,6 +1081,18 @@
},
// 瀛愪换鍔′簩绾у脊妗�
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;
@@ -1089,9 +1111,6 @@
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;
// 璧嬪�肩粰鏁翠綋閫変腑鏁扮粍
@@ -1172,15 +1191,17 @@
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)
- 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.overallCase = this.form.patTaskRelevances.concat();
+ // this.checkList = this.form.serviceform.split(",");
+ this.formatFn(2);
+ 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(",");
+ console.log(1122);
filteredArray = this.convertFormat1ToFormat2(this.form.textParam);
console.log(filteredArray, "filteredArray");
this.variableList = this.transitionList.concat(filteredArray);
@@ -1273,10 +1294,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");
},
// 鏌ョ湅妯＄増
@@ -1307,6 +1328,33 @@
this.$modal.msgSuccess("閫夋嫨妯＄増鎴愬姛");
});
},
+ // 澶勭悊鏈嶅姟褰㈠紡
+ formatFn(type) {
+ console.log(this.Serviceform);
+ console.log(this.checkList);
+ let list = [];
+ let formlist = [];
+ if (type == 1) {
+ this.Serviceform.forEach((item) => {
+ this.checkList.forEach((obj) => {
+ if (item.label == obj) {
+ list.push(item.value);
+ }
+ });
+ });
+ this.form.preachform = list.join(",");
+ } else {
+ formlist = this.form.preachform.split(",");
+ this.Serviceform.forEach((item) => {
+ formlist.forEach((obj) => {
+ if (item.value == obj) {
+ list.push(item.label);
+ }
+ });
+ });
+ this.checkList = list;
+ }
+ },
},
};
</script>
--
Gitblit v1.9.3