yangys
2025-09-22 b311b3cfee0a4635c236eea6c5870d805a29a160
src/views/flowmgr/programonmachine.vue
@@ -106,7 +106,7 @@
                    {
                        label: '工序版次',
                        prop: 'processEdition',
                        width: 80,
                        width: 82,
                        render: ({ row }) => {
                            return h('span', {}, row?.variables?.processEdition || '');
                        }
@@ -122,20 +122,46 @@
                    {
                        label: '任务车间',
                        prop: 'workshop',
                        width: 80,
                        width: 82,
                        render: ({ row }) => {
                            return h('p',{'class': 'margin0'}, row?.variables?.workshop || '');
                        }
                    },
                    {
                        label: '机床',
                        prop: '',
                        render: ({ row }) => {
                            return h('p',
                                {
                                    attrs: {},
                                    class: {},
                                    style: {},
                                }, row?.variables?.machineCode)
                        },
                        renderForm: ({ row }) => {
                            return h('span', {
                                attrs: {},
                                class: {},
                                style: {},
                            }, row?.variables?.machineCode || '');
                        }
                    },
                    {
                        label: '过程卡号',
                        prop: '',
                        width: 80,
                        width: 82,
                        render: ({ row }) => {
                            return h('p',{'class': 'margin0'}, row?.variables?.processCard || '');
                        },
                    },
               {
                        label: '临时更改单',
                        prop: '',
                        width: 95,
                        render: ({ row }) => {
                            return h('p',{'class': 'margin0'}, row?.variables?.deviation || '');
                        },
                    },
               {
                        label: '产品型号',
                        prop: '',
@@ -157,25 +183,7 @@
                        }
                    },
               
                    {
                        label: '机床',
                        prop: '',
                        render: ({ row }) => {
                            return h('p',
                                {
                                    attrs: {},
                                    class: {},
                                    style: {},
                                }, row?.variables?.machineCode)
                        },
                        renderForm: ({ row }) => {
                            return h('span', {
                                attrs: {},
                                class: {},
                                style: {},
                            }, row?.variables?.machineCode || '');
                        }
                    },
                    {
                        label: '创建时间',
                        prop: 'processCreateTime',
@@ -258,7 +266,7 @@
                ...this.query,
                endTimeBegin: this.query?.endTime?.[0] || undefined,
                endTimeEnd: this.query?.endTime?.[1] || undefined,
                drawingNo: params.drawingNo || '',
                //drawingNo: params.drawingNo || '',
            };
            this.loading = true;
            getList(page.currentPage, page.pageSize, Object.assign(data, params)).then(res => {