Merge remote-tracking branch 'origin/master'

zss

2023-12-11 c880739ec4cd5ede33b31eb98ad5f7628ea288e5

 src/views/quality/finishedProductInspection/index.vue

@@ -84,7 +84,7 @@
                        },
                        {
                            minWidth: '120',
                            prop: 'orderNumber',
                            prop: 'productNo',
                            label: '报工单号',
                            isTrue: true,
                            isSearch: true,
@@ -92,6 +92,14 @@
                        },
                        {
                            minWidth: '120',
                            prop: 'orderNumber',
                            label: '订单号',
                            isTrue: true,
                            isSearch: true,
                            searchInfoType: 'text'
                        },
                        {
                            minWidth: '120',
                            prop: 'customerName',
                            label: '客户名称',
                            isTrue: true,