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

yangys

2025-08-17 cafa9ae77da5ae18db0336a353a79a639b7cc299

 src/views/flowmgr/programexport.vue

@@ -88,17 +88,27 @@
                        prop: 'title',
                    },
                    {
                        label: '图号',
                        label: '零组件号',
                        prop: 'drawingNo',
                    },
                    {
                        label: '图号版次',
                        prop: 'drawingNoEdition',
                        label: '工序号',
                        prop: 'processNo',
                    },
                    
                    {
                        label: '工序版次',
                        prop: 'processEdition',
                    },
                    {
                        label: '工序名称',
                        prop: 'processName',
                    },
                    {
                        label: '图号版次',
                        prop: 'drawingNoEdition',
                    },
                    
                    {
                        label: '程序名称',
                        prop: 'name',
@@ -146,17 +156,26 @@
                        prop: 'title',
                    },
                    {
                        label: '图号',
                        label: '零组件号',
                        prop: 'drawingNo',
                    },
                    {
                        label: '图号版次',
                        prop: 'drawingNoEdition',
                        label: '工序号',
                        prop: 'processNo',
                    },
                    {
                        label: '工序版次',
                        prop: 'processEdition',
                    },
                    {
                        label: '工序名称',
                        prop: 'processName',
                    },
                    {
                        label: '图号版次',
                        prop: 'drawingNoEdition',
                    },
                    
                    {
                        label: '程序名称',
                        prop: 'name',
@@ -274,7 +293,7 @@
                    {},
                    {ids: this.selection.map(item => item.id)},
                ).then(res => {
                //console.log('status='+res.status)
                console.log('status='+res.status)
               if(res.status == 200){
                  //console.log(res.data);