From 321912fdbafa3bbbd9e89fdc829a932bf1586870 Mon Sep 17 00:00:00 2001
From: lyd <1419499670@qq.com>
Date: Fri, 28 Oct 2022 14:57:29 +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

---
 .../template/generator/front/index.ftl        |  6 ++---
 .../views/acs/history/instRecord/index.vue    | 26 +++++++++----------
 .../template/generator/front/index.ftl        |  6 ++---
 .../src/views/wms/sch/region/index.vue        | 14 +++++-----
 4 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/acs/nladmin-system/src/main/resources/template/generator/front/index.ftl b/acs/nladmin-system/src/main/resources/template/generator/front/index.ftl
index 01e8632..742c990 100644
--- a/acs/nladmin-system/src/main/resources/template/generator/front/index.ftl
+++ b/acs/nladmin-system/src/main/resources/template/generator/front/index.ftl
@@ -80,15 +80,15 @@
             <#list columns as column>
             <#if column.columnShow>
           <#if (column.dictName)?? && (column.dictName)!="">
-        <el-table-column prop="${column.changeColumnName}" label="<#if column.remark != ''>${column.remark}<#else>${column.changeColumnName}</#if>" :width="flexWidth('${column.changeColumnName}',crud.data,'<#if column.remark != ''>${column.remark}<#else>${column.changeColumnName}</#if>')">
+        <el-table-column prop="${column.changeColumnName}" label="<#if column.remark != ''>${column.remark}<#else>${column.changeColumnName}</#if>" :min-width="flexWidth('${column.changeColumnName}',crud.data,'<#if column.remark != ''>${column.remark}<#else>${column.changeColumnName}</#if>')">
           <template slot-scope="scope">
             {{ dict.label.${column.dictName}[scope.row.${column.changeColumnName}] }}
           </template>
         </el-table-column>
           <#elseif column.columnType != 'Timestamp'>
-        <el-table-column prop="${column.changeColumnName}" label="<#if column.remark != ''>${column.remark}<#else>${column.changeColumnName}</#if>" :width="flexWidth('${column.changeColumnName}',crud.data,'<#if column.remark != ''>${column.remark}<#else>${column.changeColumnName}</#if>')"/>
+        <el-table-column prop="${column.changeColumnName}" label="<#if column.remark != ''>${column.remark}<#else>${column.changeColumnName}</#if>" :min-width="flexWidth('${column.changeColumnName}',crud.data,'<#if column.remark != ''>${column.remark}<#else>${column.changeColumnName}</#if>')"/>
                 <#else>
-        <el-table-column prop="${column.changeColumnName}" label="<#if column.remark != ''>${column.remark}<#else>${column.changeColumnName}</#if>" :width="flexWidth('${column.changeColumnName}',crud.data,'<#if column.remark != ''>${column.remark}<#else>${column.changeColumnName}</#if>')">
+        <el-table-column prop="${column.changeColumnName}" label="<#if column.remark != ''>${column.remark}<#else>${column.changeColumnName}</#if>" :min-width="flexWidth('${column.changeColumnName}',crud.data,'<#if column.remark != ''>${column.remark}<#else>${column.changeColumnName}</#if>')">
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.${column.changeColumnName}) }}</span>
           </template>
diff --git a/acs/nladmin-ui/src/views/acs/history/instRecord/index.vue b/acs/nladmin-ui/src/views/acs/history/instRecord/index.vue
index 516624b..e0e460d 100644
--- a/acs/nladmin-ui/src/views/acs/history/instRecord/index.vue
+++ b/acs/nladmin-ui/src/views/acs/history/instRecord/index.vue
@@ -96,25 +96,25 @@
         @selection-change="crud.selectionChangeHandler"
       >
         <el-table-column v-if="false" prop="instruction_id" label="指令标识" />
-        <el-table-column prop="instruction_code" label="指令编号" :width="flexWidth('instruction_code',crud.data,'指令编号')"/>
-        <el-table-column prop="task_code" label="任务号" :width="flexWidth('task_code',crud.data,'任务号')"/>
-        <el-table-column prop="vehicle_code" label="载具号" :width="flexWidth('vehicle_code',crud.data,'载具号')"/>
-        <el-table-column prop="instruction_status" label="指令状态" :width="flexWidth('instruction_status',crud.data,'指令状态')">
+        <el-table-column prop="instruction_code" label="指令编号" :min-width="flexWidth('instruction_code',crud.data,'指令编号')"/>
+        <el-table-column prop="task_code" label="任务号" :min-width="flexWidth('task_code',crud.data,'任务号')"/>
+        <el-table-column prop="vehicle_code" label="载具号" :min-width="flexWidth('vehicle_code',crud.data,'载具号')"/>
+        <el-table-column prop="instruction_status" label="指令状态" :min-width="flexWidth('instruction_status',crud.data,'指令状态')">
           <template slot-scope="scope">
             <span v-if="scope.row.instruction_status=='0' ">就绪</span>
             <span v-if="scope.row.instruction_status=='1' ">执行中</span>
             <span v-if="scope.row.instruction_status=='2' ">完成</span>
           </template>
         </el-table-column>
