From caf5eece759763e96591a786cf9a8eb8f515d5f0 Mon Sep 17 00:00:00 2001
From: WXL (wul) <wl_5969728@163.com>
Date: 星期四, 18 九月 2025 09:38:59 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/smartor-web
---
src/views/followvisit/tasklist/index.vue | 91 +++++++++++++++++++++++++++++++--------------
1 files changed, 62 insertions(+), 29 deletions(-)
diff --git a/src/views/followvisit/tasklist/index.vue b/src/views/followvisit/tasklist/index.vue
index e8e66a3..10a9838 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"
@@ -90,7 +90,7 @@
>
<el-option
v-for="item in longtermlist"
- :key="item.value"
+ :key="item.label"
:label="item.label"
:value="item.value"
>
@@ -142,7 +142,6 @@
<el-table-column
label="浠诲姟鍚嶇О"
fixed
- width="200"
align="center"
key="taskName"
prop="taskName"
@@ -150,7 +149,6 @@
/>
<el-table-column
label="浠诲姟鎻忚堪"
- width="280"
align="center"
key="taskDesc"
prop="taskDesc"
@@ -158,21 +156,26 @@
/>
<el-table-column
label="鏈嶅姟椤圭洰"
- width="120"
align="center"
key="templatename"
prop="templatename"
:show-overflow-tooltip="true"
/>
<el-table-column
- label="寰呴殢璁�/鎬讳换鍔�"
+ label="鎬讳换鍔�/宸查殢璁�"
align="center"
key="nickName"
width="120"
prop="nickName"
>
<template slot-scope="scope">
- <span>{{ scope.row.wfs }}/{{ scope.row.yfs }}</span>
+ <span
+ >{{
+ scope.row.wfs || scope.row.wfs == 0
+ ? scope.row.wfs + scope.row.yfs
+ : ""
+ }}/{{ scope.row.yfs }}</span
+ >
</template>
</el-table-column>
<el-table-column
@@ -180,7 +183,6 @@
align="center"
key="longTask"
prop="longTask"
- width="120"
>
<template slot-scope="scope">
<span>{{ scope.row.longTask ? "闀挎湡浠诲姟" : "闈為暱鏈�" }}</span>
@@ -192,7 +194,6 @@
align="center"
key="sendState"
prop="sendState"
- width="120"
>
<template slot-scope="scope">
<dict-tag
@@ -207,7 +208,6 @@
align="center"
key="createBy"
prop="createBy"
- width="120"
:show-overflow-tooltip="true"
/>
<el-table-column
@@ -215,7 +215,6 @@
sortable
align="center"
prop="createTime"
- width="160"
>
<template slot-scope="scope">
<span>{{ formatTime(scope.row.createTime) }}</span>
@@ -470,11 +469,15 @@
value: 3,
label: "瀹ｆ暀鍏虫��",
},
+ {
+ value: 4,
+ label: "娑堟伅閫氱煡",
+ },
],
taskoptions: [
{
value: "1",
- label: "蹇冪數闅忚",
+ label: "鐩戞祴璇勪及",
},
{
value: "2",
@@ -482,7 +485,7 @@
},
{
value: "3",
- label: "褰卞儚闅忚",
+ label: "闂ㄨ瘖闅忚",
},
{
value: "4",
@@ -490,15 +493,39 @@
},
{
value: "5",
+ label: "澶嶈瘖绠＄悊",
+ },
+ // {
+ // value: "5",
+ // label: "婊℃剰搴﹁皟鏌�",
+ // },
+ {
+ value: "7",
+ label: "鎮ｈ�呮姤鍛�",
+ },
+ // {
+ // value: "8",
+ // label: "鍏朵粬閫氱煡",
+ // },
+ {
+ value: "9",
label: "浣撴闅忚",
},
+ // {
+ // value: "10",
+ // label: "鍖绘妧闅忚",
+ // },
{
value: "11",
- label: "鍖绘妧闅忚",
+ label: "褰卞儚闅忚",
},
{
- value: "10",
- label: "涓撶闅忚",
+ value: "12",
+ label: "蹇冪數闅忚",
+ },
+ {
+ value: "13",
+ label: "涓撶梾闅忚",
},
],
tasktopic: "2", //鏂板绫诲瀷
@@ -600,7 +627,7 @@
topqueryParams: {
pageNum: 1,
pageSize: 10,
- type: 2,
+ type: 1,
userName: undefined,
tagid: undefined,
topic: undefined,
@@ -685,7 +712,6 @@
/** 鏌ヨ浠诲姟鍒楄〃 */
getList() {
this.loading = true;
- console.log(this.topqueryParams.type);
this.topqueryParams.serviceType = Number(this.tasktopic);
if (
@@ -695,7 +721,7 @@
this.tasktopic == 7 ||
this.tasktopic == 6
) {
- if (!this.topqueryParams.type) this.topqueryParams.type = '2';
+ if (!this.topqueryParams.type) this.topqueryParams.type = 1;
this.longtermlist = [
{
value: 1,
@@ -706,16 +732,18 @@
label: "闂嵎闅忚",
},
];
+ // this.topqueryParams.type = 2;
} else if (this.tasktopic == 4 || this.tasktopic == 8) {
- if (!this.topqueryParams.type) this.topqueryParams.type = '3';
+ if (!this.topqueryParams.type) this.topqueryParams.type = "3";
this.longtermlist = [
{
value: 3,
label: "瀹ｆ暀鍏虫��",
},
];
+ this.topqueryParams.type = 3;
} else if (this.tasktopic == 5) {
- if (!this.topqueryParams.type) this.topqueryParams.type = '1';
+ if (!this.topqueryParams.type) this.topqueryParams.type = "1";
this.longtermlist = [
{
value: 1,
@@ -727,12 +755,8 @@
},
];
}
- // this.topqueryParams.typename = this.findLabelByValue(
- // this.taskoptions,
- // this.tasktopic
- // );
- this.topqueryParams.startOutHospTime = this.dateRange[0];
- this.topqueryParams.endOutHospTime = this.dateRange[1];
+ this.topqueryParams.beginTime = this.dateRange[0];
+ this.topqueryParams.endTime = this.dateRange[1];
getTasklist(this.topqueryParams).then((response) => {
this.userList = response.rows;
this.total = response.total;
@@ -784,6 +808,8 @@
this.getList();
},
handleQuery() {
+ console.log(this.topqueryParams.type);
+
this.topqueryParams.pageNum = 1;
this.getList();
},
@@ -791,8 +817,15 @@
resetQuery() {
this.dateRange = [];
this.resetForm("queryForm");
- this.topqueryParams.deptId = undefined;
- this.$refs.tree.setCurrentKey(null);
+ this.topqueryParams = {
+ pageNum: 1,
+ pageSize: 10,
+ type: 2,
+ userName: undefined,
+ tagid: undefined,
+ topic: undefined,
+ };
+ // this.$refs.tree.setCurrentKey(null);
this.handleQuery();
},
// 澶氶�夋閫変腑鏁版嵁
--
Gitblit v1.9.3