Merge remote-tracking branch 'origin/master'

zss

2023-12-09 2aae6733da1982cf560bf5bbf8c8a102ca3feee3

 src/views/quality/finishedProductInspection/index.vue

@@ -37,7 +37,7 @@
    import { transform } from '@/util/fileTransform'
    import printTemplate from './finishedProducter-print.vue'
    import PrintJS from 'print-js'
import { title } from 'process'
    import { title } from 'process'
   export default {
      components: {
         finishedProductInspectionAdd,
@@ -85,7 +85,7 @@
                        {
                            minWidth: '120',
                            prop: 'orderNumber',
                            label: '订单号',
                            label: '报工单号',
                            isTrue: true,
                            isSearch: true,
                            searchInfoType: 'text'
@@ -107,6 +107,14 @@
                            isTrue: true,
                            isSearch: true,
                            searchInfoType: 'text',
                        },
                        {
                            minWidth: '120',
                            prop: 'outBatchNo',
                            label: '批次号',
                            isTrue: true,
                            isSearch: true,
                            searchInfoType: 'text'
                        },
                        {
                            minWidth: '120',
@@ -172,11 +180,11 @@
                        },
                    ],
                    toolbar: [
                    {
                    /* {
                        text: '新增',
                        type: 'primary',
                        fun: this.addOrUpdateHandle
                    },
                    }, */
                    {
                        text: '导出',
                        type: 'primary',