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

lzhe

2025-08-10 08472b4b62d832a3f54183edf7a288897375392d

 src/views/flowmgr/processQuery.vue

@@ -1,7 +1,7 @@
<!--
 * @Date: 2025-06-18 09:17:09
 * @LastEditors: gaoshp
 * @LastEditTime: 2025-07-23 20:38:41
 * @LastEditTime: 2025-08-09 20:55:52
 * @FilePath: /mdmweb/src/views/flowmgr/processQuery.vue
-->
<template>
@@ -80,7 +80,7 @@
                        search: true,
                        searchType: 'select',
                        hide: true,
                        dicUrl: `/blade-mdm/dict/dictionary?code=flow`,
                        dicUrl: `/blade-mdm/system/dict/dictionary?code=flow`,
                        props: {
                            label: 'dictValue',
                            value: 'remark',
@@ -102,7 +102,75 @@
                        search: true,
                        searchType: 'input',
                        hide: true,
                        viewDisplay: false,
                    },
					
               {
                        label: '标题',
                        prop: 'variables.title',
                        width: 150,
                  render: ({ row }) => {
                            return h('p',
                                {
                                    attrs: {},
                                    class: {},
                                    style: {},
                                }, row?.variables?.title)
                        },
                        renderForm: ({ row }) => {
                            return h('span', {
                                attrs: {},
                                class: {},
                                style: {},
                            }, row?.variables?.title || '');
                        }
                    },
               {
                        label: '流程名称',
                        prop: 'processDefinitionName',
                        width: 80,
                    },
               {
                        label: '图号',
                        prop: '',
                        width: 100,
                  render: ({ row }) => {
                            return h('p',
                                {
                                    attrs: {},
                                    class: {},
                                    style: {},
                                }, row?.variables?.drawingNo)
                        },
                        renderForm: ({ row }) => {
                            return h('span', {
                                attrs: {},
                                class: {},
                                style: {},
                            }, row?.variables?.drawingNo || '');
                        }
                    },
               {
                        label: '产品型号',
                        prop: '',
                        width: 100,
                  render: ({ row }) => {
                            return h('p',
                                {
                                    attrs: {},
                                    class: {},
                                    style: {},
                                }, row?.variables?.productModel)
                        },
                        renderForm: ({ row }) => {
                            return h('span', {
                                attrs: {},
                                class: {},
                                style: {},
                            }, row?.variables?.productModel || '');
                        }
                    },
					
                    {
                        label: '机床',
                        prop: '',
@@ -113,12 +181,20 @@
                                    class: {},
                                    style: {},
                                }, row?.variables?.machineCode)
                        },
                        renderForm: ({ row }) => {
                            return h('span', {
                                attrs: {},
                                class: {},
                                style: {},
                            }, row?.variables?.machineCode || '');
                        }
                    },
                    {
                        label: '创建人',
                        prop: 'startUserName',
                    },
                  width: 80,
                    },/*
                    {
                        label: '工序名称',
                        prop: '',
@@ -130,7 +206,7 @@
                                    style: {},
                                }, row?.variables?.processName)
                        }
                    },
                    },*/
                    {
                        label: '创建时间',
                        prop: 'processCreateTime',
@@ -138,6 +214,7 @@
                    {
                        label: '当前节点',
                        prop: 'taskName',
                  width: 90
                    },
                ],
                
@@ -228,7 +305,9 @@
                    type: 'warning',
                })
                    .then(() => {
                        deleteRow({ processInstanceId: row.processInstanceId,id:row.processInstanceId })
                        deleteRow({ processInstanceId: row.processInstanceId,id:row.processInstanceId }).then(res => {
                            this.onLoad(this.page, this.query);
                        })
                    })
            } else if (flag === 1) {
                printRow({ processInstanceId: row.processInstanceId })