Merge branch 'master' of http://www.beijingsoft.cn:9090/r/mdmweb

lzhe

2025-08-10 08472b4b62d832a3f54183edf7a288897375392d

Merge branch 'master' of http://www.beijingsoft.cn:9090/r/mdmweb

 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个radio文本 通过（approve=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) {

 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 || '');
                        }
                    },
                    {