From 7acbfc9ec91fc7cc6f0f57541331900165311bf5 Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期三, 06 八月 2025 20:18:32 +0800
Subject: [PATCH] update
---
src/views/flow/todolist.vue | 93 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 71 insertions(+), 22 deletions(-)
diff --git a/src/views/flow/todolist.vue b/src/views/flow/todolist.vue
index 568b4ab..809e9ab 100644
--- a/src/views/flow/todolist.vue
+++ b/src/views/flow/todolist.vue
@@ -9,8 +9,7 @@
</el-button>
</template>
<template #menu="scope">
- <el-button type="primary" text size="default" v-if="permission.flow_model_update"
- @click.stop="handleAction(scope.row, scope.index)">瀹℃壒
+ <el-button type="primary" text size="default" @click.stop="handleAction(scope.row, scope.index)">瀹℃壒
</el-button>
</template>
</avue-crud>
@@ -44,13 +43,15 @@
},
data() {
return {
+
applist: [],
assigneeData: [],
row: {},
approveBox: false,
formApprove: {
comment: '',
- approve: '', // 榛樿鍚屾剰
+ approve: 'Y', // 榛樿鍚屾剰
+ assignee: ''
},
optionApprove: {
labelWidth: 100,
@@ -77,6 +78,7 @@
label: 'name',
value: 'id',
},
+ filterable: true,
span: 24,
disabled: false,
dicData: [
@@ -89,7 +91,20 @@
span: 24,
prop: 'comment',
type: 'textarea',
- rules: [{ required: true, message: '璇疯緭鍏ュ鎵规剰瑙�', trigger: 'blur' }],
+ // rules: [{ required: true, message: '璇疯緭鍏ュ鎵规剰瑙�', trigger: 'blur' }],
+ rules: [
+ {
+ validator: (rule, value, callback) => {
+ console.log('-------',this.formApprove)
+ if (value === '' && this.formApprove.approve !== 'Y') {
+ callback(new Error('璇疯緭鍏ュ娉�'));
+ } else {
+ callback();
+ }
+ },
+ trigger: 'blur'
+ }
+ ]
},
],
},
@@ -102,6 +117,7 @@
query: {},
loading: true,
option: {
+ rowKey: "taskId",
addBtn: false,
editBtn: false,
delBtn: false,
@@ -137,16 +153,29 @@
},
],
},
+ {
+ label: '鏍囬',
+ prop: '',
+ width: 100,
+ render: ({ row }) => {
+ return h('p',
+ {
+ attrs: {},
+ class: {},
+ style: {},
+ }, row?.variables?.title)
+ }
+ },
{
- label: '浠诲姟鍚嶇О',
+ label: '娴佺▼鍚嶇О',
prop: 'processDefinitionName',
width: 100,
- },
+ },/*
{
label: '娴佺▼绫诲瀷',
width: 100,
prop: 'categoryName',
- },
+ },*/
{
label: '鏈哄簥',
@@ -189,7 +218,7 @@
{
label: '鏂囦欢',
width: 200,
- prop: '',
+ prop: 'file',
},
{
label: '鍒拌揪鏃堕棿',
@@ -253,11 +282,14 @@
// });
// },
'formApprove.approve'(val) {
- if (val === 'Y' && this.row.taskDefinitionKey === 'approveTask') {
+ if (val === 'Y' && ["approveTask", 'seniorApproveTask'].includes(this.row.taskDefinitionKey)) {// 楂樺笀
this.optionApprove.column[1].disabled = true;
this.formApprove.assignee = ''; // 濡傛灉鏄�氳繃锛屽垯榛樿鎸囨淳缁欒嚜宸�
- } else {
- this.optionApprove.column[1].disabled = false;
+ } else if(val === 'Y'){
+ this.setAssignee(this.row);
+ } else if(val === 'N') {
+ this.formApprove.assignee = ''
+ // this.formApprove.assignee = row.variables.senior;
}
},
},
@@ -310,45 +342,62 @@
this.reassignBox = false;
this.$refs?.reassginform?.resetForm();
this.onLoad(this.page, this.query);
+ done()
}).catch(err => {
console.error(err);
+ done()
})
});
done();
},
- handleAction(row, index) {
- this.formApprove = {
- comment: '',
- approve: '', // 榛樿鍚�
- }
- this.approveBox = true;
- this.row = row
- if (row.taskDefinitionKey == "check") {
+ setAssignee (row) {
+ if (["check", 'cureCheckTask '].includes(row.taskDefinitionKey)) {// 鏍″
this.formApprove.assignee = row.variables.senior;
- } else if (row.taskDefinitionKey == "programmingTask") {
+ } else if (["programmingTask",'cureProgramTask'].includes(row.taskDefinitionKey)) {// 缂栧埗锛屾牎瀵�
this.formApprove.assignee = row.variables.checker;
} else if (row.taskDefinitionKey == "teamLeaderTask") {
this.formApprove.assignee = row.variables.programmer
} else if (row.taskDefinitionKey == "confirmIsUseableTask") {
this.formApprove.assignee = row.variables.checker
- } else if (row.taskDefinitionKey == "approveTask") {
+ } else if (["approveTask", 'seniorApproveTask'].includes(row.taskDefinitionKey)) {// 楂樺笀瀹℃牳
}
+ },
+ handleAction(row, index) {
+ this.formApprove = {
+ comment: '',
+ approve: 'Y', // 榛樿鍚�
+ }
+ this.approveBox = true;
+ this.row = row
+ this.setAssignee(row);
console.log('handleAction', row, index);
},
handleSubmit(form, done) {
+ if(this.row.taskDefinitionKey === 'programmingTask') {
+ // if(this.applist.length !== 1) {
+ // done();
+ // return this.$message.success('璇烽�夋嫨1涓▼搴�');
+ // }
+ }
approve({
...this.formApprove,
taskId: this.row.taskId,
processInstanceId: this.row.processInstanceId,
- programIds: this.row.taskDefinitionKey === 'programmingTask' ? this.applist.map(v => v.id).join(',') : '',
+ // programIds: this.row.taskDefinitionKey === 'programmingTask' ? this.applist.map(v => v.id).join(',') : '',
}).then(res => {
+ if(res.data.code !== 200) {
+ this.$message.error(res.data.msg);
+ done();
+ return;
+ }
this.$message.success('瀹℃壒鎴愬姛');
this.approveBox = false;
this.onLoad(this.page, this.query);
done();
}).catch(err => {
+ done();
console.error(err);
});
},
--
Gitblit v1.9.3