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/flowmgr/processQuery.vue | 33 ++++++++++
src/views/flow/todolist.vue | 110 ++++++++++++++++++++++++------------
2 files changed, 104 insertions(+), 39 deletions(-)
diff --git a/src/views/flow/todolist.vue b/src/views/flow/todolist.vue
index d44b60d..df8b663 100644
--- a/src/views/flow/todolist.vue
+++ b/src/views/flow/todolist.vue
@@ -5,7 +5,10 @@
@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">
@@ -293,33 +296,23 @@
// });
// },
'formApprove.approve'(val) {
- if (val === 'Y' && ["approveTask", 'seniorApproveTask'].includes(this.row.taskDefinitionKey)) {// 楂樺笀
- this.optionApprove.column[1].disabled = true;
- this.formApprove.assignee = ''; // 濡傛灉鏄�氳繃锛屽垯榛樿鎸囨淳缁欒嚜宸�
- } else if(val === 'Y'){
- this.setAssignee(this.row);
- } else if(val === 'N') {
- this.formApprove.assignee = ''
- // this.formApprove.assignee = row.variables.senior;
- }
- 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; // 闅愯棌宸ュ簭鐗堟
- }
+ 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 => {
@@ -329,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;
},
@@ -368,19 +417,6 @@
});
done();
},
- setAssignee (row) {
- 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)) {// 楂樺笀瀹℃牳
-
- }
- },
handleAction(row, index) {
this.formApprove = {
comment: '',
@@ -388,7 +424,7 @@
}
this.approveBox = true;
this.row = row
- this.setAssignee(row);
+ this.setAssignee(row, this.formApprove.approve);
console.log('handleAction', row, index);
},
handleSubmit(form, done) {
diff --git a/src/views/flowmgr/processQuery.vue b/src/views/flowmgr/processQuery.vue
index d0b417e..2a15b7a 100644
--- a/src/views/flowmgr/processQuery.vue
+++ b/src/views/flowmgr/processQuery.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2025-06-18 09:17:09
* @LastEditors: gaoshp
- * @LastEditTime: 2025-07-23 22:20:42
+ * @LastEditTime: 2025-08-09 20:55:52
* @FilePath: /mdmweb/src/views/flowmgr/processQuery.vue
-->
<template>
@@ -102,11 +102,12 @@
search: true,
searchType: 'input',
hide: true,
+ viewDisplay: false,
},
{
label: '鏍囬',
- prop: '',
+ prop: 'variables.title',
width: 150,
render: ({ row }) => {
return h('p',
@@ -115,6 +116,13 @@
class: {},
style: {},
}, row?.variables?.title)
+ },
+ renderForm: ({ row }) => {
+ return h('span', {
+ attrs: {},
+ class: {},
+ style: {},
+ }, row?.variables?.title || '');
}
},
{
@@ -133,6 +141,13 @@
class: {},
style: {},
}, row?.variables?.drawingNo)
+ },
+ renderForm: ({ row }) => {
+ return h('span', {
+ attrs: {},
+ class: {},
+ style: {},
+ }, row?.variables?.drawingNo || '');
}
},
{
@@ -146,6 +161,13 @@
class: {},
style: {},
}, row?.variables?.productModel)
+ },
+ renderForm: ({ row }) => {
+ return h('span', {
+ attrs: {},
+ class: {},
+ style: {},
+ }, row?.variables?.productModel || '');
}
},
@@ -159,6 +181,13 @@
class: {},
style: {},
}, row?.variables?.machineCode)
+ },
+ renderForm: ({ row }) => {
+ return h('span', {
+ attrs: {},
+ class: {},
+ style: {},
+ }, row?.variables?.machineCode || '');
}
},
{
--
Gitblit v1.9.3