From c7a1fa702720dd56f5bcb96002897b24be85270b Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 11 十二月 2023 16:20:49 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

---
 src/views/basic/part/index.vue                           |   20 ++++++++++----------
 src/views/quality/packageinspect/packageInspect-form.vue |    2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/views/basic/part/index.vue b/src/views/basic/part/index.vue
index 9154b53..52582c8 100644
--- a/src/views/basic/part/index.vue
+++ b/src/views/basic/part/index.vue
@@ -190,7 +190,7 @@
             searchInfoType: 'text'
           },
           // 涓�绾у垎绫�
-          {
+         /*  {
             minWidth: '120',
             prop: 'assortment',
             label: '涓�绾у垎绫�',
@@ -227,7 +227,7 @@
             optList: () => {
               return this.getThreeLevelClassification()
             }
-          },
+          }, */
           // 瑙勬牸
           {
             minWidth: '140',
@@ -239,7 +239,7 @@
             searchInfoType: 'text'
           },
           // 鍨嬪彿
-          {
+          /* {
             minWidth: '140',
             prop: 'partModel',
             label: '鍨嬪彿',
@@ -301,7 +301,7 @@
             optList: () => {
               return this.lotTrackingIfsOptions
             }
-          },
+          }, */
           // 鐗堟湰鍙�
           {
             minWidth: '140',
@@ -311,7 +311,7 @@
             isTrue: true,
             isSearch: true,
             searchInfoType: 'text'
-          },
+          }/* ,
           // 璁″垝鏂规硶
           {
             minWidth: '140',
@@ -325,9 +325,9 @@
             optList: () => {
               return this.planningMethodOptions
             }
-          },
+          }, */
           // 鍥惧彿
-          {
+         /*  {
             minWidth: '140',
             prop: 'drawingNumber',
             label: '鍥惧彿',
@@ -355,9 +355,9 @@
             isTrue: true,
             isSearch: true,
             searchInfoType: 'text'
-          },
+          }, */
           // 妫�楠屽憳
-          {
+          /* {
             minWidth: '140',
             prop: 'examiner',
             label: '妫�楠屽憳',
@@ -388,7 +388,7 @@
             isTrue: true,
             isSearch: true,
             searchInfoType: 'text'
-          }
+          } */
         ],
         toolbar: [
           {
diff --git a/src/views/quality/packageinspect/packageInspect-form.vue b/src/views/quality/packageinspect/packageInspect-form.vue
index 3299eb1..891b0dd 100644
--- a/src/views/quality/packageinspect/packageInspect-form.vue
+++ b/src/views/quality/packageinspect/packageInspect-form.vue
@@ -152,7 +152,7 @@
                 </el-table-column>
                 <el-table-column  label="鎿嶄綔">
                     <template>
-                        <el-button type="text" :disabled="resultVal==null" @click="submitSave()" size="small">涓婃姤</el-button>
+                        <el-button type="text" :disabled="resultVal!=null" @click="submitSave()" size="small">涓婃姤</el-button>
                     </template>
                 </el-table-column>
             </el-table>

--
Gitblit v1.9.3