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

yangys

2025-08-18 d5f64a57677aa427372bde6322bdec0fd5cc105d

 src/views/flowmgr/programexport.vue

@@ -1,7 +1,7 @@
<!--
 * @Date: 2025-06-20 20:48:17
 * @LastEditors: 李喆(开发组) lzhe@yxqiche.com
 * @LastEditTime: 2025-08-11 16:34:15
 * @LastEditors: gaoshp
 * @LastEditTime: 2025-08-17 10:17:27
 * @FilePath: /mdmweb/src/views/flowmgr/programexport.vue
-->
<template>
@@ -88,19 +88,29 @@
                        prop: 'title',
                    },
                    {
                        label: '图号',
                        label: '零组件号',
                        prop: 'drawingNo',
                    },
                    {
                        label: '图号版次',
                        prop: 'drawingNoEdition',
                        label: '工序号',
                        prop: 'processNo',
                    },
                    
                    {
                        label: '工序版次',
                        prop: 'processEdition',
                    },
                    {
                        label: '工序名称',
                        prop: 'processName',
                    },
                    {
                        label: '程序名称',
                        label: '图号版次',
                        prop: 'drawingNoEdition',
                    },
                    
                    {
                        label: '程序包名',
                        prop: 'name',
                        search: true,
                    },
@@ -146,29 +156,40 @@
                        prop: 'title',
                    },
                    {
                        label: '图号',
                        label: '零组件号',
                        prop: 'drawingNo',
                    },
                    {
                        label: '图号版次',
                        prop: 'drawingNoEdition',
                        label: '工序号',
                        prop: 'processNo',
                    },
                    {
                        label: '工序版次',
                        prop: 'processEdition',
                    },
                    {
                        label: '工序名称',
                        prop: 'processName',
                    },
                    {
                        label: '程序名称',
                        label: '图号版次',
                        prop: 'drawingNoEdition',
                    },
                    
                    {
                        label: '程序包名',
                        prop: 'name',
                        search: true,
                    },
                    {
                        label: '通过时间',
                        prop: 'createTime',
                        sortable: true,
                    },
                    {
                        label: '已办时间',
                        prop: 'updateTime',
                        sortable: true,
                    },
                    {
                        label: '通过时间',
@@ -180,6 +201,7 @@
                        valueFormat: 'YYYY-MM-DD HH:mm:ss',
                        searchRange: true,
                        searchSpan: 8,
                        sortable: true,
                    },
                ],
            }
@@ -271,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);