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

lzhe

2025-08-16 4f20f3a30f6f453c0b3ad3425ba82689da2defd4

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

 src/views/basesetting/produceplan.vue

@@ -128,20 +128,7 @@
                        hide: true,
                        display: false,
                    },
                    {
                        label: '专业组长',
                        prop: 'teamLeaderId',
                        type: 'select',
                        span: 24,
                        display: true,
                        filterable:true,
                        dicUrl: `/blade-mdm/flow/flow-user-list?deptId=0`,
                        props: {
                            label: 'name',
                            value: 'id',
                        },
                        rules: [{ required: true, message: '请输入专业组长', trigger: 'blur' }],
                    },
                    
                    {
                        label: '编制（工艺员)',
                        label: '编制',
@@ -173,6 +160,20 @@
                        rules: [{ required: true, message: '请输入校对（工艺员)', trigger: 'blur' }],
                    },
                    {
                        label: '专业组长',
                        prop: 'teamLeaderId',
                        type: 'select',
                        span: 24,
                        display: true,
                        filterable:true,
                        dicUrl: `/blade-mdm/flow/flow-user-list?deptId=0`,
                        props: {
                            label: 'name',
                            value: 'id',
                        },
                        rules: [{ required: true, message: '请输入专业组长', trigger: 'blur' }],
                    },
                    {
                        label: '审核(高师)',
                        label: '审核',
                        prop: 'seniorId',

 src/views/flow/todolist.vue

@@ -294,6 +294,7 @@
                    {
                        label: '发送给',
                        prop: 'newAssigneeId',
                        filterable:true,
                        type: 'select',
                        // dicUrl: `/blade-mdm/flow/flow-user-list?deptId=0`,
                        // dicFlag: true,

 src/views/flowmgr/processQuery.vue

@@ -333,9 +333,9 @@
                    },
                    {
                        label: '流程名称',
                        prop: 'processDefinitionName',
                        prop: '',
                        render: ({ row }) => {
                            return h('p',{'class': 'margin0'}, row?.processDefinitionName)
                            return h('p',{'class': 'margin0'}, row?.variables.myProcessName)
                        }
                    },
                    {
@@ -443,6 +443,13 @@
                            return h('p',{'class': 'margin0'}, row?.variables?.programPackageName || '');
                        }
                    },
                    {
                        label: '偏离单号',
                        prop: '',
                        render: ({ row }) => {
                            return h('p',{'class': 'margin0'}, row?.variables?.deviation || '');
                        }
                    },
                ],
            },
            selectedList: [],