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

yangys

2025-08-17 cafa9ae77da5ae18db0336a353a79a639b7cc299

 src/views/flowmgr/processQuery1.vue

@@ -96,15 +96,15 @@
                dialogClickModal: false,
                column: [
                    {
                        label: '流程类型',
                        prop: 'processDefinitionKey',
                        label: '流程名称',
                        prop: 'myProcessName',
                        search: true,
                        searchType: 'select',
                        hide: true,
                        dicUrl: `/blade-mdm/system/dict/dictionary?code=flow`,
                        dicUrl: `/blade-system/dict-biz/dictionary?code=process_name`,
                        props: {
                            label: 'dictValue',
                            value: 'remark',
                            value: 'dictValue',
                        },
                    },
                    {
@@ -310,12 +310,12 @@
                labelWidth: 100,
                span: 8,
                column: [
                    {
                        label: '流程类型',
                        prop: 'processDefinitionKey',
                     {
                        label: '流程名称',
                        prop: '',
                        render: ({ row }) => {
                            return h('p',{'class': 'margin0'}, row?.processDefinitionKey)
                        },
                            return h('p',{'class': 'margin0'}, row?.variables.myProcessName)
                        }
                    },
                    {
                        label: '创建时间',
@@ -331,13 +331,7 @@
                            return h('p',{'class': 'margin0'}, row?.variables?.title)
                        }
                    },
                    {
                        label: '流程名称',
                        prop: '',
                        render: ({ row }) => {
                            return h('p',{'class': 'margin0'}, row?.variables.myProcessName)
                        }
                    },
                   
                    {
                        label: '工艺版次',
                        prop: 'variables.craftEdition',
@@ -640,7 +634,7 @@
                createTimeBegin: params.createTimeBegin || undefined,
                createTimeEnd: params.createTimeEnd || undefined,
                keyword: params.keyword || undefined,
                processDefinitionKey: params.processDefinitionKey || undefined
                myProcessName: params.myProcessName || undefined
            }
            this.query = data
            this.onLoad(this.page, data);
@@ -654,7 +648,7 @@
                createTimeBegin: params.createTimeBegin,
                createTimeEnd: params.createTimeEnd,
                keyword: params.keyword || '',
                processDefinitionKey: params.processDefinitionKey || ''
                myProcessName: params.myProcessName || ''
            }
            this.onLoad(this.page, data);
            done();
@@ -678,7 +672,7 @@
                createTimeBegin: params.createTimeBegin,
                createTimeEnd: params.createTimeEnd,
                keyword: params.keyword || '',
                processDefinitionKey: params.processDefinitionKey || ''
                myProcessName: params.myProcessName || ''
            };
            this.loading = true;
            getList(page.currentPage, page.pageSize, Object.assign(data, params)).then(res => {