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/plan/masterproductionschedule/index.vue |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/plan/masterproductionschedule/index.vue b/src/views/plan/masterproductionschedule/index.vue
index 97410ce..02c064d 100644
--- a/src/views/plan/masterproductionschedule/index.vue
+++ b/src/views/plan/masterproductionschedule/index.vue
@@ -411,7 +411,7 @@
             isSearch: true,
             searchInfoType: 'text'
           },
-          {
+          /* {
             minWidth: '140',
             prop: 'inventoryReservedQuantity',
             label: '搴撳瓨棰勭暀鏁伴噺',
@@ -419,8 +419,8 @@
             isTrue: true,
             isSearch: false,
             searchInfoType: 'text'
-          },
-          {
+          }, */
+          /* {
             minWidth: '140',
             prop: 'outsourcingNumber',
             label: '濮斿鏁伴噺',
@@ -428,7 +428,7 @@
             isTrue: true,
             isSearch: false,
             searchInfoType: 'text'
-          },
+          }, */
           {
             minWidth: '140',
             prop: 'manufacturingQuantity',
@@ -552,7 +552,7 @@
             isTrue: true,
             isSearch: true,
             searchInfoType: 'text'
-          },
+          }/* ,
           {
             minWidth: '140',
             prop: 'outerColor',
@@ -588,7 +588,7 @@
             isTrue: true,
             isSearch: true,
             searchInfoType: 'text'
-          }
+          } */
         ],
         toolbar: [],
         operator: [

--
Gitblit v1.9.3