From c880739ec4cd5ede33b31eb98ad5f7628ea288e5 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 11 十二月 2023 17:41:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/quality/finishedProductInspection/index.vue |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/views/quality/finishedProductInspection/index.vue b/src/views/quality/finishedProductInspection/index.vue
index ac81d80..595bedd 100644
--- a/src/views/quality/finishedProductInspection/index.vue
+++ b/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'
@@ -222,7 +230,6 @@
         watch:{
         printFormData(newVal){
             if(newVal){
-                // console.log("pData鍙樺寲--",newVal);
                 this.printFormData = newVal
             }
         }
@@ -257,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: '鍙栨秷',

--
Gitblit v1.9.3