From 0c46dca0eaf58a1e73cc36682cce3ae4f066874d Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 25 十二月 2023 14:00:12 +0800
Subject: [PATCH] 	modified:   src/api/quality/rawMaterial.js 	modified:   src/views/quality/packageinspect/index.vue 	modified:   src/views/quality/rawMaterial/rawMaterial-form.vue 	modified:   vue.config.js

---
 src/views/quality/packageinspect/index.vue |   34 +++++++++++++++-------------------
 1 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/src/views/quality/packageinspect/index.vue b/src/views/quality/packageinspect/index.vue
index 9e58f4b..3cc33c5 100644
--- a/src/views/quality/packageinspect/index.vue
+++ b/src/views/quality/packageinspect/index.vue
@@ -74,7 +74,7 @@
                 // 鏍囬
                 column: [
                     {
-                        minWidth: '150',
+                        minWidth: '180',
                         prop: 'packInsNo',
                         label: '鍖呰妫�楠岀紪鍙�',
                         isTrue: true,
@@ -83,7 +83,7 @@
                         render: { fun: this.addOrUpdateHandle }
                     },
                     {
-                        minWidth: '150',
+                        minWidth: '180',
                         prop: 'packageNo',
                         label: '鍖呰缂栫爜',
                         isTrue: true,
@@ -91,7 +91,7 @@
                         searchInfoType: 'text'
                     },
                     {
-                        minWidth: '150',
+                        minWidth: '180',
                         prop: 'contractNo',
                         label: '鍚堝悓鍙�',
                         isTrue: true,
@@ -99,7 +99,7 @@
                         searchInfoType: 'text'
                     },
                     {
-                        minWidth: '150',
+                        minWidth: '180',
                         prop: 'projectName',
                         label: '椤圭洰鍚嶇О',
                         isTrue: true,
@@ -107,7 +107,7 @@
                         searchInfoType: 'text'
                     },
                     {
-                        minWidth: '150',
+                        minWidth: '180',
                         prop: 'customerName',
                         label: '瀹㈡埛鍚嶇О',
                         isTrue: true,
@@ -115,7 +115,7 @@
                         searchInfoType: 'text'
                     },
                     {
-                        minWidth: '150',
+                        minWidth: '180',
                         prop: 'createTime',
                         label: '鎶ユ鏃ユ湡',
                         isTrue: true,
@@ -125,7 +125,7 @@
                         formatter: this.formatDateTime,
                     },
                     {
-                        minWidth: '150',
+                        minWidth: '180',
                         prop: 'createUser',
                         label: '鎶ユ浜�',
                         isTrue: true,
@@ -133,20 +133,15 @@
                         searchInfoType: 'text'
                     },
                     {
-                        minWidth: '150',
+                        minWidth: '200',
                         prop: 'result',
                         label: '缁撹',
                         isTrue: true,
                         isSearch: true,
+                        searchInfoType: 'text'
                     },
                 ],
-                toolbar: [
-                    // {
-                    //     text: '鏂板',
-                    //     type: 'primary',
-                    //     fun: this.addOrUpdateHandle
-                    // },
-                ],
+                toolbar: [],
                 operator: [
                 {
                     text: '浣滃簾',
@@ -157,8 +152,8 @@
                 operatorConfig: {
                 fixed: 'right',
                 label: '鎿嶄綔',
-                width: 120,
-                minWidth: 120
+                width: 100,
+                minWidth: 100
                 },
             },
         }
@@ -201,8 +196,9 @@
             this.$router.push({
                 name: 'packageInspectForm',
                 query: { 
-                    id: row == null ? null : row.id,
-                 }
+                    id: row == null ? null : row.id
+                 },
+                 params:{resultVal : row.result=='' ? null : row.result}
             })
         },
         formatResult(row, column, cellValue){

--
Gitblit v1.9.3