From 26b6950a2b4ea0e41f35c68319489a6292f2b2f3 Mon Sep 17 00:00:00 2001
From: lzhe <181968431@qq.com>
Date: 星期二, 12 八月 2025 22:37:33 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/mdmweb
---
src/views/flow/todolist.vue | 44 ++++++++++++++++++++++++++++++++++----------
1 files changed, 34 insertions(+), 10 deletions(-)
diff --git a/src/views/flow/todolist.vue b/src/views/flow/todolist.vue
index 3abf4ac..cd3e679 100644
--- a/src/views/flow/todolist.vue
+++ b/src/views/flow/todolist.vue
@@ -294,7 +294,7 @@
},
span: 24,
disabled: false,
- display: false,
+ display: true,
dicData: [
],
@@ -334,15 +334,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: {
@@ -460,9 +463,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 +478,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 +496,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 +517,10 @@
this.$message.error('鎿嶄綔澶辫触');
done()
})
+ }).catch(() => {
+ console.log('>>>>>>')
+ // this.$message.info('宸插彇娑堟搷浣�');
+ done();
});
} else if (this.reassignType === 1) {
@@ -533,6 +549,10 @@
console.error(err);
done()
})
+ }).catch(() => {
+ console.log('>>>>>>')
+ // this.$message.info('宸插彇娑堟搷浣�');
+ done();
});
} else if (this.reassignType === 3) {
this.$confirm('纭瑕佽繘琛屾壒閲忓鎵瑰悧锛�', '', {
@@ -561,6 +581,10 @@
console.error(err);
done()
})
+ }).catch(() => {
+ console.log('>>>>>>')
+ // this.$message.info('宸插彇娑堟搷浣�');
+ done();
});
}
},
--
Gitblit v1.9.3