From 9a1a82e442721ce04a743381b278482487d6a60b Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期三, 11 十二月 2024 15:20:35 +0800
Subject: [PATCH] 测试完成
---
src/views/followvisit/tasklist/index.vue | 127 ++++++++++++++++++++++++++++--------------
1 files changed, 84 insertions(+), 43 deletions(-)
diff --git a/src/views/followvisit/tasklist/index.vue b/src/views/followvisit/tasklist/index.vue
index 1f385ea..f3c0831 100644
--- a/src/views/followvisit/tasklist/index.vue
+++ b/src/views/followvisit/tasklist/index.vue
@@ -23,7 +23,7 @@
@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"
@@ -71,7 +71,7 @@
<el-select
@change="handleQuery"
v-model="tasktopic"
- placeholder="璇烽�夋嫨鏂板绫诲瀷"
+ placeholder="璇烽�夋嫨鏈嶅姟绫诲瀷"
>
<el-option
v-for="item in taskoptions"
@@ -82,10 +82,11 @@
</el-option>
</el-select>
</el-col>
- <!-- <el-col :span="1.5">
+ <el-col :span="1.5">
<el-select
- v-model="longTask"
- placeholder="璇烽�夋嫨浠诲姟绫诲瀷"
+ @change="handleQuery"
+ v-model="topqueryParams.type"
+ placeholder="璇烽�夋嫨鎵ц绫诲瀷"
>
<el-option
v-for="item in longtermlist"
@@ -95,7 +96,7 @@
>
</el-option>
</el-select>
- </el-col> -->
+ </el-col>
<el-col :span="1.5">
<el-button
type="primary"
@@ -181,7 +182,7 @@
width="120"
>
<template slot-scope="scope">
- <span>{{ scope.row.longTask?'闀挎湡浠诲姟':'闈為暱鏈�' }}</span>
+ <span>{{ scope.row.longTask ? "闀挎湡浠诲姟" : "闈為暱鏈�" }}</span>
</template>
</el-table-column>
@@ -229,7 +230,10 @@
>
<template slot-scope="scope">
<el-button
- v-if="(scope.row.sendState == 1 || scope.row.sendState == 3)&&!scope.row.longTask"
+ v-if="
+ (scope.row.sendState == 1 || scope.row.sendState == 3) &&
+ !scope.row.longTask
+ "
size="medium"
type="text"
@click="sponsor(scope.row)"
@@ -242,7 +246,10 @@
><i class="el-icon-circle-plus-outline"></i>缁堟</span
></el-button
> -->
- <el-button size="medium" type="text" @click="handleUpdate(scope.row,1)"
+ <el-button
+ size="medium"
+ type="text"
+ @click="handleUpdate(scope.row, 1)"
><span class="button-xj"
><i class="el-icon-circle-plus-outline"></i>渚濈収鏂板</span
></el-button
@@ -394,7 +401,7 @@
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
- name: "User",
+ name: "Tasklist",
dicts: ["sys_normal_disable", "sys_user_sex", "task_status"],
components: { Treeselect },
data() {
@@ -427,7 +434,7 @@
postOptions: [],
// 瑙掕壊閫夐」
roleOptions: [],
- longTask:0,
+ longTask: 0,
taskform: {
showDate: [],
showTimeMorn: [],
@@ -449,14 +456,18 @@
previewvalue: {
username: "杩欎釜鍖荤敓瀵逛綘鎬庝箞鏍�",
},
- longtermlist:[
- {
- value: '1',
- label: "闀挎湡浠诲姟",
+ longtermlist: [
+ {
+ value: 1,
+ label: "璇煶闅忚",
},
{
- value: '0',
- label: "鏅�氫换鍔�",
+ value: 2,
+ label: "闂嵎闅忚",
+ },
+ {
+ value: 3,
+ label: "瀹ｆ暀鍏虫��",
},
],
taskoptions: [
@@ -593,14 +604,14 @@
topqueryParams: {
pageNum: 1,
pageSize: 10,
- type: 3,
+ type: 1,
userName: undefined,
tagid: undefined,
topic: undefined,
},
propss: { multiple: true },
options: [],
-
+ checkboxlist: [],
// 琛ㄥ崟鏍￠獙
rules: {
userName: [
@@ -651,8 +662,11 @@
},
watch: {},
created() {
- this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(obj=>obj.deptCode);
- this.topqueryParams.leavehospitaldistrictcodes = store.getters.belongWards.map(obj=>obj.districtCode);
+ this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
+ (obj) => obj.deptCode
+ );
+ this.topqueryParams.leavehospitaldistrictcodes =
+ store.getters.belongWards.map((obj) => obj.districtCode);
this.tasktopic = this.$route.query.tasktopic
? this.$route.query.tasktopic
: this.tasktopic;
@@ -660,7 +674,10 @@
this.getConfigKey("sys.user.initPassword").then((response) => {
this.initPassword = response.msg;
});
- // this.taskoptions = store.getters.Serviceauthority;
+ this.checkboxlist = store.getters.checkboxlist;
+ },
+ activated() {
+ this.getList();
},
// 鎼滅储
mounted() {
@@ -672,10 +689,9 @@
/** 鏌ヨ浠诲姟鍒楄〃 */
getList() {
this.loading = true;
- let type = this.$route.query.type;
+ console.log(this.topqueryParams.type);
this.topqueryParams.serviceType = Number(this.tasktopic);
- this.topqueryParams.type = Number(this.type);
if (
this.tasktopic == 2 ||
this.tasktopic == 3 ||
@@ -683,27 +699,50 @@
this.tasktopic == 7 ||
this.tasktopic == 6
) {
- this.topqueryParams.type = 2;
- this.TaskOperation.taskType = 2;
+ if (!this.topqueryParams.type) this.topqueryParams.type = '2';
+ this.longtermlist = [
+ {
+ value: 1,
+ label: "璇煶闅忚",
+ },
+ {
+ value: 2,
+ label: "闂嵎闅忚",
+ },
+ ];
} else if (this.tasktopic == 4 || this.tasktopic == 8) {
- this.topqueryParams.type = 3;
- this.TaskOperation.taskType = 3;
+ if (!this.topqueryParams.type) this.topqueryParams.type = '3';
+ this.longtermlist = [
+ {
+ value: 3,
+ label: "瀹ｆ暀鍏虫��",
+ },
+ ];
} else if (this.tasktopic == 5) {
- this.topqueryParams.type = 1;
- this.TaskOperation.taskType = 1;
+ if (!this.topqueryParams.type) this.topqueryParams.type = '1';
+ this.longtermlist = [
+ {
+ value: 1,
+ label: "璇煶闅忚",
+ },
+ {
+ value: 2,
+ label: "闂嵎闅忚",
+ },
+ ];
}
// 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;
- }
- );
+ this.topqueryParams.startOutHospTime = this.dateRange[0];
+ this.topqueryParams.endOutHospTime = this.dateRange[1];
+ getTasklist(this.topqueryParams).then((response) => {
+ this.userList = response.rows;
+ this.total = response.total;
+ this.$forceUpdate();
+ this.loading = false;
+ });
},
// 鏌ョ湅闂ㄨ瘖闅忚璇︽儏
Referencequestion(row) {
@@ -810,7 +849,7 @@
}
},
/** 淇敼鎸夐挳鎿嶄綔 */
- handleUpdate(row,newadd) {
+ handleUpdate(row, newadd) {
if (this.topqueryParams.type == 1) {
this.$router.push({
path: "/followvisit/particty",
@@ -818,7 +857,7 @@
id: row.taskid,
type: this.topqueryParams.type,
serviceType: this.tasktopic,
- newadd:newadd,//鏄惁渚濈収鏂板缓
+ newadd: newadd, //鏄惁渚濈収鏂板缓
},
});
} else if (this.topqueryParams.type == 2) {
@@ -828,7 +867,7 @@
id: row.taskid,
type: this.topqueryParams.type,
serviceType: this.tasktopic,
- newadd:newadd,
+ newadd: newadd,
},
});
} else if (this.topqueryParams.type == 3) {
@@ -838,7 +877,7 @@
id: row.taskid,
type: this.topqueryParams.type,
serviceType: this.tasktopic,
- newadd:newadd,
+ newadd: newadd,
},
});
}
@@ -887,6 +926,7 @@
this.taskformVisible = true;
} else if (this.taskform.sendState != 2 && this.taskform.sendType == 2) {
this.TaskOperation.taskId = row.taskid;
+ this.TaskOperation.taskType = this.topqueryParams.type;
this.TaskOperation.sendState = 2;
this.TaskOperation.sendType = 2;
this.$modal
@@ -912,6 +952,7 @@
confirmSponsor(row) {
if (this.activname == 0) {
this.TaskOperation.taskId = row.taskid;
+ this.TaskOperation.taskType = this.topqueryParams.type;
this.TaskOperation.sendState = 2;
TaskTemplateSendExecution(this.TaskOperation).then((res) => {
if (res.code == 200) {
@@ -929,6 +970,7 @@
immediateExecution(row) {
console.log(row, "浠诲姟淇℃伅");
if (row.sendState != 2) {
+ this.TaskOperation.taskType = this.topqueryParams.type;
this.TaskOperation.taskId = row.taskid;
this.TaskOperation.sendState = 2;
this.TaskOperation.sendType = 2;
@@ -950,7 +992,6 @@
.catch(() => {});
}
},
-
// 鏆傚仠
stop(row) {
--
Gitblit v1.9.3