From 67da82f0b0c24df5f19bbfcfec63801d9ae902d8 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期三, 13 十二月 2023 16:22:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/technology/structure/index.vue |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/views/technology/structure/index.vue b/src/views/technology/structure/index.vue
index d3a6693..8ceba97 100644
--- a/src/views/technology/structure/index.vue
+++ b/src/views/technology/structure/index.vue
@@ -129,7 +129,7 @@
       customUpload: true,
       uploadInfo: {
         // 鏄惁灞曠ず涓婁紶EXCEL浠ュ強瀵瑰簲鐨剈rl
-        isShow: true,
+        isShow: false,
         url: '/mes/structure/uploadExt'
       },
       prelang: 'structure',
@@ -185,19 +185,19 @@
             searchInfoType: 'text'
           },
           // 缁撴瀯绫诲瀷
-          {
-            minWidth: '120',
-            prop: 'bomTypeDb',
-            label: '缁撴瀯绫诲瀷',
-            sort: true,
-            isTrue: true,
-            isSearch: true,
-            searchInfoType: 'select',
-            formatter: this.formatBomTypeDbType,
-            optList: () => {
-              return this.bomTypeDbOptions
-            }
-          },
+          // {
+          //   minWidth: '120',
+          //   prop: 'bomTypeDb',
+          //   label: '缁撴瀯绫诲瀷',
+          //   sort: true,
+          //   isTrue: true,
+          //   isSearch: true,
+          //   searchInfoType: 'select',
+          //   formatter: this.formatBomTypeDbType,
+          //   optList: () => {
+          //     return this.bomTypeDbOptions
+          //   }
+          // },
           // 鏇夸唬
           // {
           //   minWidth: '120',
@@ -235,7 +235,7 @@
             }
           },
           // 鏄惁涓洪粯璁ょ粨鏋�
-          {
+          /* {
             minWidth: '120',
             prop: 'master',
             label: '榛樿缁撴瀯',
@@ -249,7 +249,7 @@
             formatter: (row, column, cellValue) => {
               return cellValue == true ? '鏄�' : '鍚�'
             }
-          },
+          }, */
           // 鎻忚堪
           {
             minWidth: '120',

--
Gitblit v1.9.3