From b14bdee1aaf639dd14440b42c6a0ce2e12549ee7 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期五, 26 七月 2024 10:38:09 +0800
Subject: [PATCH] 测试完成
---
src/views/followvisit/tasklist/index.vue | 113 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 88 insertions(+), 25 deletions(-)
diff --git a/src/views/followvisit/tasklist/index.vue b/src/views/followvisit/tasklist/index.vue
index d94fc62..28b2664 100644
--- a/src/views/followvisit/tasklist/index.vue
+++ b/src/views/followvisit/tasklist/index.vue
@@ -280,7 +280,7 @@
</div>
<div
style="font-size: 18px; margin-bottom: 20px"
- v-if="taskform.showDate[0]"
+ v-if="taskform.showDate"
>
鎵ц鏃ユ湡锛�<span
style="font-size: 18px; color: #2376b7; margin-bottom: 20px"
@@ -436,7 +436,7 @@
},
{
value: "6",
- label: "闂嵎鏈嶅姟",
+ label: "鎮ｈ�呮姤鍛�",
},
],
tasktopic: "2", //鏂板绫诲瀷
@@ -632,16 +632,23 @@
: this.tasktopic;
if (this.tasktopic == 1) {
this.topqueryParams.type = 3;
+ this.TaskOperation.taskType = 3;
} else if (this.tasktopic == 2) {
this.topqueryParams.type = 1;
+ this.TaskOperation.taskType = 1;
} else if (this.tasktopic == 3) {
this.topqueryParams.type = 1;
+ this.TaskOperation.taskType = 1;
} else if (this.tasktopic == 4) {
this.topqueryParams.type = 1;
+ this.TaskOperation.taskType = 1;
} else if (this.tasktopic == 5) {
this.topqueryParams.type = 1;
+
+ this.TaskOperation.taskType = 1;
} else if (this.tasktopic == 6) {
this.topqueryParams.type = 2;
+ this.TaskOperation.taskType = 2;
}
this.topqueryParams.typename = this.findLabelByValue(
this.taskoptions,
@@ -650,6 +657,7 @@
getTasklist(this.topqueryParams).then((response) => {
this.userList = response.rows;
this.total = response.total;
+ this.$forceUpdate();
this.loading = false;
});
},
@@ -748,23 +756,38 @@
path: "/followvisit/QuestionnaireTask",
query: { type: 2, typename: typename },
});
+ } else if (this.tasktopic == 1) {
+ this.$router.push({
+ path: "/followvisit/Missioncreation",
+ query: { type: 3, typename: typename },
+ });
}
},
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
- this.$router.push({
- path: "/followvisit/particty",
- query: { type: this.tasktopic, id: row.taskid },
- });
- if (this.tasktopic == 1 || this.tasktopic == 2 || this.tasktopic == 3) {
+ // this.$router.push({
+ // path: "/followvisit/particty",
+ // query: { type: this.tasktopic, id: row.taskid },
+ // });
+ if (
+ this.tasktopic == 2 ||
+ this.tasktopic == 3 ||
+ this.tasktopic == 4 ||
+ this.tasktopic == 5
+ ) {
this.$router.push({
path: "/followvisit/particty",
- query: { type: this.tasktopic, id: row.taskid },
+ query: { type: 1, id: row.taskid },
});
} else if (this.tasktopic == 6) {
this.$router.push({
path: "/followvisit/QuestionnaireTask",
- query: { type: this.tasktopic, id: row.taskid },
+ query: { type: 2, id: row.taskid },
+ });
+ } else if (this.tasktopic == 1) {
+ this.$router.push({
+ path: "/followvisit/Missioncreation",
+ query: { type: 3, id: row.taskid },
});
}
},
@@ -774,26 +797,46 @@
sponsor(row) {
console.log(row, "浠诲姟淇℃伅");
this.taskform = row;
- if (this.taskform.showDate) {
+ console.log(12);
+ if (this.taskform.showDate && this.taskform.sendType != 2) {
this.taskform.showDate = this.taskform.showDate.split(",");
}
- if (this.taskform.showTimeMorn) {
+ if (this.taskform.showTimeMorn && this.taskform.sendType != 2) {
this.taskform.showTimeMorn = this.taskform.showTimeMorn.split(",");
} else {
this.taskform.showTimeMorn = [];
}
- if (this.taskform.showTimeNight) {
+ if (this.taskform.showTimeNight && this.taskform.sendType != 2) {
this.taskform.showTimeNight = this.taskform.showTimeNight.split(",");
} else {
this.taskform.showTimeNight = [];
}
- if (this.taskform.showTimeNoon) {
+ if (this.taskform.showTimeNoon && this.taskform.sendType != 2) {
this.taskform.showTimeNoon = this.taskform.showTimeNoon.split(",");
} else {
this.taskform.showTimeNoon = [];
}
- if (row.sendState != 2) {
+ if (this.taskform.sendState != 2 && this.taskform.sendType != 2) {
this.taskformVisible = true;
+ } else if (this.taskform.sendState != 2 && this.taskform.sendType == 2) {
+ this.TaskOperation.taskId = row.taskid;
+ this.TaskOperation.sendState = 2;
+ this.TaskOperation.sendType = 2;
+ this.$modal
+ .confirm(
+ '褰撳墠閫変腑浠诲姟鍚嶇О涓�"' +
+ row.taskName +
+ '"鐨勬暟鎹」涓虹珛鍗虫墽琛屼换鍔★紝鍙戣捣鎵ц鍚庝笉鍙挙鍥烇紒鏄惁缁х画'
+ )
+ .then(() => {
+ TaskTemplateSendExecution(this.TaskOperation).then((res) => {
+ if (res.code == 200) {
+ this.getList();
+ this.$modal.msgSuccess("浠诲姟宸茬珛鍗虫墽琛�");
+ }
+ });
+ })
+ .catch(() => {});
} else {
this.$modal.msgError("浠诲姟宸插彂璧凤紝涓嶅彲鍐嶆鍙戣捣");
}
@@ -802,7 +845,6 @@
confirmSponsor(row) {
this.TaskOperation.taskId = row.taskid;
this.TaskOperation.sendState = 2;
- this.taskType();
TaskTemplateSendExecution(this.TaskOperation).then((res) => {
if (res.code == 200) {
this.$modal.msgSuccess("浠诲姟宸叉垚鍔熷姞鍏ユ墽琛岄槦鍒�");
@@ -811,14 +853,7 @@
}
});
},
- // 鍒ゆ柇绫诲瀷
- taskType(row) {
- if (this.tasktopic == 2 || this.tasktopic == 3) {
- this.TaskOperation.taskType = 1;
- } else if (this.tasktopic == 6) {
- this.TaskOperation.taskType = 2;
- }
- },
+
// 绔嬪嵆鎵ц
immediateExecution(row) {
console.log(row, "浠诲姟淇℃伅");
@@ -847,13 +882,41 @@
// 渚濈収鏂板
newAdd(row) {
- TaskTemplateSendExecution().then((res) => {});
+ this.$modal
+ .confirm("鏄惁渚濈収褰撳墠浠诲姟鍒涘缓鏂颁换鍔★紵")
+ .then(() => {
+ if (
+ this.tasktopic == 2 ||
+ this.tasktopic == 3 ||
+ this.tasktopic == 4 ||
+ this.tasktopic == 5
+ ) {
+ this.$router.push({
+ path: "/followvisit/particty",
+ query: { type: 1, id: row.taskid, nhh: 1 },
+ });
+ } else if (this.tasktopic == 6) {
+ this.$router.push({
+ path: "/followvisit/QuestionnaireTask",
+ query: { type: 2, id: row.taskid, nhh: 1 },
+ });
+ } else if (this.tasktopic == 1) {
+ this.$router.push({
+ path: "/followvisit/Missioncreation",
+ query: { type: 3, id: row.taskid, nhh: 1 },
+ });
+ }
+ })
+ .catch(() => {});
},
// 鏆傚仠
stop(row) {
+ console.log(row);
if (row.sendState == 2) {
- this.TaskOperation.taskId = row.taskId;
+ this.TaskOperation.taskId = row.taskid;
this.TaskOperation.sendState = 3;
+ this.TaskOperation.sendType = "";
+ this.TaskOperation.taskType = row.type;
TaskTemplateSendExecution(this.TaskOperation).then((res) => {
this.$modal.msgSuccess("浠诲姟宸叉殏鍋�");
this.getList();
--
Gitblit v1.9.3