From ad2437550eb0c8f3c3c8736df1a38a713f920ec2 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期五, 15 十二月 2023 10:13:40 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

---
 src/views/warehouse/stock/index.vue |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/views/warehouse/stock/index.vue b/src/views/warehouse/stock/index.vue
index c95ee8d..9416a88 100644
--- a/src/views/warehouse/stock/index.vue
+++ b/src/views/warehouse/stock/index.vue
@@ -11,13 +11,13 @@
         ref="warehouseStockTable"
       >
         <template #toolbar>
-          <el-button
+          <!-- <el-button
             v-if="permissions.warehouse_stock_scm"
             @click="pushScm()"
             type="primary"
             style="margin-left:10px;"
             >鎴愬搧鎺ㄩ�丼CM
-          </el-button>
+          </el-button> -->
         </template>
       </ttable>
       <!-- 鍒涘缓涓荤敓浜ц鍒� -->
@@ -65,7 +65,7 @@
       multipleSelection: [],
       uploadInfo: {
         // 鏄惁灞曠ず涓婁紶EXCEL浠ュ強瀵瑰簲鐨剈rl
-        isShow: true,
+        isShow: false,
         url: '/mes/stock/upload'
       },
       prelang: 'operation',
@@ -161,7 +161,7 @@
             isSearch: true,
             searchInfoType: 'text'
           },
-          {
+         /*  {
             width: '100',
             minWidth: '100',
             prop: 'partBatchNo',
@@ -220,7 +220,7 @@
             isTrue: true,
             isSearch: true,
             searchInfoType: 'text'
-          },
+          }, */
           {
             width: '100',
             minWidth: '100',
@@ -261,7 +261,7 @@
             isSearch: true,
             searchInfoType: 'text'
           },
-          {
+         /*  {
             width: '100',
             minWidth: '100',
             prop: 'reserveQuantity',
@@ -270,7 +270,7 @@
             isTrue: true,
             isSearch: true,
             searchInfoType: 'text'
-          },
+          }, */
           {
             width: '100',
             minWidth: '120',
@@ -291,7 +291,7 @@
             isSearch: true,
             searchInfoType: 'text'
           },
-          {
+          /* {
             width: '100',
             minWidth: '120',
             prop: 'sstockQuantity',
@@ -320,8 +320,8 @@
             isTrue: true,
             isSearch: true,
             searchInfoType: 'text'
-          },
-          {
+          }, */
+          /* {
             minWidth: '100',
             prop: 'status',
             label: '鐘舵��',
@@ -329,11 +329,11 @@
             isTrue: true,
             isSearch: true,
             searchInfoType: 'text'
-          },
+          }, */
           {
             minWidth: '100',
             prop: 'ifsBatchNo',
-            label: 'IFS鎵规鍙�',
+            label: '鎵规鍙�',
             sort: true,
             isTrue: true,
             isSearch: true,
@@ -350,7 +350,7 @@
           }
         ],
         toolbar: [
-          {
+          /* {
             text: '绉诲簱',
             type: 'primary',
             fun: this.moveStock
@@ -369,7 +369,7 @@
             text: '鎴愬搧鏍囩2',
             type: 'primary',
             fun: this.warehousingSmalllPrint
-          }
+          } */
         ]
       },
       addOrUpdateVisible: false,

--
Gitblit v1.9.3