From 57a7537f38f78499218c2d23f4c09a26add08c5a Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期二, 04 三月 2025 20:05:39 +0800
Subject: [PATCH] 测试完成
---
src/views/followvisit/tasklist/index.vue | 134 +++++++++++++++++++++++++++-----------------
1 files changed, 81 insertions(+), 53 deletions(-)
diff --git a/src/views/followvisit/tasklist/index.vue b/src/views/followvisit/tasklist/index.vue
index 0d4f58b..98eb295 100644
--- a/src/views/followvisit/tasklist/index.vue
+++ b/src/views/followvisit/tasklist/index.vue
@@ -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"
@@ -164,7 +165,7 @@
:show-overflow-tooltip="true"
/>
<el-table-column
- label="寰呮墽琛�/鎬讳换鍔�"
+ label="寰呴殢璁�/鎬讳换鍔�"
align="center"
key="nickName"
prop="nickName"
@@ -420,7 +421,7 @@
// 鐢ㄦ埛琛ㄦ牸鏁版嵁
userList: null,
// 寮瑰嚭灞傛爣棰�
- title: "鏂板闂ㄨ瘖闅忚",
+ title: "鏂板褰卞儚闅忚",
// 鏄惁鏄剧ず淇敼銆佹坊鍔犲脊鍑哄眰
addalteropen: false,
// 閮ㄩ棬鍚嶇О
@@ -444,31 +445,35 @@
dynamicTags: ["閫夐」涓�", "閫夐」浜�", "閫夐」涓�"], //閫夐」
inputVisible: false,
inputValue: "",
- previewVisible: false, //闂ㄨ瘖闅忚棰勮寮规
+ previewVisible: false, //褰卞儚闅忚棰勮寮规
TaskOperation: {},
radio: "",
radios: [],
- previewtype: 2, //棰勮闂ㄨ瘖闅忚绫诲瀷
+ previewtype: 2, //棰勮褰卞儚闅忚绫诲瀷
total: 0, // 鎬绘潯鏁�
- ImportQuantity: 999, //瀵奸棬璇婇殢璁挎暟閲�
- //棰勮闂ㄨ瘖闅忚淇℃伅
+ ImportQuantity: 999, //瀵煎奖鍍忛殢璁挎暟閲�
+ //棰勮褰卞儚闅忚淇℃伅
previewvalue: {
username: "杩欎釜鍖荤敓瀵逛綘鎬庝箞鏍�",
},
longtermlist: [
{
- value: "1",
- label: "闀挎湡浠诲姟",
+ value: 1,
+ label: "璇煶闅忚",
},
{
- value: "0",
- label: "鏅�氫换鍔�",
+ value: 2,
+ label: "闂嵎闅忚",
+ },
+ {
+ value: 3,
+ label: "瀹ｆ暀鍏虫��",
},
],
taskoptions: [
{
value: "1",
- label: "鐩戞祴璇勪及",
+ label: "蹇冪數闅忚",
},
{
value: "2",
@@ -476,7 +481,7 @@
},
{
value: "3",
- label: "闂ㄨ瘖闅忚",
+ label: "褰卞儚闅忚",
},
{
value: "4",
@@ -484,20 +489,15 @@
},
{
value: "5",
- label: "澶嶈瘖绠＄悊",
+ label: "浣撴闅忚",
},
{
- value: "6",
- label: "婊℃剰搴﹁皟鏌�",
+ value: "11",
+ label: "鍖绘妧闅忚",
},
{
- value: "7",
- label: "鎮ｈ�呮姤鍛�",
- },
-
- {
- value: "8",
- label: "鍏朵粬閫氱煡",
+ value: "10",
+ label: "涓撶闅忚",
},
],
tasktopic: "2", //鏂板绫诲瀷
@@ -599,14 +599,14 @@
topqueryParams: {
pageNum: 1,
pageSize: 10,
- type: 3,
+ type: 2,
userName: undefined,
tagid: undefined,
topic: undefined,
},
propss: { multiple: true },
options: [],
-
+ checkboxlist: [],
// 琛ㄥ崟鏍￠獙
rules: {
userName: [
@@ -657,11 +657,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;
@@ -669,7 +669,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 +684,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 +694,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,16 +732,14 @@
// );
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) {
this.previewVisible = true;
},
@@ -757,6 +777,11 @@
this.resetForm("form");
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
+ handleQuerytask() {
+ this.topqueryParams.pageNum = 1;
+ // this.topqueryParams.type = '';
+ this.getList();
+ },
handleQuery() {
this.topqueryParams.pageNum = 1;
this.getList();
@@ -901,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
@@ -926,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) {
@@ -943,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;
--
Gitblit v1.9.3