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 | 53 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 32 insertions(+), 21 deletions(-)
diff --git a/src/views/patient/propaganda/particty.vue b/src/views/patient/propaganda/particty.vue
index 4bdbae5..8f06dbc 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, //棰勮
@@ -991,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("淇敼鎴愬姛");
@@ -1071,6 +1073,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 +1103,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 +1183,15 @@
let filteredArray = "";
if (res.code == 200) {
this.form = res.data;
- this.overallCase = this.form.patTaskRelevances;
+ 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);
@@ -1273,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