From 1589350a6553dce742b0f5196111bac22b343140 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期一, 17 六月 2024 17:43:49 +0800
Subject: [PATCH] 测试完成
---
src/views/followvisit/tasklist/index.vue | 209 +++++++++++++++++++++++++++++++++++++---------------
1 files changed, 149 insertions(+), 60 deletions(-)
diff --git a/src/views/followvisit/tasklist/index.vue b/src/views/followvisit/tasklist/index.vue
index 45a9c02..34ad3cc 100644
--- a/src/views/followvisit/tasklist/index.vue
+++ b/src/views/followvisit/tasklist/index.vue
@@ -218,7 +218,7 @@
>
<template slot-scope="scope">
<el-button
- v-if="scope.row.status != 1"
+ v-if="scope.row.sendState == 1 || scope.row.sendState == 3"
size="medium"
type="text"
@click="sponsor(scope.row)"
@@ -226,12 +226,25 @@
><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
></el-button
>
- <el-button size="medium" type="text" @click="stop(scope.row)"
+ <el-button
+ v-if="scope.row.sendState == 2"
+ size="medium"
+ type="text"
+ @click="stop(scope.row)"
><span class="button-zt"
><i class="el-icon-circle-plus-outline"></i>鏆傚仠浠诲姟</span
></el-button
@@ -272,58 +285,68 @@
@pagination="getList"
/>
</el-row>
- <!-- 娣诲姞鎴栦慨鏀归棬璇婇殢璁垮璇濇 -->
+ <!-- 纭鍙戣捣瀵硅瘽妗� -->
<el-dialog
- :title="title"
- :visible.sync="addalteropen"
- width="700px"
- append-to-body
+ title="浠诲姟鍙戣捣纭"
+ :visible.sync="taskformVisible"
+ width="50%"
+ :before-close="handleClose"
>
- <el-form ref="form" :model="form" label-width="100px">
- <el-row :gutter="20">
- <el-col :span="12"
- ><el-form-item label="浠诲姟鍚嶇О">
- <el-input v-model="form.taskName"></el-input> </el-form-item
- ></el-col>
- </el-row>
- <el-row :gutter="20">
- <el-col :span="24"
- ><el-form-item label="鎵�灞炵瀹�">
- <el-select v-model="form.region" placeholder="璇烽�夋嫨绉戝">
- <el-option label="鍖哄煙涓�" value="shanghai"></el-option>
- <el-option label="鍖哄煙浜�" value="beijing"></el-option>
- </el-select> </el-form-item></el-col
- ></el-row>
- <el-row :gutter="20">
- <el-col :span="24"
- ><el-form-item label="闅忚绫诲瀷">
- <el-select v-model="form.region" placeholder="璇烽�夋嫨闅忚绫诲瀷">
- <el-option label="鍖哄煙涓�" value="shanghai"></el-option>
- <el-option label="鍖哄煙浜�" value="beijing"></el-option>
- </el-select> </el-form-item
- ></el-col>
- </el-row>
- <el-row :gutter="20">
- <el-col :span="24">
- <el-form-item label="鏈嶅姟妯″潡">
- <el-select v-model="form.region" placeholder="璇烽�夋嫨妯″潡">
- <el-option label="鍖哄煙涓�" value="shanghai"></el-option>
- <el-option label="鍖哄煙浜�" value="beijing"></el-option>
- </el-select>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="20">
- <el-col :span="24">
- <el-form-item label="闂ㄨ瘖闅忚瑕佹眰">
- <el-input type="textarea" v-model="form.desc"></el-input>
- </el-form-item>
- </el-col>
- </el-row>
- </el-form>
- <div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitForm">鎻� 浜�</el-button>
- <el-button @click="cancel">杩� 鍥�</el-button>
+ <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[0]"
+ >
+ 鎵ц鏃ユ湡锛�<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-button style="margin-right: 20px" @click="taskformVisible = false"
+ >鍙� 娑�</el-button
+ >
+ <el-button
+ style="margin-right: 20px"
+ type="success"
+ @click="confirmSponsor(taskform)"
+ >纭鎵ц</el-button
+ >
+ <el-button type="primary" @click="handleUpdate(taskform)"
+ >鍓嶅線淇敼</el-button
+ >
</div>
</el-dialog>
</div>
@@ -383,6 +406,13 @@
postOptions: [],
// 瑙掕壊閫夐」
roleOptions: [],
+ taskform: {
+ showDate: [],
+ showTimeMorn: [],
+ showTimeNight: [],
+ showTimeNoon: [],
+ },
+ taskformVisible: false,
dynamicTags: ["閫夐」涓�", "閫夐」浜�", "閫夐」涓�"], //閫夐」
inputVisible: false,
inputValue: "",
@@ -636,11 +666,6 @@
}
},
- // 鍙栨秷鎸夐挳
- cancel() {
- this.addalteropen = false;
- this.reset();
- },
// 琛ㄥ崟閲嶇疆
reset() {
this.form = {
@@ -716,13 +741,69 @@
deletefn() {},
// 浠诲姟鍙戣捣
sponsor(row) {
- console.log(row,'浠诲姟淇℃伅');
+ console.log(row, "浠诲姟淇℃伅");
+ this.taskform = row;
+ if (this.taskform.showDate) {
+ this.taskform.showDate = this.taskform.showDate.split(",");
+ }
+ if (this.taskform.showTimeMorn) {
+ this.taskform.showTimeMorn = this.taskform.showTimeMorn.split(",");
+ } else {
+ this.taskform.showTimeMorn = [];
+ }
+ if (this.taskform.showTimeNight) {
+ this.taskform.showTimeNight = this.taskform.showTimeNight.split(",");
+ } else {
+ this.taskform.showTimeNight = [];
+ }
+ if (this.taskform.showTimeNoon) {
+ this.taskform.showTimeNoon = this.taskform.showTimeNoon.split(",");
+ } else {
+ this.taskform.showTimeNoon = [];
+ }
+ if (row.sendState != 2) {
+ this.taskformVisible = true;
+ } else {
+ this.$modal.msgError("浠诲姟宸插彂璧凤紝涓嶅彲鍐嶆鍙戣捣");
+ }
+ },
+ // 纭鍙戣捣
+ confirmSponsor(row) {
+ this.TaskOperation.taskId = row.taskid;
+ this.TaskOperation.sendState = 2;
+ TaskTemplateSendExecution(this.TaskOperation).then((res) => {
+ if (res.code == 200) {
+ this.$modal.msgSuccess("浠诲姟宸叉垚鍔熷姞鍏ユ墽琛岄槦鍒�");
+ this.getList();
+ }
+ });
+ },
+ // 绔嬪嵆鎵ц
+ immediateExecution(row) {
+ console.log(row, "浠诲姟淇℃伅");
if (row.sendState != 2) {
this.TaskOperation.taskId = row.taskid;
this.TaskOperation.sendState = 2;
- TaskTemplateSendExecution(this.TaskOperation).then((res) => {});
+ this.TaskOperation.sendType = 2;
+ this.$modal
+ .confirm(
+ '鏄惁绔嬪嵆鎵ц浠诲姟鍚嶇О涓轰负"' +
+ row.taskName +
+ '"鐨勬暟鎹」锛熷彂璧锋墽琛屽悗涓嶅彲鎾ゅ洖锛�'
+ )
+ .then(() => {
+ TaskTemplateSendExecution(this.TaskOperation).then((res) => {
+ if (res.code == 200) {
+ this.getList();
+ this.$modal.msgSuccess("浠诲姟宸茬珛鍗虫墽琛�");
+ }
+ });
+ })
+ .then(() => {})
+ .catch(() => {});
}
},
+
// 渚濈収鏂板
newAdd(row) {
TaskTemplateSendExecution().then((res) => {});
@@ -732,7 +813,9 @@
if (row.sendState == 2) {
this.TaskOperation.taskId = row.taskId;
this.TaskOperation.sendState = 3;
- TaskTemplateSendExecution().then((res) => {});
+ TaskTemplateSendExecution().then((res) => {
+ this.getList();
+ });
}
},
@@ -891,6 +974,12 @@
border-radius: 1px;
color: #ffffff;
}
+.button-lj {
+ background: #e9614f;
+ padding: 5px;
+ border-radius: 1px;
+ color: #ffffff;
+}
.button-xj {
background: #815c94;
padding: 5px;
--
Gitblit v1.9.3