From 75e035a10a0faeff6b2ec4b9fcbf98d1536274f2 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期四, 07 十二月 2023 10:57:15 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

---
 src/views/technology/routing/index.vue |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/technology/routing/index.vue b/src/views/technology/routing/index.vue
index 7b31528..e3d7d29 100644
--- a/src/views/technology/routing/index.vue
+++ b/src/views/technology/routing/index.vue
@@ -196,7 +196,7 @@
             noShowTip: false
           },
           // 鏄惁涓轰富宸ヨ壓
-          {
+          /* {
             minWidth: '120',
             prop: 'master',
             label: '涓诲伐鑹�',
@@ -210,7 +210,7 @@
             formatter: (row, column, cellValue) => {
               return cellValue == true ? '鏄�' : '鍚�'
             }
-          },
+          }, */
           // 鐘舵��
           {
             minWidth: '120',
@@ -300,7 +300,7 @@
             searchInfoType: 'datetimerange'
           },
           // 鏇夸唬
-          {
+          /* {
             minWidth: '120',
             prop: 'alternativeNo',
             label: '鏇夸唬',
@@ -308,9 +308,9 @@
             isTrue: true,
             isSearch: true,
             searchInfoType: 'text'
-          },
+          }, */
           // 鏇夸唬鎻忚堪
-          {
+         /*  {
             minWidth: '120',
             prop: 'alternativeDesc',
             label: '鏇夸唬鎻忚堪',
@@ -318,7 +318,7 @@
             isTrue: true,
             isSearch: true,
             searchInfoType: 'text'
-          },
+          }, */
           // 鏄惁宸插悓姝ヨ嚦IFS
           // {
           //   minWidth: '120',

--
Gitblit v1.9.3