From 08472b4b62d832a3f54183edf7a288897375392d Mon Sep 17 00:00:00 2001
From: lzhe <181968431@qq.com>
Date: 星期日, 10 八月 2025 00:23:29 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/mdmweb
---
src/views/flow/todolist.vue | 176 +++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 136 insertions(+), 40 deletions(-)
diff --git a/src/views/flow/todolist.vue b/src/views/flow/todolist.vue
index f03eda2..df8b663 100644
--- a/src/views/flow/todolist.vue
+++ b/src/views/flow/todolist.vue
@@ -5,12 +5,14 @@
@size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad"
@selection-change="selectionTransferTask">
<template #menu-left>
- <el-button type="primary" plain @click="reassign">閲嶆柊鎸囨淳
+ <el-button type="primary" plain @click="reassign">閲嶆柊鎸囨淳</el-button>
+ <el-button type="primary" v-if="permission.manual_dispatch" plain @click="reassign">鎵嬪姩娲惧伐
+ </el-button>
+ <el-button type="primary" v-if="permission.auto_dispatch" plain @click="reassign">鑷姩娲惧伐
</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>
@@ -43,7 +45,10 @@
TodolistRightTop
},
data() {
+ let rejectText = '椹冲洖';//+this.row.categoryName;
+ console.log(this,'ttt');
return {
+
applist: [],
assigneeData: [],
row: {},
@@ -51,6 +56,7 @@
formApprove: {
comment: '',
approve: '', // 榛樿鍚屾剰
+ assignee: ''
},
optionApprove: {
labelWidth: 100,
@@ -63,7 +69,7 @@
span: 24,
dicData: [
{ label: '閫氳繃', value: 'Y' },
- { label: '椹冲洖', value: 'N' },
+ { label: rejectText, value: 'N' },
],
rules: [{ required: true, message: '璇烽�夋嫨瀹℃壒缁撴灉', trigger: 'blur' }],
},
@@ -77,6 +83,7 @@
label: 'name',
value: 'id',
},
+ filterable: true,
span: 24,
disabled: false,
dicData: [
@@ -85,11 +92,33 @@
// rules: [{ required: true, message: '璇烽�夋嫨涓嬩竴瀹℃壒鐢ㄦ埛', trigger: 'blur' }],
},
{
+ label: '宸ュ簭鐗堟',
+ prop: 'processEdition',
+ type: 'input',
+ span: 24,
+ // disabled: true,
+ display: false,// 闅愯棌鏄剧ず
+ // rules: [{ required: true, message: '璇烽�夋嫨涓嬩竴瀹℃壒鐢ㄦ埛', trigger: 'blur' }],
+ },
+ {
label: '澶囨敞',
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 +131,7 @@
query: {},
loading: true,
option: {
+ rowKey: "taskId",
addBtn: false,
editBtn: false,
delBtn: false,
@@ -137,16 +167,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 +232,7 @@
{
label: '鏂囦欢',
width: 200,
- prop: '',
+ prop: 'file',
},
{
label: '鍒拌揪鏃堕棿',
@@ -253,24 +296,23 @@
// });
// },
'formApprove.approve'(val) {
- if (val === 'Y' && this.row.taskDefinitionKey === 'approveTask') {
- this.optionApprove.column[1].disabled = true;
- this.formApprove.assignee = ''; // 濡傛灉鏄�氳繃锛屽垯榛樿鎸囨淳缁欒嚜宸�
- } else {
- this.optionApprove.column[1].disabled = false;
- }
+ this.setAssignee(this.row, val);
+ // if(val === 'Y' && ['confirmIsUseableTask'].includes(this.row.taskDefinitionKey) && this.row.variables.isProcessEditionSame=='N') {
+ // // this.optionApprove.column[2].display = true; // 鏄剧ず宸ュ簭鐗堟
+ // } else {
+ // this.optionApprove.column[2].display = false; // 闅愯棌宸ュ簭鐗堟
+ // }
+
},
},
computed: {
...mapGetters(['userInfo', 'permission']),
- // permissionList() {
- // return {
- // addBtn: this.validData(this.permission.menu_add, false),
- // viewBtn: this.validData(this.permission.menu_view, false),
- // delBtn: this.validData(this.permission.menu_delete, false),
- // editBtn: this.validData(this.permission.menu_edit, false),
- // };
- // },
+ permissionList() {
+ return {
+ manual_dispatch: this.validData(this.permission.manual_dispatch, false),
+ auto_dispatch: this.validData(this.permission.auto_dispatch, false),
+ };
+ },
},
mounted() {
getAssignee().then(res => {
@@ -280,6 +322,62 @@
})
},
methods: {
+ // 璁剧疆瀹℃壒缁撴灉鐨勭姸鎬�
+ setApproveBtn () {
+ // 1.瀹℃壒鐣岄潰radio鏂囨湰淇敼锛屾櫘閫氳妭鐐圭殑2涓猺adio鏂囨湰 閫氳繃锛坅pprove=Y),涓嶉�氳繃(鐜板湪鐨勯┏鍥�)(approve=N)
+ this.optionApprove.column[0].dicData = [
+ { label: '閫氳繃', value: 'Y' },
+ { label: '涓嶉�氳繃', value: 'N' },
+ ];
+ switch (this.row.taskDefinitionKey) {
+ case 'teamLeaderTask': // 浠诲姟娲惧伐
+ case 'cureProgramTask': // 鍥哄寲缂栧埗
+ this.optionApprove.column[0].dicData = [
+ { label: '閫氳繃', value: 'Y' },
+ { label: '缁撴潫', value: 'N' },
+ ];
+ break;
+ case 'confirmIsUseableTask': // 妫�鏌ョ▼搴忔槸鍚﹀彲鐢�
+ this.optionApprove.column[0].dicData = [
+ { label: '閫氳繃', value: 'Y' },
+ { label: '涓嶉�氳繃', value: 'N' },
+ { label: '椹冲洖', value: 'R' },
+ ];
+ break;
+ case 'seniorApproveTask': // 楂樺笀瀹℃牳
+ case 'approveTask': // 楂樺笀瀹℃牳
+
+ default:
+ this.optionApprove.column[0].dicData = [
+ { label: '閫氳繃', value: 'Y' },
+ { label: '涓嶉�氳繃', value: 'N' },
+ ];
+ break;
+ }
+ },
+ setAssignee (row, approve) {
+ if (approve === 'Y') {
+ if (["check", 'cureCheckTask '].includes(row.taskDefinitionKey)) {// 鏍″
+ this.formApprove.assignee = row.variables.senior;
+ } 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 (["approveTask", 'seniorApproveTask'].includes(row.taskDefinitionKey)) {// 楂樺笀瀹℃牳
+ this.optionApprove.column[1].disabled = true;
+ this.formApprove.assignee = ''; // 濡傛灉鏄�氳繃锛屽垯榛樿鎸囨淳缁欒嚜宸�
+ }
+ } else if(approve === 'N'){
+ this.formApprove.assignee = ''
+ if (["approveTask", 'seniorApproveTask'].includes(row.taskDefinitionKey)) {// 楂樺笀瀹℃牳
+ this.optionApprove.column[1].disabled = true;
+ this.formApprove.assignee = row.varables.assignee; // 濡傛灉鏄�氳繃锛屽垯榛樿鎸囨淳缁欒嚜宸�
+ }
+ }
+
+ },
selectionTransferTask(list) {
this.transferTaskSelection = list;
},
@@ -310,9 +408,11 @@
this.reassignBox = false;
this.$refs?.reassginform?.resetForm();
this.onLoad(this.page, this.query);
+ done()
}).catch(err => {
console.error(err);
+ done()
})
});
done();
@@ -320,41 +420,37 @@
handleAction(row, index) {
this.formApprove = {
comment: '',
- approve: '', // 榛樿鍚�
+ approve: 'Y', // 榛樿鍚�
}
this.approveBox = true;
this.row = row
- if (row.taskDefinitionKey == "check") {
- this.formApprove.assignee = row.variables.senior;
- } else if (row.taskDefinitionKey == "programmingTask") {
- 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") {
-
- }
+ this.setAssignee(row, this.formApprove.approve);
console.log('handleAction', row, index);
},
handleSubmit(form, done) {
if(this.row.taskDefinitionKey === 'programmingTask') {
- if(this.applist.length !== 1) {
- done();
- return this.$message.success('璇烽�夋嫨1涓▼搴�');
- }
+ // 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