From c865d7849368bec0808eb186dfa79948f1c2cf95 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 17 八月 2025 10:32:36 +0800
Subject: [PATCH] 修改查询参数
---
src/views/flow/todolist.vue | 112 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 83 insertions(+), 29 deletions(-)
diff --git a/src/views/flow/todolist.vue b/src/views/flow/todolist.vue
index 3abf4ac..d1f7ad8 100644
--- a/src/views/flow/todolist.vue
+++ b/src/views/flow/todolist.vue
@@ -98,6 +98,7 @@
label: 'name',
value: 'id',
},
+ display: true,
filterable: true,
span: 24,
disabled: false,
@@ -197,8 +198,16 @@
},
{
label: '娴佺▼鍚嶇О',
- prop: 'processDefinitionName',
+ prop: '',
width: 100,
+ render: ({ row }) => {
+ return h('p',
+ {
+ attrs: {},
+ class: {},
+ style: {},
+ }, row?.variables?.myProcessName)
+ }
},/*
{
label: '娴佺▼绫诲瀷',
@@ -285,6 +294,7 @@
{
label: '鍙戦�佺粰',
prop: 'newAssigneeId',
+ filterable:true,
type: 'select',
// dicUrl: `/blade-mdm/flow/flow-user-list?deptId=0`,
// dicFlag: true,
@@ -294,7 +304,7 @@
},
span: 24,
disabled: false,
- display: false,
+ display: true,
dicData: [
],
@@ -334,15 +344,18 @@
},
'reassignForm.approve'(val) {
- if(val === 'Y') {
- this.reassignOption.column[1].disabled = true;
- this.reassignOption.column[1].display = false;
- this.reassignForm.newAssigneeId = '';
- } else {
- this.reassignOption.column[1].display = false;
- this.reassignOption.column[1].disabled = false;
- this.reassignForm.newAssigneeId = '';
+ if(this.reassignType ===3) {
+ if(val === 'Y') {
+ this.reassignOption.column[1].disabled = true;
+ this.reassignOption.column[1].display = false;
+ this.reassignForm.newAssigneeId = '';
+ } else {
+ this.reassignOption.column[1].display = false;
+ this.reassignOption.column[1].disabled = false;
+ this.reassignForm.newAssigneeId = '';
+ }
}
+
}
},
computed: {
@@ -398,31 +411,51 @@
}
},
setAssignee (row, approve) {
- if (approve === 'Y') {
- if (["check", 'cureCheckTask '].includes(row.taskDefinitionKey)) {// 鏍″
+ if (approve === 'Y') {//瀹℃壒閫氳繃鐨勬儏鍐�
+
+ this.optionApprove.column[1].disabled = false;
+ if (["check", 'cureCheckTask','repalceCheckTask'].includes(row.taskDefinitionKey)) {// 鏍″鑺傜偣
this.formApprove.assignee = row.variables.senior;
- } else if (["programmingTask",'cureProgramTask'].includes(row.taskDefinitionKey)) {// 缂栧埗锛屾牎瀵�
+ } else if (["programmingTask",'cureProgramTask','repalceProgrammingTask'].includes(row.taskDefinitionKey)) {// 缂栧埗鑺傜偣
this.formApprove.assignee = row.variables.checker;
- } else if (row.taskDefinitionKey == "teamLeaderTask") {// 浠诲姟娲惧伐
+ } else if (row.taskDefinitionKey == "teamLeaderTask") {// 浠诲姟娲惧伐(缁勯暱)
+ this.optionApprove.column[1].disabled = false;
this.formApprove.assignee = row.variables.programmer
- } else if (row.taskDefinitionKey == "confirmIsUseableTask") {
+ } else if (row.taskDefinitionKey == "confirmIsUseableTask") {//鍒ゆ柇绋嬪簭鏄惁鍙敤鑺傜偣锛岄兘鏄彂閫佺粰鏍″
this.formApprove.assignee = row.variables.checker
} else if (["approveTask", 'seniorApproveTask','replaceApprove'].includes(row.taskDefinitionKey)) {// 楂樺笀瀹℃牳
- this.optionApprove.column[1].disabled = true;
- this.formApprove.assignee = ''; // 濡傛灉鏄�氳繃锛屽垯榛樿鎸囨淳缁欒嚜宸�
+ this.optionApprove.column[1].disabled = true;//鏈�鍚庝竴涓妭鐐�"鍙戦�佺粰" 绂佺敤
+ this.formApprove.assignee = ''; // 濡傛灉鏄�氳繃娴佺▼鐩存帴缁撴潫
}
} else if(approve === 'N'){
- this.formApprove.assignee = ''
- if (["approveTask", 'seniorApproveTask','replaceApprove'].includes(row.taskDefinitionKey)) {// 楂樺笀瀹℃牳
- this.optionApprove.column[1].disabled = true;
- getPrevius({processInstanceId: row.processInstanceId}).then(res => {
- console.log(res)
- if(res.data.code === 200) {
-
- this.formApprove.assignee = res.data.data // 濡傛灉鏄�氳繃锛屽垯榛樿鎸囨淳缁欒嚜宸�
- }
- })
-
+ //涓嶉�氳繃鐨勬儏鍐�
+ //鏍规嵁鍦ㄧ嚎鏂囨。34琛岋紝'鍙戦�佺粰'鏄鐢紝浣嗘湁榛樿閫夐」
+ this.optionApprove.column[1].disabled = true;
+
+ if (["approveTask", 'seniorApproveTask','replaceApprove'].includes(row.taskDefinitionKey)) {
+ //瀹℃壒鑺傜偣锛屼笂涓�姝ユ槸鏍″
+ this.formApprove.assignee = row.variables.checker;
+ }else if(["check", 'cureCheckTask','repalceCheckTask'].includes(row.taskDefinitionKey)){
+ //鏍″鑺傜偣,涓婁竴姝ユ槸缂栫▼
+ this.formApprove.assignee = row.variables.programmer;
+ }else if (["programmingTask"].includes(row.taskDefinitionKey)) {
+ // 缂栧埗鑺傜偣,涓婁竴姝ユ槸缁勯暱
+ this.formApprove.assignee = row.variables.teamLeader;
+ }else if(["cureProgramTask"].includes(row.taskDefinitionKey)) {
+ //鍥哄寲缂栧埗鑺傜偣锛屼笉閫氳繃灏辩粨鏉熶簡锛宎ssignee璁剧疆=''
+ this.formApprove.assignee = '';
+ }else if(["confirmIsUseableTask"].includes(row.taskDefinitionKey)) {
+ //鍒ゆ柇鏄惁鍙敤鑺傜偣锛屼笉鍙敤锛岀粰缂栧埗
+ this.formApprove.assignee = row.variables.programmer;
+ }if(['teamLeaderTask'].includes(row.taskDefinitionKey)){
+ this.formApprove.assignee = '';
+ }
+
+ }else if(approve === 'R'){
+ //椹冲洖锛岀洰鍓嶅彧鏈夋鏌ョ▼搴忔槸鍚﹀彲鐢ㄨ妭鐐�
+ if(["confirmIsUseableTask"].includes(row.taskDefinitionKey)) {
+ //鍒ゆ柇绋嬪簭鏄惁鍙敤鑺傜偣锛岄┏鍥烇紝缁欑粍闀�
+ this.formApprove.assignee = row.variables.teamLeader;
}
}
@@ -460,9 +493,12 @@
}).catch(err => {
this.$message.success('鎿嶄綔澶辫触');
})
+ }).catch(() => {
+ // this.$message.info('宸插彇娑堟搷浣�');
});
} else {
this.reassignBox = true;
+
if(val === 3) {//鎵归噺瀹℃壒鏃� 鏄剧ず閫氳繃椹冲洖
this.reassignOption.column[0].display = true;
this.reassignOption.column[0].dicData[1].label = '涓嶉�氳繃';
@@ -472,6 +508,11 @@
this.reassignOption.column[1].display = true;
} else {
this.reassignOption.column[0].display = false;
+ this.reassignForm.approve = '';
+
+ }
+ if(val ===1) {
+ this.reassignForm.newAssigneeId = this.transferTaskSelection[0].variables.programmer;
}
}
@@ -485,7 +526,8 @@
confirmButtonText: this.$t('submitText'),
cancelButtonText: this.$t('cancelText'),
type: 'warning',
- }).then(() => {
+ }).then((res) => {
+ console.log(res,'>>>>>>')
reassgin({
...form,
taskId: this.transferTaskSelection[0].taskId,
@@ -505,6 +547,10 @@
this.$message.error('鎿嶄綔澶辫触');
done()
})
+ }).catch(() => {
+ console.log('>>>>>>')
+ // this.$message.info('宸插彇娑堟搷浣�');
+ done();
});
} else if (this.reassignType === 1) {
@@ -533,6 +579,10 @@
console.error(err);
done()
})
+ }).catch(() => {
+ console.log('>>>>>>')
+ // this.$message.info('宸插彇娑堟搷浣�');
+ done();
});
} else if (this.reassignType === 3) {
this.$confirm('纭瑕佽繘琛屾壒閲忓鎵瑰悧锛�', '', {
@@ -561,6 +611,10 @@
console.error(err);
done()
})
+ }).catch(() => {
+ console.log('>>>>>>')
+ // this.$message.info('宸插彇娑堟搷浣�');
+ done();
});
}
},
--
Gitblit v1.9.3