From e66cdc6497bc6af13cc67df33f6fa42e5ab637b0 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 25 八月 2025 16:41:38 +0800
Subject: [PATCH] 修复撤回按钮权限问题
---
src/views/flow/todolist.vue | 64 ++++++++++++++++++++++++-------
1 files changed, 49 insertions(+), 15 deletions(-)
diff --git a/src/views/flow/todolist.vue b/src/views/flow/todolist.vue
index 08ea98e..9a5189a 100644
--- a/src/views/flow/todolist.vue
+++ b/src/views/flow/todolist.vue
@@ -6,12 +6,12 @@
@selection-change="selectionTransferTask">
<template #menu-left>
- <el-button type="primary" v-if="permission.auto_dispatch" plain @click="reassign(2)">鑷姩娲惧伐
+ <el-button type="primary" :disabled="this.transferTaskSelection.length==0" v-if="permission.auto_dispatch" plain @click="reassign(2)">鑷姩娲惧伐
</el-button>
- <el-button type="primary" v-if="permission.manual_dispatch" plain @click="reassign(1)">鎵嬪姩娲惧伐
+ <el-button type="primary" :disabled="this.transferTaskSelection.length==0" v-if="permission.manual_dispatch" plain @click="reassign(1)">鎵嬪姩娲惧伐
</el-button>
- <el-button type="primary" plain @click="reassign(0)">閲嶆柊鎸囨淳</el-button>
- <el-button type="primary" v-if="permission.batch_approve" plain @click="reassign(3)">鎵归噺瀹℃壒
+ <el-button type="primary" :disabled="this.transferTaskSelection.length==0" plain @click="reassign(0)">閲嶆柊鎸囨淳</el-button>
+ <el-button type="primary" :disabled="this.transferTaskSelection.length==0" v-if="permission.batch_approve" plain @click="reassign(3)">鎵归噺瀹℃壒
</el-button>
</template>
<template #menu="scope">
@@ -67,6 +67,8 @@
activeName: 'approve',
applist: [],
assigneeData: [],
+ allAssigneeData: [],
+ managerAssigneeData: [],//鏁版帶绠＄悊鍛樿鑹茬殑瀹℃壒鐢ㄦ埛
row: {},
approveBox: false,
formApprove: {
@@ -365,11 +367,6 @@
},
},
mounted() {
- getAssignee(this.row).then(res => {
- this.assigneeData = res.data.data;
- this.optionApprove.column[1].dicData = this.assigneeData;
- this.reassignOption.column[1].dicData = this.assigneeData;
- })
//this.setApproveBtn(row)
},
methods: {
@@ -386,6 +383,12 @@
this.optionApprove.column[0].dicData = [
{ label: '閫氳繃', value: 'Y' },
{ label: '缁撴潫', value: 'N' },
+ ];
+ break;
+ case 'appendProgrammingTask': // 琛ュ厖娴佺▼鐨� 缂栫▼鑺傜偣
+ this.optionApprove.column[0].dicData = [
+ { label: '閫氳繃', value: 'Y' },
+ { label: '缁撴潫', value: 'E' },
];
break;
case 'cureProgramTask': // 鍥哄寲缂栧埗,鍙互閫氳繃锛堢粰鏍″锛夛紱涓嶉�氳繃N锛堢粰绋嬪簭绠＄悊鍛橈級
@@ -425,19 +428,28 @@
}
},
setAssignee (row, approve) {
+
+ if (["cureProgramTask"].includes(row.taskDefinitionKey)) {
+ if(approve === 'N'){
+ this.optionApprove.column[1].dicData = this.managerAssigneeData;
+ }else{
+ //this.assigneeData = this.allAssigneeData;
+ this.optionApprove.column[1].dicData = this.allAssigneeData;
+ }
+ }
if (approve === 'Y') {//瀹℃壒閫氳繃鐨勬儏鍐�
this.optionApprove.column[1].disabled = false;
- if (["check", 'cureCheckTask','repalceCheckTask'].includes(row.taskDefinitionKey)) {// 鏍″鑺傜偣
+ if (["check", 'cureCheckTask','repalceCheckTask','appendCheckTask'].includes(row.taskDefinitionKey)) {// 鏍″鑺傜偣
this.formApprove.assignee = row.variables.senior;
- } else if (["programmingTask",'cureProgramTask','repalceProgrammingTask'].includes(row.taskDefinitionKey)) {// 缂栧埗鑺傜偣
+ } else if (["programmingTask",'cureProgramTask','repalceProgrammingTask','appendProgrammingTask'].includes(row.taskDefinitionKey)) {// 缂栧埗鑺傜偣
this.formApprove.assignee = row.variables.checker;
} else if (row.taskDefinitionKey == "teamLeaderTask") {// 浠诲姟娲惧伐(缁勯暱)
this.optionApprove.column[1].disabled = false;
this.formApprove.assignee = row.variables.programmer
} else if (row.taskDefinitionKey == "confirmIsUseableTask") {//鍒ゆ柇绋嬪簭鏄惁鍙敤鑺傜偣锛岄兘鏄彂閫佺粰鏍″
this.formApprove.assignee = row.variables.checker
- } else if (["approveTask", 'seniorApproveTask','replaceApprove','unlockApproveTask'].includes(row.taskDefinitionKey)) {// 楂樺笀瀹℃牳
+ } else if (["approveTask", 'seniorApproveTask','replaceApprove','unlockApproveTask','appendApproveTask'].includes(row.taskDefinitionKey)) {// 楂樺笀瀹℃牳
this.optionApprove.column[1].disabled = true;//鏈�鍚庝竴涓妭鐐�"鍙戦�佺粰" 绂佺敤
this.formApprove.assignee = ''; // 濡傛灉鏄�氳繃娴佺▼鐩存帴缁撴潫
}else if('unlockProgramConfirm'==row.taskDefinitionKey){
@@ -449,10 +461,10 @@
//鏍规嵁鍦ㄧ嚎鏂囨。34琛岋紝'鍙戦�佺粰'鏄鐢紝浣嗘湁榛樿閫夐」
this.optionApprove.column[1].disabled = true;
- if (["approveTask", 'seniorApproveTask','replaceApprove','unlockApproveTask'].includes(row.taskDefinitionKey)) {
+ if (["approveTask", 'seniorApproveTask','replaceApprove','unlockApproveTask','appendApproveTask'].includes(row.taskDefinitionKey)) {
//瀹℃壒鑺傜偣锛屼笉閫氳繃缁欑紪鍒讹細缂栧埗鏄矗浠讳汉锛屼笉缁欐牎瀵逛簡
this.formApprove.assignee = row.variables.programmer;
- } else if(["check", 'cureCheckTask','repalceCheckTask'].includes(row.taskDefinitionKey)){
+ } else if(["check", 'cureCheckTask','repalceCheckTask','appendCheckTask'].includes(row.taskDefinitionKey)){
//鏍″鑺傜偣,涓婁竴姝ユ槸缂栫▼
this.formApprove.assignee = row.variables.programmer;
}else if (["programmingTask"].includes(row.taskDefinitionKey)) {
@@ -462,6 +474,12 @@
//鍥哄寲缂栧埗鑺傜偣锛屼笉閫氳繃缁欐暟鎺х鐞嗗憳
//TODO 鎸夋壘瑙掕壊瀹氫綅缁欏叾涓竴涓暟鎺х鐞嗗憳
this.optionApprove.column[1].disabled = false;
+ for(var i=0;i<this.assigneeData.length;i++){
+ if(this.assigneeData[i].manager == true){
+ this.formApprove.assignee = this.assigneeData[i].id;
+ break;
+ }
+ }
//this.formApprove.assignee = '';
}else if(["confirmIsUseableTask"].includes(row.taskDefinitionKey)) {
//鍒ゆ柇鏄惁鍙敤鑺傜偣锛屼笉鍙敤锛岀粰缂栧埗
@@ -643,12 +661,28 @@
}
},
handleAction(row, index) {
+ getAssignee({
+ taskId: row.taskId,
+ }).then(res => {
+ //if(row.taskDefinitionKey === '')
+ this.assigneeData = res.data.data;
+ this.allAssigneeData = res.data.data;
+ //鍒濆鍖栨暟鎺х鐞嗗憳鐨勬暟缁�
+ for(var i=0;i<this.allAssigneeData.length;i++){
+ if(this.allAssigneeData[i].manager == true){
+ this.managerAssigneeData[this.managerAssigneeData.length] = this.allAssigneeData[i];
+ }
+ }
+ this.optionApprove.column[1].dicData = this.assigneeData;
+ this.reassignOption.column[1].dicData = this.assigneeData;
+ })
this.formApprove = {
comment: '',
approve: 'Y', // 榛樿鍚�
}
this.approveBox = true;
this.row = row
+
this.setAssignee(row, this.formApprove.approve);
this.setApproveBtn(row);
console.log('handleAction', row, index);
@@ -752,7 +786,7 @@
}
.left {
- width: 400px;
+ width: 40%;
}
.right {
--
Gitblit v1.9.3