-        <el-table-column prop="start_point_code" label="起点" :width="flexWidth('start_point_code',crud.data,'起点')"/>
-        <el-table-column prop="next_point_code" label="终点" :width="flexWidth('next_point_code',crud.data,'终点')"/>
-        <el-table-column prop="matarial" label="物料" :width="flexWidth('matarial',crud.data,'物料')"/>
-        <el-table-column prop="quantity" label="数量" :width="flexWidth('quantity',crud.data,'数量')"/>
-        <el-table-column prop="remark" label="描述" :width="flexWidth('remark',crud.data,'描述')"/>
-        <el-table-column prop="create_by" label="创建者" :width="flexWidth('create_by',crud.data,'创建者')"/>
-        <el-table-column prop="create_time" label="创建时间" :width="flexWidth('create_time',crud.data,'创建时间')" />
-        <el-table-column prop="update_by" label="修改者" :width="flexWidth('update_by',crud.data,'修改者')"/>
-        <el-table-column prop="update_time" label="修改时间"  />
+        <el-table-column prop="start_point_code" label="起点" :min-width="flexWidth('start_point_code',crud.data,'起点')"/>
+        <el-table-column prop="next_point_code" label="终点" :min-width="flexWidth('next_point_code',crud.data,'终点')"/>
+        <el-table-column prop="matarial" label="物料" :min-width="flexWidth('matarial',crud.data,'物料')"/>
+        <el-table-column prop="quantity" label="数量" :min-width="flexWidth('quantity',crud.data,'数量')"/>
+        <el-table-column prop="remark" label="描述" :min-width="flexWidth('remark',crud.data,'描述')"/>
+        <el-table-column prop="create_by" label="创建者" :min-width="flexWidth('create_by',crud.data,'创建者')"/>
+        <el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
+        <el-table-column prop="update_by" label="修改者" :min-width="flexWidth('update_by',crud.data,'修改者')"/>
+        <el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')" />
       </el-table>
       <!--分页组件-->
       <pagination />
diff --git a/lms/nladmin-system/src/main/resources/template/generator/front/index.ftl b/lms/nladmin-system/src/main/resources/template/generator/front/index.ftl
index 07d0955..8fe068d 100644
--- a/lms/nladmin-system/src/main/resources/template/generator/front/index.ftl
+++ b/lms/nladmin-system/src/main/resources/template/generator/front/index.ftl
@@ -80,15 +80,15 @@
             <#list columns as column>
             <#if column.columnShow>
           <#if (column.dictName)?? && (column.dictName)!="">
-        <el-table-column prop="${column.changeColumnName}" label="<#if column.remark != ''>${column.remark}<#else>${column.changeColumnName}</#if>" :width="flexWidth('${column.changeColumnName}',crud.data,'<#if column.remark != ''>${column.remark}<#else>${column.changeColumnName}</#if>')">
+        <el-table-column prop="${column.changeColumnName}" label="<#if column.remark != ''>${column.remark}<#else>${column.changeColumnName}</#if>" :min-width="flexWidth('${column.changeColumnName}',crud.data,'<#if column.remark != ''>${column.remark}<#else>${column.changeColumnName}</#if>')">
           <template slot-scope="scope">
             {{ dict.label.${column.dictName}[scope.row.${column.changeColumnName}] }}
           </template>
         </el-table-column>
           <#elseif column.columnType != 'Timestamp'>
-        <el-table-column prop="${column.changeColumnName}" label="<#if column.remark != ''>${column.remark}<#else>${column.changeColumnName}</#if>" :width="flexWidth('${column.changeColumnName}',crud.data,'<#if column.remark != ''>${column.remark}<#else>${column.changeColumnName}</#if>')"/>
+        <el-table-column prop="${column.changeColumnName}" label="<#if column.remark != ''>${column.remark}<#else>${column.changeColumnName}</#if>" :min-width="flexWidth('${column.changeColumnName}',crud.data,'<#if column.remark != ''>${column.remark}<#else>${column.changeColumnName}</#if>')"/>
                 <#else>
-        <el-table-column prop="${column.changeColumnName}" label="<#if column.remark != ''>${column.remark}<#else>${column.changeColumnName}</#if>" :width="flexWidth('${column.changeColumnName}',crud.data,'<#if column.remark != ''>${column.remark}<#else>${column.changeColumnName}</#if>')">
+        <el-table-column prop="${column.changeColumnName}" label="<#if column.remark != ''>${column.remark}<#else>${column.changeColumnName}</#if>" :min-width="flexWidth('${column.changeColumnName}',crud.data,'<#if column.remark != ''>${column.remark}<#else>${column.changeColumnName}</#if>')">
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.${column.changeColumnName}) }}</span>
           </template>
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 34e4c3d..6ddce55 100644
--- a/lms/nladmin-ui/src/views/wms/sch/region/index.vue
+++ b/lms/nladmin-ui/src/views/wms/sch/region/index.vue
@@ -58,13 +58,13 @@
       >
         <el-table-column type="selection" width="55" />
         <el-table-column v-if="false" prop="region_id" label="区域标识" />
-        <el-table-column prop="region_code" label="区域编码" :width="flexWidth('region_code',crud.data,'区域编码')"/>
-        <el-table-column prop="region_name" label="区域名称" :width="flexWidth('region_name',crud.data,'区域名称')" />
-        <el-table-column prop="point_type_explain" label="点位类型说明" :width="flexWidth('point_type_explain',crud.data,'点位类型说明')" />
-        <el-table-column prop="point_status_explain" label="点位状态说明" :width="flexWidth('point_status_explain',crud.data,'点位状态说明')" />
-        <el-table-column prop="remark" label="备注" :width="flexWidth('remark',crud.data,'备注')"/>
-        <el-table-column prop="create_name" label="创建人" :width="flexWidth('create_name',crud.data,'创建人')"/>
-        <el-table-column prop="create_time" label="创建时间" :width="flexWidth('create_time',crud.data,'创建时间')" />
+        <el-table-column prop="region_code" label="区域编码" :min-width="flexWidth('region_code',crud.data,'区域编码')"/>
+        <el-table-column prop="region_name" label="区域名称" :min-width="flexWidth('region_name',crud.data,'区域名称')" />
+        <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="备注" :min-width="flexWidth('remark',crud.data,'备注')"/>
+        <el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')"/>
+        <el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
         <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
           <template slot-scope="scope">
             <udOperation