Merge remote-tracking branch 'origin/master'

zss

2023-12-11 c880739ec4cd5ede33b31eb98ad5f7628ea288e5

 src/views/quality/finishedProductInspection/index.vue

@@ -84,6 +84,14 @@
                        },
                        {
                            minWidth: '120',
                            prop: 'productNo',
                            label: '报工单号',
                            isTrue: true,
                            isSearch: true,
                            searchInfoType: 'text'
                        },
                        {
                            minWidth: '120',
                            prop: 'orderNumber',
                            label: '订单号',
                            isTrue: true,
@@ -107,6 +115,14 @@
                            isTrue: true,
                            isSearch: true,
                            searchInfoType: 'text',
                        },
                        {
                            minWidth: '120',
                            prop: 'outBatchNo',
                            label: '批次号',
                            isTrue: true,
                            isSearch: true,
                            searchInfoType: 'text'
                        },
                        {
                            minWidth: '120',
@@ -172,11 +188,11 @@
                        },
                    ],
                    toolbar: [
                    {
                    /* {
                        text: '新增',
                        type: 'primary',
                        fun: this.addOrUpdateHandle
                    },
                    }, */
                    {
                        text: '导出',
                        type: 'primary',
@@ -214,7 +230,6 @@
        watch:{
        printFormData(newVal){
            if(newVal){
                // console.log("pData变化--",newVal);
                this.printFormData = newVal
            }
        }
@@ -249,13 +264,11 @@
            exportExcel(){
                let queryParam=this.$refs.finishedProduct.getQueryParam();
                delete queryParam.criteria
                // console.log(queryParam);
                exportExaminationProducts(queryParam).then((res)=>{
                    transform(res)
                })
            },
         deleteHandle(row){
            // console.log(row.id)
            this.$confirm('确认删除该数据吗？', '提示', {
            confirmButtonText: '确定',
            cancelButtonText: '取消',
@@ -277,6 +290,8 @@
               name: 'finishedProductForm',
               query: { 
                        id: row == null ? null : row.id,
                    },
                    params: {
                        resultVal: row == null ? null : row.result 
                    }
            })