From 66b105cc45d8c3eec33954fffe0cd63a29774a13 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期二, 10 六月 2025 14:37:27 +0800
Subject: [PATCH] 测试完成
---
src/views/followvisit/tasklist/index.vue | 128 ++++++++++++++++++++++++++++++------------
1 files changed, 91 insertions(+), 37 deletions(-)
diff --git a/src/views/followvisit/tasklist/index.vue b/src/views/followvisit/tasklist/index.vue
index 0d4f58b..3a1d415 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"
@@ -69,9 +69,9 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-select
- @change="handleQuery"
+ @change="handleQuerytask"
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"
@@ -213,10 +214,10 @@
sortable
align="center"
prop="createTime"
- width="160"
+ width="180"
>
<template slot-scope="scope">
- <span>{{ formatTime(scope.row.createTime) }}</span>
+ <span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
@@ -457,12 +458,16 @@
},
longtermlist: [
{
- value: "1",
- label: "闀挎湡浠诲姟",
+ value: 1,
+ label: "璇煶闅忚",
},
{
- value: "0",
- label: "鏅�氫换鍔�",
+ value: 2,
+ label: "闂嵎闅忚",
+ },
+ {
+ value: 3,
+ label: "瀹ｆ暀鍏虫��",
},
],
taskoptions: [
@@ -492,9 +497,12 @@
},
{
value: "7",
- label: "鎮ｈ�呮姤鍛�",
+ label: "鎮ｈ�呮棩甯告姤鍛�",
},
-
+ {
+ value: "9",
+ label: "鎮ｈ�呭紓甯告姤鍛�",
+ },
{
value: "8",
label: "鍏朵粬閫氱煡",
@@ -599,14 +607,14 @@
topqueryParams: {
pageNum: 1,
pageSize: 10,
- type: 3,
+ type: 2,
userName: undefined,
tagid: undefined,
topic: undefined,
},
propss: { multiple: true },
options: [],
-
+ checkboxlist: [],
// 琛ㄥ崟鏍￠獙
rules: {
userName: [
@@ -669,7 +677,7 @@
this.getConfigKey("sys.user.initPassword").then((response) => {
this.initPassword = response.msg;
});
- // this.taskoptions = store.getters.Serviceauthority;
+ this.checkboxlist = store.getters.checkboxlist;
},
activated() {
this.getList();
@@ -684,10 +692,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 ||
@@ -695,14 +702,37 @@
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,
@@ -710,14 +740,12 @@
// );
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;
- }
- );
+ getTasklist(this.topqueryParams).then((response) => {
+ this.userList = response.rows;
+ this.total = response.total;
+ this.$forceUpdate();
+ this.loading = false;
+ });
},
// 鏌ョ湅闂ㄨ瘖闅忚璇︽儏
Referencequestion(row) {
@@ -757,6 +785,11 @@
this.resetForm("form");
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
+ handleQuerytask() {
+ this.topqueryParams.pageNum = 1;
+ // this.topqueryParams.type = '';
+ this.getList();
+ },
handleQuery() {
this.topqueryParams.pageNum = 1;
this.getList();
@@ -764,9 +797,16 @@
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
this.dateRange = [];
- this.resetForm("queryForm");
- this.topqueryParams.deptId = undefined;
- this.$refs.tree.setCurrentKey(null);
+ this.topqueryParams = {
+ pageNum: 1,
+ pageSize: 10,
+ type: 2,
+ };
+ this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
+ (obj) => obj.deptCode
+ );
+ this.topqueryParams.leavehospitaldistrictcodes =
+ store.getters.belongWards.map((obj) => obj.districtCode);
this.handleQuery();
},
// 澶氶�夋閫変腑鏁版嵁
@@ -901,8 +941,20 @@
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.confirm({
+ title: '纭鎿嶄綔',
+ text: '浣犵‘瀹氳鎵ц杩欎釜鎿嶄綔鍚楋紵',
+ showCancelButton: true,
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷'
+ }).then((result) => {
+ if (result.value) {
+ console.log('鐢ㄦ埛鐐瑰嚮浜嗙‘瀹氭寜閽�');
+ }
+ });
this.$modal
.confirm(
'褰撳墠閫変腑浠诲姟鍚嶇О涓�"' +
@@ -926,6 +978,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) {
@@ -943,6 +996,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;
--
Gitblit v1.9.3