From 191d718d5d4b8e8d52dfbbd8b86cfe867d15dd4b Mon Sep 17 00:00:00 2001
From: ldj_willow <ldj_willow@163.com>
Date: Mon, 24 Oct 2022 09:52:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/org/nl/wms/wms.xls          | Bin 247808 -> 247808 bytes
 .../src/views/wms/st/ysa/inventory.vue        |  20 ++++--------------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls b/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls
index d756b5e9fa3630b97accb411570c9eb136315283..1cd0d4acf152b7b74eaaf4a39e0c93f594bb6832 100644
GIT binary patch
delta 31
lcmZpez~3-|e?txn%ZG>YJDLkv+6!11ftYD~0Sohl!vMuY3%mdT

delta 31
lcmZpez~3-|e?txn%K_HyZOsKN?FB51K+LqgfQ5O&VF0ry3f2Gs

diff --git a/lms/nladmin-ui/src/views/wms/st/ysa/inventory.vue b/lms/nladmin-ui/src/views/wms/st/ysa/inventory.vue
index c29f00d..9f0a172 100644
--- a/lms/nladmin-ui/src/views/wms/st/ysa/inventory.vue
+++ b/lms/nladmin-ui/src/views/wms/st/ysa/inventory.vue
@@ -198,15 +198,7 @@
         <el-table-column prop="pcsn" label="批次" />
         <el-table-column prop="ivt_qty" label="库存数" />
         <el-table-column prop="instorage_time" label="入库时间" />
-        <el-table-column prop="ext_code" label="外部编码" />
         <el-table-column prop="point_status_name" label="点位状态" />
-        <el-table-column prop="vehicle_type" label="托盘类型" min-width="100">
-          <template slot-scope="scope">
-            {{ dict.label.vehicle_type[scope.row.vehicle_type] }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="standing_time" label="静置时间(min)" min-width="120"/>
-        <el-table-column prop="remark" label="备注" />
         <el-table-column prop="lock_type" label="锁定类型" >
           <template slot-scope="scope">
             {{ dict.label.d_lock_type[scope.row.lock_type] }}
@@ -217,17 +209,13 @@
             {{ scope.row.is_used=='1' ? '是' : '否' }}
           </template>
         </el-table-column>
-        <el-table-column prop="update_optname" label="修改人" />
-        <el-table-column prop="update_time" label="修改时间" min-width="150" show-overflow-tooltip />
-        <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
+        <el-table-column prop="vehicle_type" label="托盘类型" min-width="100">
           <template slot-scope="scope">
-            <udOperation
-              :data="scope.row"
-              :permission="permission"
-              :is-visiable-del="false"
-            />
+            {{ dict.label.vehicle_type[scope.row.vehicle_type] }}
           </template>
         </el-table-column>
+        <el-table-column prop="vehicle_code" label="托盘号" />
+        <el-table-column prop="standing_time" label="静置时间(min)" min-width="120"/>
       </el-table>
       <!--分页组件-->
       <pagination />