From 3d50e2c6d8cd86ee10b4353ad6365c59f588dbc4 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期三, 31 七月 2024 17:22:02 +0800
Subject: [PATCH] 测试完成
---
src/views/followvisit/tasklist/index.vue | 207 +++++++++++++++++++++++++++++++++++++--------------
1 files changed, 148 insertions(+), 59 deletions(-)
diff --git a/src/views/followvisit/tasklist/index.vue b/src/views/followvisit/tasklist/index.vue
index 71ed556..205806b 100644
--- a/src/views/followvisit/tasklist/index.vue
+++ b/src/views/followvisit/tasklist/index.vue
@@ -12,12 +12,18 @@
label-width="98px"
>
<el-form-item label="浠诲姟鍚嶇О">
- <el-input v-model="topqueryParams.name"></el-input>
+ <el-input
+ v-model="topqueryParams.taskName"
+ @keyup.enter.native="handleQuery"
+ ></el-input>
</el-form-item>
- <el-form-item label="瀹℃牳浜�">
- <el-input v-model="topqueryParams.name"></el-input>
+ <el-form-item label="鍒涘缓浜�">
+ <el-input
+ v-model="topqueryParams.createBy"
+ @keyup.enter.native="handleQuery"
+ ></el-input>
</el-form-item>
- <el-form-item label="瀹℃牳鏃堕棿">
+ <el-form-item label="鍒涘缓鏃堕棿">
<el-date-picker
v-model="dateRange"
style="width: 240px"
@@ -28,32 +34,17 @@
end-placeholder="缁撴潫鏃ユ湡"
></el-date-picker>
</el-form-item>
- <el-form-item label="闅忚绫诲瀷" prop="status">
- <el-select v-model="topqueryParams.topic" placeholder="璇烽�夋嫨">
- <el-option
- v-for="item in topicoptions"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
+
+ <el-form-item label="妯＄増鍚嶇О" prop="status">
+ <el-input
+ v-model="topqueryParams.templatename"
+ @keyup.enter.native="handleQuery"
+ ></el-input>
</el-form-item>
- <el-form-item label="妯＄増" prop="status">
- <el-select v-model="topqueryParams.topic" placeholder="璇烽�夋嫨">
+ <el-form-item label="浠诲姟鐘舵��" prop="status">
+ <el-select v-model="topqueryParams.sendState" placeholder="璇烽�夋嫨">
<el-option
- v-for="item in topicoptions"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="闂ㄨ瘖闅忚鐘舵��" prop="status">
- <el-select v-model="topqueryParams.topic" placeholder="璇烽�夋嫨">
- <el-option
- v-for="item in topicoptions"
+ v-for="item in dict.type.task_status"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -137,7 +128,6 @@
label="浠诲姟鍚嶇О"
fixed
align="center"
- sortable
key="taskName"
prop="taskName"
:show-overflow-tooltip="true"
@@ -280,7 +270,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 +426,7 @@
},
{
value: "6",
- label: "闂嵎鏈嶅姟",
+ label: "鎮ｈ�呮姤鍛�",
},
],
tasktopic: "2", //鏂板绫诲瀷
@@ -627,19 +617,41 @@
/** 鏌ヨ浠诲姟鍒楄〃 */
getList() {
this.loading = true;
- if (this.tasktopic == 1 || this.tasktopic == 2 || this.tasktopic == 3) {
- getTasklist(this.topqueryParams).then((response) => {
+ this.tasktopic = this.$route.query.tasktopic
+ ? this.$route.query.tasktopic
+ : 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,
+ this.tasktopic
+ );
+ getTasklist(this.addDateRange(this.topqueryParams, this.dateRange)).then(
+ (response) => {
this.userList = response.rows;
this.total = response.total;
+ this.$forceUpdate();
this.loading = false;
- });
- } else if (this.tasktopic == 6) {
- Questionnairetasklist(this.topqueryParams).then((res) => {
- this.userList = res.rows;
- this.total = res.total;
- this.loading = false;
- });
- }
+ }
+ );
},
// 鏌ョ湅闂ㄨ瘖闅忚璇︽儏
Referencequestion(row) {
@@ -719,33 +731,55 @@
},
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd() {
- if (this.tasktopic == 1 || this.tasktopic == 2 || this.tasktopic == 3) {
+ const typename = this.findLabelByValue(this.taskoptions, this.tasktopic);
+
+ if (
+ this.tasktopic == 2 ||
+ this.tasktopic == 3 ||
+ this.tasktopic == 4 ||
+ this.tasktopic == 5
+ ) {
this.$router.push({
path: "/followvisit/particty",
- query: { type: this.tasktopic },
+ query: { type: 1, typename: typename },
});
} else if (this.tasktopic == 6) {
this.$router.push({
path: "/followvisit/QuestionnaireTask",
- query: { type: this.tasktopic },
+ 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: row.hospType, 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: row.hospType, id: row.taskid },
+ query: { type: 1, id: row.taskid },
});
} else if (this.tasktopic == 6) {
this.$router.push({
path: "/followvisit/QuestionnaireTask",
- query: { type: row.hospType, 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 },
});
}
},
@@ -755,26 +789,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("浠诲姟宸插彂璧凤紝涓嶅彲鍐嶆鍙戣捣");
}
@@ -786,10 +840,12 @@
TaskTemplateSendExecution(this.TaskOperation).then((res) => {
if (res.code == 200) {
this.$modal.msgSuccess("浠诲姟宸叉垚鍔熷姞鍏ユ墽琛岄槦鍒�");
+ this.taskformVisible = false;
this.getList();
}
});
},
+
// 绔嬪嵆鎵ц
immediateExecution(row) {
console.log(row, "浠诲姟淇℃伅");
@@ -818,14 +874,43 @@
// 渚濈収鏂板
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;
- TaskTemplateSendExecution().then((res) => {
+ this.TaskOperation.sendType = "";
+ this.TaskOperation.taskType = row.type;
+ TaskTemplateSendExecution(this.TaskOperation).then((res) => {
+ this.$modal.msgSuccess("浠诲姟宸叉殏鍋�");
this.getList();
});
}
@@ -875,6 +960,10 @@
`user_${new Date().getTime()}.xlsx`
);
},
+ findLabelByValue(data, value) {
+ const item = data.find((item) => item.value === value);
+ return item ? item.label : null;
+ },
},
};
</script>
--
Gitblit v1.9.3