From fe7f65e63714807890ab103fbc84cf5f634ae8d8 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期五, 09 八月 2024 11:33:25 +0800
Subject: [PATCH] 测试完成
---
src/views/followvisit/tasklist/index.vue | 205 ++++++++++++++++++++++++++-------------------------
1 files changed, 105 insertions(+), 100 deletions(-)
diff --git a/src/views/followvisit/tasklist/index.vue b/src/views/followvisit/tasklist/index.vue
index 1945b3c..d1a480b 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"
@@ -125,19 +116,18 @@
:columns="columns"
></right-toolbar> -->
<el-table v-loading="loading" :data="userList">
- <el-table-column
+ <!-- <el-table-column
label="搴忓彿"
fixed
align="center"
key="taskid"
prop="taskid"
- />
+ /> -->
<el-table-column
label="浠诲姟鍚嶇О"
fixed
align="center"
- sortable
key="taskName"
prop="taskName"
:show-overflow-tooltip="true"
@@ -147,6 +137,12 @@
align="center"
key="taskDesc"
prop="taskDesc"
+ />
+ <el-table-column
+ label="鏈嶅姟椤圭洰"
+ align="center"
+ key="templatename"
+ prop="templatename"
/>
<el-table-column
label="寰呮墽琛�/鎬讳换鍔�"
@@ -209,18 +205,10 @@
><i class="el-icon-s-promotion"></i>浠诲姟鍙戣捣</span
></el-button
>
- <el-button
- v-if="scope.row.sendState == 1 || scope.row.sendState == 3"
- size="medium"
- type="text"
- @click="immediateExecution(scope.row)"
- ><span class="button-lj"
- ><i class="el-icon-s-promotion"></i>绔嬪嵆鎵ц</span
- ></el-button
- >
+
<el-button size="medium" type="text" @click="newAdd(scope.row)"
><span class="button-xj"
- ><i class="el-icon-circle-plus-outline"></i>渚濈収鏂板</span
+ ><i class="el-icon-circle-plus-outline"></i>浠诲姟缁堟</span
></el-button
>
<el-button
@@ -275,49 +263,59 @@
width="50%"
:before-close="handleClose"
>
- <div style="font-size: 20px; color: red; margin-bottom: 20px">
- 璇风‘璁や换鍔�"{{ taskform.taskName }}"鐨勬墽琛屾椂闂�
- </div>
- <div
- style="font-size: 18px; margin-bottom: 20px"
- v-if="taskform.showDate"
- >
- 鎵ц鏃ユ湡锛�<span
- style="font-size: 18px; color: #2376b7; margin-bottom: 20px"
- >{{ taskform.showDate[0] }} 鑷� {{ taskform.showDate[1] }}</span
- >
- </div>
- <div
- style="font-size: 18px; margin-bottom: 20px"
- v-if="taskform.showTimeMorn[0]"
- >
- 绗竴鏃堕棿娈碉細<span
- style="font-size: 18px; color: #2376b7; margin-bottom: 20px"
- >{{ taskform.showTimeMorn[0] }} 鑷�
- {{ taskform.showTimeMorn[1] }}</span
- >
- </div>
- <div
- style="font-size: 18px; margin-bottom: 20px"
- v-if="taskform.showTimeNight[0]"
- >
- 绗簩鏃堕棿娈碉細<span
- style="font-size: 18px; color: #2376b7; margin-bottom: 20px"
- >{{ taskform.showTimeNight[0] }} 鑷�
- {{ taskform.showTimeNight[1] }}</span
- >
- </div>
- <div
- style="font-size: 18px; margin-bottom: 20px"
- v-if="taskform.showTimeNoon[0]"
- >
- 绗笁鏃堕棿娈碉細<span
- style="font-size: 18px; color: #2376b7; margin-bottom: 20px"
- >{{ taskform.showTimeNoon[0] }} 鑷�
- {{ taskform.showTimeNoon[1] }}</span
- >
- </div>
- <div style="text-align: right">
+ <el-tabs type="border-card" v-model="activname">
+ <el-tab-pane>
+ <span slot="label"><i class="el-icon-date"></i> 姝ｅ父鍙戣捣</span>
+ <div style="font-size: 20px; color: red; margin-bottom: 20px">
+ 璇风‘璁や换鍔�"{{ taskform.taskName }}"鐨勬墽琛屾椂闂�
+ </div>
+ <div
+ style="font-size: 18px; margin-bottom: 20px"
+ v-if="taskform.showDate"
+ >
+ 鎵ц鏃ユ湡锛�<span
+ style="font-size: 18px; color: #2376b7; margin-bottom: 20px"
+ >{{ taskform.showDate[0] }} 鑷� {{ taskform.showDate[1] }}</span
+ >
+ </div>
+ <div
+ style="font-size: 18px; margin-bottom: 20px"
+ v-if="taskform.showTimeMorn[0]"
+ >
+ 绗竴鏃堕棿娈碉細<span
+ style="font-size: 18px; color: #2376b7; margin-bottom: 20px"
+ >{{ taskform.showTimeMorn[0] }} 鑷�
+ {{ taskform.showTimeMorn[1] }}</span
+ >
+ </div>
+ <div
+ style="font-size: 18px; margin-bottom: 20px"
+ v-if="taskform.showTimeNight[0]"
+ >
+ 绗簩鏃堕棿娈碉細<span
+ style="font-size: 18px; color: #2376b7; margin-bottom: 20px"
+ >{{ taskform.showTimeNight[0] }} 鑷�
+ {{ taskform.showTimeNight[1] }}</span
+ >
+ </div>
+ <div
+ style="font-size: 18px; margin-bottom: 20px"
+ v-if="taskform.showTimeNoon[0]"
+ >
+ 绗笁鏃堕棿娈碉細<span
+ style="font-size: 18px; color: #2376b7; margin-bottom: 20px"
+ >{{ taskform.showTimeNoon[0] }} 鑷�
+ {{ taskform.showTimeNoon[1] }}</span
+ >
+ </div>
+ </el-tab-pane>
+ <el-tab-pane label="绔嬪嵆鎵ц">
+ <div style="font-size: 20px; color: red; margin-bottom: 20px">
+ 姝ゆ搷浣滃皢绔嬪嵆鍙戣捣骞舵墽琛屼换鍔�:{{ taskform.taskName }}锛岃璋ㄦ厧鎿嶄綔锛�
+ </div>
+ </el-tab-pane>
+ </el-tabs>
+ <div style="text-align: right; margin: 20px 0">
<el-button style="margin-right: 20px" @click="taskformVisible = false"
>鍙� 娑�</el-button
>
@@ -436,10 +434,11 @@
},
{
value: "6",
- label: "闂嵎鏈嶅姟",
+ label: "鎮ｈ�呮姤鍛�",
},
],
tasktopic: "2", //鏂板绫诲瀷
+ activname: "",
value: [],
list: [],
loading: false,
@@ -654,12 +653,14 @@
this.taskoptions,
this.tasktopic
);
- getTasklist(this.topqueryParams).then((response) => {
- this.userList = response.rows;
- this.total = response.total;
- this.$forceUpdate();
- this.loading = false;
- });
+ getTasklist(this.addDateRange(this.topqueryParams, this.dateRange)).then(
+ (response) => {
+ this.userList = response.rows;
+ this.total = response.total;
+ this.$forceUpdate();
+ this.loading = false;
+ }
+ );
},
// 鏌ョ湅闂ㄨ瘖闅忚璇︽儏
Referencequestion(row) {
@@ -843,15 +844,19 @@
},
// 纭鍙戣捣
confirmSponsor(row) {
- this.TaskOperation.taskId = row.taskid;
- this.TaskOperation.sendState = 2;
- TaskTemplateSendExecution(this.TaskOperation).then((res) => {
- if (res.code == 200) {
- this.$modal.msgSuccess("浠诲姟宸叉垚鍔熷姞鍏ユ墽琛岄槦鍒�");
- this.taskformVisible = false;
- this.getList();
- }
- });
+ if (this.activname == 0) {
+ this.TaskOperation.taskId = row.taskid;
+ this.TaskOperation.sendState = 2;
+ TaskTemplateSendExecution(this.TaskOperation).then((res) => {
+ if (res.code == 200) {
+ this.$modal.msgSuccess("浠诲姟宸叉垚鍔熷姞鍏ユ墽琛岄槦鍒�");
+ this.taskformVisible = false;
+ this.getList();
+ }
+ });
+ } else if (this.activname == 1) {
+ this.immediateExecution(row);
+ }
},
// 绔嬪嵆鎵ц
--
Gitblit v1.9.3