Merge remote-tracking branch 'origin/master'

王震

2023-12-13 67da82f0b0c24df5f19bbfcfec63801d9ae902d8

 src/views/quality/finishedProductInspection/index.vue

@@ -84,8 +84,16 @@
                        },
                        {
                            minWidth: '120',
                            prop: 'orderNumber',
                            prop: 'productNo',
                            label: '报工单号',
                            isTrue: true,
                            isSearch: true,
                            searchInfoType: 'text'
                        },
                        {
                            minWidth: '120',
                            prop: 'orderNumber',
                            label: '订单号',
                            isTrue: true,
                            isSearch: true,
                            searchInfoType: 'text'
@@ -184,12 +192,12 @@
                        text: '新增',
                        type: 'primary',
                        fun: this.addOrUpdateHandle
                    }, */
                    }, 
                    {
                        text: '导出',
                        type: 'primary',
                        fun: this.exportExcel
                    }
                    }*/
                    ],
                    operator: [{
                        text: '打印',