From 0afeceec8035cafc01f32cd527ab828ead07ed2d Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Tue, 13 Dec 2022 14:19:00 +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/ext/wql/QCRM_001.wql             | 3 +++
 lms/nladmin-ui/src/views/wms/basedata/st/struct/index.vue     | 2 +-
 lms/nladmin-ui/src/views/wms/sch/point/index.vue              | 2 +-
 lms/nladmin-ui/src/views/wms/sch/region/index.vue             | 4 ++--
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/wql/QCRM_001.wql b/lms/nladmin-system/src/main/java/org/nl/wms/ext/wql/QCRM_001.wql
index b485e161f..3094bb858 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/wql/QCRM_001.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/wql/QCRM_001.wql
@@ -99,6 +99,9 @@
                 ENDOPTION
                 OPTION 输入.packageboxsn <> ""
                     sub.package_box_sn = 输入.packageboxsn
+                ENDOPTION
+                OPTION 输入.container_name <> ""
+                    sub.container_name = 输入.container_name
                 ENDOPTION
 			ENDSELECT
 		ENDQUERY
diff --git a/lms/nladmin-ui/src/views/wms/basedata/st/struct/index.vue b/lms/nladmin-ui/src/views/wms/basedata/st/struct/index.vue
index 83f865bf6..d5feedd55 100644
--- a/lms/nladmin-ui/src/views/wms/basedata/st/struct/index.vue
+++ b/lms/nladmin-ui/src/views/wms/basedata/st/struct/index.vue
@@ -206,7 +206,7 @@
         <el-table-column prop="simple_name" label="仓位简称" :min-width="flexWidth('simple_name',crud.data,'仓位简称')" />
         <el-table-column prop="sect_name" label="所属库区" width="150" />
         <el-table-column prop="stor_name" label="所属仓库" width="150" />
-        <el-table-column prop="storagevehicle_code" label="载具号" min-width="120" show-overflow-tooltip />
+        <el-table-column prop="storagevehicle_code" label="载具号" :min-width="flexWidth('storagevehicle_code',crud.data,'载具号')" />
         <el-table-column prop="lock_type" label="锁定类型" min-width="120" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ dict.label.d_lock_type[scope.row.lock_type] }}
diff --git a/lms/nladmin-ui/src/views/wms/sch/point/index.vue b/lms/nladmin-ui/src/views/wms/sch/point/index.vue
index cdfcb18d7..6f986c5b2 100644
--- a/lms/nladmin-ui/src/views/wms/sch/point/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/point/index.vue
@@ -312,7 +312,7 @@
             {{ dict.label.vehicle_type[scope.row.vehicle_type] }}
           </template>
         </el-table-column>-->
-        <el-table-column prop="vehicle_code" label="载具编码" />
+        <el-table-column prop="vehicle_code" label="载具编码" :min-width="flexWidth('vehicle_code',crud.data,'载具编码')" />
         <el-table-column prop="vehicle_qty" label="载具数量" />
         <el-table-column prop="product_area" label="生产区域" />
         <el-table-column prop="remark" label="备注" min-width="100" show-overflow-tooltip />
diff --git a/lms/nladmin-ui/src/views/wms/sch/region/index.vue b/lms/nladmin-ui/src/views/wms/sch/region/index.vue
index 95f17184b..dc6718327 100644
--- a/lms/nladmin-ui/src/views/wms/sch/region/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/region/index.vue
@@ -60,8 +60,8 @@
         <el-table-column v-if="false" prop="region_id" label="区域标识" />
         <el-table-column prop="region_code" label="区域编码" min-width="120" />
         <el-table-column prop="region_name" label="区域名称" min-width="130" />
-        <el-table-column prop="point_type_explain" label="点位类型说明" min-width="150" />
-        <el-table-column prop="point_status_explain" label="点位状态说明" min-width="120" />
+        <el-table-column prop="point_type_explain" label="点位类型说明" :min-width="flexWidth('point_type_explain',crud.data,'点位类型说明')" />
+        <el-table-column prop="point_status_explain" label="点位状态说明" :min-width="flexWidth('point_status_explain',crud.data,'点位状态说明')" />
         <el-table-column prop="remark" label="备注" />
         <el-table-column prop="create_name" label="创建人" />
         <el-table-column prop="create_time" label="创建时间" min-width="140" show-overflow-tooltip />