Merge branch 'master' of http://47.111.78.178:8012/root/yinnihailiang_one

# Conflicts: # lms/nladmin-system/src/main/resources/language/i18n/zh.js
2026-01-08 11:19:27 +08:00
parent 5d8547a5de a7f459b36d
commit 391f574a2e
30 changed files with 527 additions and 459 deletions
--- a/lms/nladmin-ui/src/views/wms/basedata/master/customer/index.vue
+++ b/lms/nladmin-ui/src/views/wms/basedata/master/customer/index.vue
@@ -105,7 +105,7 @@
            </el-col>
            <el-col :span="8">
              <el-form-item :label="$t('wms.basedata.master.customer.deliveryNoteDetailCount')">
-                <el-input-number v-model="form.shd_dtl_num" :min="1" :max="100" :precision="0" :controls="false" style="width: 200px;"/>
+                <el-input-number v-model="form.shd_dtl_num" :min="1" :max="100" :precision="0" :controls="false" style="width: 200px;" />
              </el-form-item>
            </el-col>
          </el-row>
@@ -193,10 +193,10 @@
        <el-table-column prop="jurid_name" :label="$t('wms.basedata.master.customer.legalRepresentative')" show-overflow-tooltip />
        <el-table-column prop="bz_print_no" :label="$t('wms.basedata.master.customer.packagePrintTemplate')" width="150px" :formatter="printTemple" show-overflow-tooltip />
        <el-table-column prop="bz_print_within" :label="$t('wms.basedata.master.customer.innerLabelPrintTemplate')" width="150px" :formatter="printTemple2" show-overflow-tooltip />
-        <el-table-column prop="shd_print_no" :label="$t('wms.basedata.master.customer.deliveryNotePrintTemplatePath')" width="180px" show-overflow-tooltip/>
+        <el-table-column prop="shd_print_no" :label="$t('wms.basedata.master.customer.deliveryNotePrintTemplatePath')" width="180px" show-overflow-tooltip />
        <el-table-column prop="shd_dtl_num" :label="$t('wms.basedata.master.customer.deliveryNoteDetailCount')" width="150px" show-overflow-tooltip />
-        <el-table-column prop="is_auto_table" :label="$t('wms.basedata.master.customer.isAutoLabeling')" width="150px" show-overflow-tooltip :formatter="autoTable"/>
-        <el-table-column prop="update_optname" :label="$t('wms.basedata.master.customer.modifier')" width="150px"/>
+        <el-table-column prop="is_auto_table" :label="$t('wms.basedata.master.customer.isAutoLabeling')" width="150px" show-overflow-tooltip :formatter="autoTable" />
+        <el-table-column prop="update_optname" :label="$t('wms.basedata.master.customer.modifier')" width="150px" />
        <el-table-column prop="update_time" :label="$t('wms.basedata.master.customer.modificationTime')" width="150" />
        <el-table-column :label="$t('wms.basedata.master.customer.enabled')" align="center" prop="is_used">
          <template slot-scope="scope">
--- a/lms/nladmin-ui/src/views/wms/basedata/master/interfaceback/index.vue
+++ b/lms/nladmin-ui/src/views/wms/basedata/master/interfaceback/index.vue
@@ -91,7 +91,7 @@
          <el-row>
            <el-col :span="24">
              <el-form-item :label="$t('wms.basedata.master.interfaceback.businessDescription')">
-                <el-input type="textarea" :rows="2" v-model="form.business_comment" style="width: 550px;" />
+                <el-input v-model="form.business_comment" type="textarea" :rows="2" style="width: 550px;" />
              </el-form-item>
            </el-col>
          </el-row>
@@ -105,10 +105,10 @@
      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
        <el-table-column type="selection" width="55" />
        <el-table-column prop="interface_type" :label="$t('wms.basedata.master.interfaceback.returnType')" :formatter="formatType" :min-width="flexWidth('interface_type',crud.data,$t('wms.basedata.master.interfaceback.returnType'))" />
-        <el-table-column prop="interface_name" :label="$t('wms.basedata.master.interfaceback.interfaceName')" :min-width="flexWidth('interface_name',crud.data,$t('wms.basedata.master.interfaceback.interfaceName'))"/>
-        <el-table-column prop="is_back" :label="$t('wms.basedata.master.interfaceback.isReturn')" :formatter="formatBack" :min-width="flexWidth('is_back',crud.data,$t('wms.basedata.master.interfaceback.isReturn'))"/>
-        <el-table-column prop="remark" :label="$t('wms.basedata.master.interfaceback.interfaceDescription')" :min-width="flexWidth('remark',crud.data,$t('wms.basedata.master.interfaceback.interfaceDescription'))"/>
-        <el-table-column prop="business_comment" :label="$t('wms.basedata.master.interfaceback.businessDescription')" :min-width="flexWidth('business_comment',crud.data,$t('wms.basedata.master.interfaceback.businessDescription'))"/>
+        <el-table-column prop="interface_name" :label="$t('wms.basedata.master.interfaceback.interfaceName')" :min-width="flexWidth('interface_name',crud.data,$t('wms.basedata.master.interfaceback.interfaceName'))" />
+        <el-table-column prop="is_back" :label="$t('wms.basedata.master.interfaceback.isReturn')" :formatter="formatBack" :min-width="flexWidth('is_back',crud.data,$t('wms.basedata.master.interfaceback.isReturn'))" />
+        <el-table-column prop="remark" :label="$t('wms.basedata.master.interfaceback.interfaceDescription')" :min-width="flexWidth('remark',crud.data,$t('wms.basedata.master.interfaceback.interfaceDescription'))" />
+        <el-table-column prop="business_comment" :label="$t('wms.basedata.master.interfaceback.businessDescription')" :min-width="flexWidth('business_comment',crud.data,$t('wms.basedata.master.interfaceback.businessDescription'))" />
        <el-table-column v-permission="[]" :label="$t('common.operation')" width="120px" align="center" fixed="right">
          <template slot-scope="scope">
            <udOperation
@@ -176,7 +176,7 @@ export default {
        is_back: [
          { required: true, message: this.$t('wms.basedata.master.interfaceback.isReturnCannotBeEmpty'), trigger: 'blur' }
        ]
-      } }
+      }}
  },
  methods: {
    // 钩子：在获取表格数据之前执行，false 则代表不获取数据
--- a/lms/nladmin-ui/src/views/wms/basedata/master/material/index.vue
+++ b/lms/nladmin-ui/src/views/wms/basedata/master/material/index.vue
@@ -5,27 +5,27 @@
      <el-row>
        <el-col :span="8">
          <el-row>
-          <el-col :span="7">
-            <span style="line-height:36px;text-align: center">{{ $t('wms.basedata.master.material.materialCategory') }}：</span>
-          </el-col>
-          <el-col :span="12">
-            <el-select
-              size="mini"
-              v-model="query.material_type_id"
-              :placeholder="$t('wms.basedata.master.material.all')"
-              clearable
-              class="filter-item"
-              @change="crud.toQuery"
-            >
-              <el-option
-                v-for="item in dict.material_type"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-col>
-        </el-row>
+            <el-col :span="7">
+              <span style="line-height:36px;text-align: center">{{ $t('wms.basedata.master.material.materialCategory') }}：</span>
+            </el-col>
+            <el-col :span="12">
+              <el-select
+                v-model="query.material_type_id"
+                size="mini"
+                :placeholder="$t('wms.basedata.master.material.all')"
+                clearable
+                class="filter-item"
+                @change="crud.toQuery"
+              >
+                <el-option
+                  v-for="item in dict.material_type"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-col>
+          </el-row>
        </el-col>
        <el-col :span="8">
          {{ $t('wms.basedata.master.material.fuzzyQuery') }}：
@@ -44,7 +44,7 @@
        </el-col>
      </el-row>
      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation/>
+      <crudOperation />
      <!--表单组件-->
      <el-dialog
        :close-on-click-modal="false"
@@ -88,8 +88,8 @@
            <el-col :span="8">
              <el-form-item :label="$t('wms.basedata.master.material.materialCategory')" prop="material_type_id">
                <el-select
-                  size="mini"
                  v-model="form.material_type_id"
+                  size="mini"
                  :placeholder="$t('wms.basedata.master.material.pleaseSelect')"
                  class="filter-item"
                >
--- a/lms/nladmin-ui/src/views/wms/basedata/master/sales/index.vue
+++ b/lms/nladmin-ui/src/views/wms/basedata/master/sales/index.vue
@@ -53,7 +53,7 @@
      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
        <el-table-column prop="sales_code" :label="$t('common.code')" />
        <el-table-column prop="sales_name" :label="$t('common.name')" />
-        <el-table-column prop="area" :label="$t('common.area')" width="135" :formatter="formateArea"/>
+        <el-table-column prop="area" :label="$t('common.area')" width="135" :formatter="formateArea" />
        <el-table-column prop="is_active" :label="$t('common.enabled')">
          <template slot-scope="scope">
            <el-switch
--- a/lms/nladmin-ui/src/views/wms/basedata/master/storagevehicleinfo/index.vue
+++ b/lms/nladmin-ui/src/views/wms/basedata/master/storagevehicleinfo/index.vue
@@ -42,7 +42,7 @@
              @keyup.enter.native="crud.toQuery"
            />
          </el-form-item>
-          <rrOperation/>
+          <rrOperation />
        </el-form>

      </div>
@@ -68,7 +68,7 @@
        width="450px"
      >
        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
-          <el-form-item :label="$t('wms.basedata.master.storagevehicleinfo.vehicleType')" v-if="crud.status.add > 0" prop="storagevehicle_type">
+          <el-form-item v-if="crud.status.add > 0" :label="$t('wms.basedata.master.storagevehicleinfo.vehicleType')" prop="storagevehicle_type">
            <treeselect
              v-model="form.storagevehicle_type"
              :load-options="loadChildNodes"
@@ -78,14 +78,14 @@
            />
          </el-form-item>

-          <el-form-item :label="$t('wms.basedata.master.storagevehicleinfo.vehicleQuantity')" v-if="crud.status.add > 0" prop="num">
-            <el-input-number v-model="form.num" v-if="crud.status.add > 0" :precision="0" style="width: 150px;"/>
+          <el-form-item v-if="crud.status.add > 0" :label="$t('wms.basedata.master.storagevehicleinfo.vehicleQuantity')" prop="num">
+            <el-input-number v-if="crud.status.add > 0" v-model="form.num" :precision="0" style="width: 150px;" />
          </el-form-item>
-          <el-form-item :label="$t('wms.basedata.master.storagevehicleinfo.vehicleWeight')" v-if="crud.status.edit > 0" prop="qty">
-            <el-input-number v-model="form.qty" :precision="1" style="width: 150px;"/>
+          <el-form-item v-if="crud.status.edit > 0" :label="$t('wms.basedata.master.storagevehicleinfo.vehicleWeight')" prop="qty">
+            <el-input-number v-model="form.qty" :precision="1" style="width: 150px;" />
          </el-form-item>
-          <el-form-item :label="$t('wms.basedata.master.storagevehicleinfo.bindingMaterial')" v-if="crud.status.edit > 0" prop="pcsn">
-            <el-input v-model="form.pcsn" :precision="0" style="width: 150px;"/>
+          <el-form-item v-if="crud.status.edit > 0" :label="$t('wms.basedata.master.storagevehicleinfo.bindingMaterial')" prop="pcsn">
+            <el-input v-model="form.pcsn" :precision="0" style="width: 150px;" />
          </el-form-item>
          <el-form-item :label="$t('wms.basedata.master.storagevehicleinfo.isEnabled')">
            <el-radio v-model="form.is_used" label="0">{{ $t('wms.basedata.master.storagevehicleinfo.no') }}</el-radio>
@@ -107,17 +107,17 @@
        style="width: 100%;"
        @selection-change="crud.selectionChangeHandler"
      >
-        <el-table-column type="selection" width="55"/>
-        <el-table-column v-if="false" prop="storagevehicle_id" :label="$t('wms.basedata.master.storagevehicleinfo.vehicleId')"/>
-        <el-table-column prop="storagevehicle_type_name" :label="$t('wms.basedata.master.storagevehicleinfo.vehicleType')"/>
-        <el-table-column prop="storagevehicle_code" :label="$t('wms.basedata.master.storagevehicleinfo.vehicleCode')"/>
-        <el-table-column prop="storagevehicle_name" :label="$t('wms.basedata.master.storagevehicleinfo.vehicleName')"/>
-<!--        <el-table-column prop="is_task" :label="$t('wms.basedata.master.storagevehicleinfo.isInTransit')" :formatter="formatIsTask"/>-->
+        <el-table-column type="selection" width="55" />
+        <el-table-column v-if="false" prop="storagevehicle_id" :label="$t('wms.basedata.master.storagevehicleinfo.vehicleId')" />
+        <el-table-column prop="storagevehicle_type_name" :label="$t('wms.basedata.master.storagevehicleinfo.vehicleType')" />
+        <el-table-column prop="storagevehicle_code" :label="$t('wms.basedata.master.storagevehicleinfo.vehicleCode')" />
+        <el-table-column prop="storagevehicle_name" :label="$t('wms.basedata.master.storagevehicleinfo.vehicleName')" />
+        <!--        <el-table-column prop="is_task" :label="$t('wms.basedata.master.storagevehicleinfo.isInTransit')" :formatter="formatIsTask"/>-->
        <!--<el-table-column prop="point_code" :label="$t('wms.basedata.master.storagevehicleinfo.currentLocation')" width="120px"/>
        <el-table-column prop="start_point_code" :label="$t('wms.basedata.master.storagevehicleinfo.startPoint')" width="120px"/>
        <el-table-column prop="next_point_code" :label="$t('wms.basedata.master.storagevehicleinfo.endPoint')" width="120px"/>-->
-        <el-table-column prop="pcsn" :label="$t('wms.basedata.master.storagevehicleinfo.bindingMaterial')"/>
-        <el-table-column prop="qty" :label="$t('wms.basedata.master.storagevehicleinfo.palletWeight')"/>
+        <el-table-column prop="pcsn" :label="$t('wms.basedata.master.storagevehicleinfo.bindingMaterial')" />
+        <el-table-column prop="qty" :label="$t('wms.basedata.master.storagevehicleinfo.palletWeight')" />
        <el-table-column :label="$t('wms.basedata.master.storagevehicleinfo.isEnabled')" align="center" prop="is_used">
          <template slot-scope="scope">
            <el-switch
@@ -128,8 +128,8 @@
            />
          </template>
        </el-table-column>
-        <el-table-column prop="create_name" :label="$t('wms.basedata.master.storagevehicleinfo.creator')"/>
-        <el-table-column prop="create_time" :label="$t('wms.basedata.master.storagevehicleinfo.creationTime')" width="150px"/>
+        <el-table-column prop="create_name" :label="$t('wms.basedata.master.storagevehicleinfo.creator')" />
+        <el-table-column prop="create_time" :label="$t('wms.basedata.master.storagevehicleinfo.creationTime')" width="150px" />
        <el-table-column
          v-permission="['admin','storagevehicleinfo:edit','storagevehicleinfo:del']"
          :label="$t('wms.basedata.master.storagevehicleinfo.operation')"
@@ -146,7 +146,7 @@
        </el-table-column>
      </el-table>
      <!--分页组件-->
-      <pagination/>
+      <pagination />
    </div>
  </div>
 </template>
--- a/lms/nladmin-ui/src/views/wms/basedata/product/userArea/index.vue
+++ b/lms/nladmin-ui/src/views/wms/basedata/product/userArea/index.vue
@@ -13,9 +13,9 @@
          class="filter-item"
          @keyup.enter.native="crud.toQuery"
        />
-        <rrOperation/>
+        <rrOperation />
      </div>
-      <crudOperation :permission="permission"/>
+      <crudOperation :permission="permission" />
    </div>
    <!-- 表单渲染 -->
    <el-row :gutter="15">
@@ -34,9 +34,9 @@
            @selection-change="crud.selectionChangeHandler"
            @current-change="handleCurrentChange"
          >
-            <el-table-column show-overflow-tooltip prop="username" :label="$t('common.username')"/>
-            <el-table-column show-overflow-tooltip prop="person_name" :label="$t('common.personName')"/>
-            <el-table-column prop="name" :label="$t('common.dept')"/>
+            <el-table-column show-overflow-tooltip prop="username" :label="$t('common.username')" />
+            <el-table-column show-overflow-tooltip prop="person_name" :label="$t('common.personName')" />
+            <el-table-column prop="name" :label="$t('common.dept')" />
            <!--<el-table-column show-overflow-tooltip prop="dept" label="部门">
              <template slot-scope="scope">
                <div>{{ scope.row.dept.name }}</div>
@@ -44,7 +44,7 @@
            </el-table-column>-->
          </el-table>
          <!--分页组件-->
-          <pagination/>
+          <pagination />
        </el-card>
      </el-col>
      <!-- 菜单授权 -->
@@ -71,11 +71,12 @@
            :data="tableData"
            tooltip-effect="dark"
            style="width: 100%"
-            @selection-change="handleSelectionChange">
+            @selection-change="handleSelectionChange"
+          >
            <el-table-column
              type="selection"
-              width="55">
-            </el-table-column>
+              width="55"
+            />
            <el-table-column prop="product_area" :label="$t('wms.basedata.product.userArea.area')" />
          </el-table>
        </el-card>
--- a/lms/nladmin-ui/src/views/wms/basedata/st/boxInfo/index.vue
+++ b/lms/nladmin-ui/src/views/wms/basedata/st/boxInfo/index.vue
@@ -21,23 +21,24 @@
            />
          </el-form-item>

-          <el-form-item :label="$t('wms.basedata.st.boxInfo.isPacking')"
+          <el-form-item
+            v-model="query.is_packing"
+            :label="$t('wms.basedata.st.boxInfo.isPacking')"
            <el-select
-              v-model="query.is_packing"
-              clearable
-              class="filter-item"
-              :placeholder="$t('common.pleaseSelect')"
-              @change="crud.toQuery"
-            >
-              <el-option
-                v-for="item in packingList"
-                :label="item.label"
-                :value="item.value"
-              />
+            clearable
+            class="filter-item"
+            :placeholder="$t('common.pleaseSelect')"
+            @change="crud.toQuery"
+          >
+            <el-option
+              v-for="item in packingList"
+              :label="item.label"
+              :value="item.value"
+            />
            </el-select>
          </el-form-item>

-          <rrOperation/>
+          <rrOperation />
        </el-form>
      </div>
      <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
@@ -65,32 +66,47 @@
          <el-row :gutter="20">
            <el-col :span="12">
              <el-form-item :label="$t('common.materialCode') + ':'" prop="material_code">
-<!--                <el-input v-model="form.material_code" style="width: 200px;" :disabled="crud.status.edit > 0"/>-->
+                <!--                <el-input v-model="form.material_code" style="width: 200px;" :disabled="crud.status.edit > 0"/>-->
                <el-input
-                  v-model="form.material_code"    style="width: 200px;"
+                  v-model="form.material_code"
+                  style="width: 200px;"
                  :disabled="crud.status.edit > 0"
-                  @click.native="openMaterialDialog"
                  readonly
+                  @click.native="openMaterialDialog"
                />
              </el-form-item>
            </el-col>
            <el-col :span="12">
              <el-form-item :label="$t('common.materialName') + ':'" prop="material_name">
-                <el-input v-model="form.material_name" style="width: 200px;" disabled/>
+                <el-input v-model="form.material_name" style="width: 200px;" disabled />
              </el-form-item>
            </el-col>
          </el-row>
          <el-row :gutter="20">
            <el-col :span="12">
              <el-form-item :label="$t('wms.basedata.st.boxInfo.generateBoxNum') + ':'" prop="box_num">
-                <el-input-number :step="1" :min="1" :max="100" v-model="form.box_num" size="mini"
-                                 :controls="false" style="width: 200px"/>
+                <el-input-number
+                  v-model="form.box_num"
+                  :step="1"
+                  :min="1"
+                  :max="100"
+                  size="mini"
+                  :controls="false"
+                  style="width: 200px"
+                />
              </el-form-item>
            </el-col>
            <el-col :span="12">
              <el-form-item :label="$t('wms.basedata.st.boxInfo.maxSubRollNum') + ':'" prop="num">
-                <el-input-number :step="1" :min="1" :max="100" v-model="form.num" size="mini"
-                                 :controls="false" style="width: 200px"/>
+                <el-input-number
+                  v-model="form.num"
+                  :step="1"
+                  :min="1"
+                  :max="100"
+                  size="mini"
+                  :controls="false"
+                  style="width: 200px"
+                />
              </el-form-item>
            </el-col>
          </el-row>
@@ -111,14 +127,15 @@
              <el-form-item :label="$t('wms.basedata.st.boxInfo.boxWeight') + ':'" prop="box_weight">
                <el-input-number
                  :value="form.box_weight === null ? undefined : form.box_weight"
-                  @input="val => form.box_weight = val"
                  :precision="2"
                  :step="0.1"
                  :min="0"
                  :max="1000"
                  size="mini"
-                  :controls="false" style="width: 200px;"
+                  :controls="false"
+                  style="width: 200px;"
                  clearable
+                  @input="val => form.box_weight = val"
                />
              </el-form-item>
            </el-col>
@@ -154,20 +171,28 @@
        style="width: 100%;"
        @selection-change="crud.selectionChangeHandler"
      >
-        <el-table-column type="selection" width="55"/>
-        <el-table-column prop="box_no" sortable :label="$t('wms.basedata.st.boxInfo.boxNo')" :min-width="flexWidth('box_no',crud.data,'木箱号')"/>
-        <el-table-column prop="material_code" :label="$t('common.materialCode')" :min-width="flexWidth('material_code',crud.data,'物料编码')"/>
-        <el-table-column prop="material_name" :label="$t('common.materialName')" :min-width="flexWidth('material_name',crud.data,'物料名称')"/>
-        <el-table-column prop="num" :label="$t('wms.basedata.st.boxInfo.maxSubRollNum')" :min-width="flexWidth('num',crud.data,'最大子卷数')"/>
-        <el-table-column prop="box_length" :label="$t('wms.basedata.st.boxInfo.boxLength')" :min-width="flexWidth('box_length',crud.data,'木箱长度')"/>
-        <el-table-column prop="box_width" :label="$t('wms.basedata.st.boxInfo.boxWidth')" :min-width="flexWidth('box_width',crud.data,'木箱宽度')"/>
-        <el-table-column prop="box_high" :label="$t('wms.basedata.st.boxInfo.boxHeight')" :min-width="flexWidth('box_high',crud.data,'木箱高度')"/>
-        <el-table-column prop="vehicle_type" :label="$t('wms.basedata.st.boxInfo.vehicleType')" :min-width="flexWidth('vehicle_type',crud.data,'载具类型')"
-                         :formatter="formattTwo"/>
-        <el-table-column prop="is_packing" :label="$t('wms.basedata.st.boxInfo.isPacking')" :min-width="flexWidth('is_packing',crud.data,'是否装箱')"
-                         :formatter="formatOne"/>
-        <el-table-column prop="box_weight" :label="$t('wms.basedata.st.boxInfo.boxWeight')" :min-width="flexWidth('box_weight',crud.data,'木箱重量')"/>
-        <el-table-column prop="insert_time" :label="$t('common.createTime')" :min-width="flexWidth('insert_time',crud.data,'创建时间')"/>
+        <el-table-column type="selection" width="55" />
+        <el-table-column prop="box_no" sortable :label="$t('wms.basedata.st.boxInfo.boxNo')" :min-width="flexWidth('box_no',crud.data,'木箱号')" />
+        <el-table-column prop="material_code" :label="$t('common.materialCode')" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
+        <el-table-column prop="material_name" :label="$t('common.materialName')" :min-width="flexWidth('material_name',crud.data,'物料名称')" />
+        <el-table-column prop="num" :label="$t('wms.basedata.st.boxInfo.maxSubRollNum')" :min-width="flexWidth('num',crud.data,'最大子卷数')" />
+        <el-table-column prop="box_length" :label="$t('wms.basedata.st.boxInfo.boxLength')" :min-width="flexWidth('box_length',crud.data,'木箱长度')" />
+        <el-table-column prop="box_width" :label="$t('wms.basedata.st.boxInfo.boxWidth')" :min-width="flexWidth('box_width',crud.data,'木箱宽度')" />
+        <el-table-column prop="box_high" :label="$t('wms.basedata.st.boxInfo.boxHeight')" :min-width="flexWidth('box_high',crud.data,'木箱高度')" />
+        <el-table-column
+          prop="vehicle_type"
+          :label="$t('wms.basedata.st.boxInfo.vehicleType')"
+          :min-width="flexWidth('vehicle_type',crud.data,'载具类型')"
+          :formatter="formattTwo"
+        />
+        <el-table-column
+          prop="is_packing"
+          :label="$t('wms.basedata.st.boxInfo.isPacking')"
+          :min-width="flexWidth('is_packing',crud.data,'是否装箱')"
+          :formatter="formatOne"
+        />
+        <el-table-column prop="box_weight" :label="$t('wms.basedata.st.boxInfo.boxWeight')" :min-width="flexWidth('box_weight',crud.data,'木箱重量')" />
+        <el-table-column prop="insert_time" :label="$t('common.createTime')" :min-width="flexWidth('insert_time',crud.data,'创建时间')" />
        <el-table-column
          v-permission="['admin','sectattr:edit','sectattr:del']"
          label="操作"
@@ -184,7 +209,7 @@
        </el-table-column>
      </el-table>
      <!--分页组件-->
-      <pagination/>
+      <pagination />
    </div>
    <mater-dialog
      ref="materDialog"
@@ -198,7 +223,7 @@

 <script>
 import crudBoxinfo from '@/views/wms/basedata/st/boxInfo/boxinfo'
-import CRUD, {crud, form, header, presenter} from '@crud/crud'
+import CRUD, { crud, form, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
@@ -206,7 +231,6 @@ import pagination from '@crud/Pagination'
 import MaterDialog from '@/views/wms/basedata/st/boxInfo/MaterDialog'
 import { getLodop } from '@/assets/js/lodop/LodopFuncs'

-
 const defaultForm = {
  box_id: null,
  box_no: null,
@@ -226,16 +250,16 @@ const defaultForm = {
 export default {
  name: 'BoxInfo',
  dicts: ['IS_OR_NOT'],
-  components: {pagination, crudOperation, rrOperation, udOperation, MaterDialog},
+  components: { pagination, crudOperation, rrOperation, udOperation, MaterDialog },
  mixins: [presenter(), header(), form(defaultForm), crud()],
  cruds() {
    return CRUD({
      title: '木箱信息',
-      optShow: {add: true, edit: true, del: true, reset: true},
+      optShow: { add: true, edit: true, del: true, reset: true },
      url: 'api/boxinfo',
      idField: 'box_id',
      sort: 'box_no,desc',
-      crudMethod: {...crudBoxinfo}
+      crudMethod: { ...crudBoxinfo }
    })
  },
  data() {
@@ -247,32 +271,32 @@ export default {
        del: ['admin', 'user:del']
      },
      packingList: [
-        {'label': '是', 'value': '1'},
-        {'label': '否', 'value': '0'}
+        { 'label': '是', 'value': '1' },
+        { 'label': '否', 'value': '0' }
      ],
      vehicleTypeList: [
-        {'label': '小托盘', 'value': '1'},
-        {'label': '大托盘', 'value': '2'}
+        { 'label': '小托盘', 'value': '1' },
+        { 'label': '大托盘', 'value': '2' }
      ],
      dialogMaterialVisible: false,
      rules: {
        material_code: [
-          {required: true, message: '木箱规格编码不能为空', trigger: 'blur'}
+          { required: true, message: '木箱规格编码不能为空', trigger: 'blur' }
        ],
        material_name: [
-          {required: true, message: '木箱规格名称不能为空', trigger: 'blur'}
+          { required: true, message: '木箱规格名称不能为空', trigger: 'blur' }
        ],
        box_num: [
-          {required: true, message: '生成木箱号数量不能为空', trigger: 'blur'}
+          { required: true, message: '生成木箱号数量不能为空', trigger: 'blur' }
        ],
        num: [
-          {required: true, message: '最大子卷数量不能为空', trigger: 'blur'}
+          { required: true, message: '最大子卷数量不能为空', trigger: 'blur' }
        ],
        vehicle_type: [
-          {required: true, message: '载具类型不能为空', trigger: 'blur'}
+          { required: true, message: '载具类型不能为空', trigger: 'blur' }
        ],
        is_packing: [
-          {required: true, message: '是否装箱不能为空', trigger: 'blur'}
+          { required: true, message: '是否装箱不能为空', trigger: 'blur' }
        ]
      }
    }
@@ -362,7 +386,7 @@ export default {
        this.crud.toQuery()
        this.crud.notify($t('common.operationSuccess'), CRUD.NOTIFICATION_TYPE.SUCCESS)
      })
-    },
+    }
  }
 }
 </script>
--- a/lms/nladmin-ui/src/views/wms/basedata/st/boxType/index.vue
+++ b/lms/nladmin-ui/src/views/wms/basedata/st/boxType/index.vue
@@ -73,19 +73,19 @@
            </el-col>
            <el-col :span="12">
              <el-form-item :label="$t('wms.basedata.st.boxType.forkliftPickupWidth') + ':'" prop="expend_width">
-                <el-input-number :precision="2" :step="0.1" :min="0" :max="100" v-model="form.expend_width" size="mini" :controls="false" style="width: 200px" />
+                <el-input-number v-model="form.expend_width" :precision="2" :step="0.1" :min="0" :max="100" size="mini" :controls="false" style="width: 200px" />
              </el-form-item>
            </el-col>
          </el-row>
          <el-row :gutter="20">
            <el-col :span="12">
              <el-form-item :label="$t('wms.basedata.st.boxType.firstLashingCount') + ':'" prop="lash_num_one">
-                <el-input-number :precision="0" :step="1" :min="0" :max="9" v-model="form.lash_num_one" size="mini" :controls="false" style="width: 200px" />
+                <el-input-number v-model="form.lash_num_one" :precision="0" :step="1" :min="0" :max="9" size="mini" :controls="false" style="width: 200px" />
              </el-form-item>
            </el-col>
            <el-col :span="12">
              <el-form-item :label="$t('wms.basedata.st.boxType.secondLashingCount') + ':'" prop="lash_num_tow">
-                <el-input-number :precision="0" :step="1" :min="0" :max="9" v-model="form.lash_num_tow" size="mini" :controls="false" style="width: 200px" />
+                <el-input-number v-model="form.lash_num_tow" :precision="0" :step="1" :min="0" :max="9" size="mini" :controls="false" style="width: 200px" />
              </el-form-item>
            </el-col>
          </el-row>
@@ -93,8 +93,8 @@
            <el-col :span="12">
              <el-form-item :label="$t('wms.basedata.st.boxType.boxStructure') + ':'" prop="box_structure">
                <el-select
-                  size="mini"
                  v-model="form.box_structure"
+                  size="mini"
                  :placeholder="$t('common.all')"
                  class="filter-item"
                  @change="crud.toQuery"
@@ -110,7 +110,7 @@
            </el-col>
            <el-col :span="12">
              <el-form-item :label="$t('wms.basedata.st.boxType.desiccantQuantity') + ':'" prop="desiccant_num">
-                <el-input-number :precision="0" :step="1" :min="0" :max="100" v-model="form.desiccant_num" size="mini" :controls="true" style="width: 200px" />
+                <el-input-number v-model="form.desiccant_num" :precision="0" :step="1" :min="0" :max="100" size="mini" :controls="true" style="width: 200px" />
              </el-form-item>
            </el-col>
          </el-row>
@@ -160,7 +160,7 @@
            </el-col>
            <el-col :span="4">
              <span>
-                <el-button icon="el-icon-check" size="mini" type="primary" @click=confirmUpdate()>{{ $t('common.confirm') }}</el-button>
+                <el-button icon="el-icon-check" size="mini" type="primary" @click="confirmUpdate()">{{ $t('common.confirm') }}</el-button>
              </span>
            </el-col>
          </el-row>
@@ -184,8 +184,8 @@
        <el-table-column prop="need_lash_one" :label="$t('wms.basedata.st.boxType.isFirstLashing')" width="100" :formatter="formatOne" />
        <el-table-column prop="need_lash_two" :label="$t('wms.basedata.st.boxType.isSecondLashing')" width="100" :formatter="formatTwo" />
        <el-table-column prop="expend_width" :label="$t('wms.basedata.st.boxType.forkliftPickupWidth')" width="100" />
-        <el-table-column prop="box_structure" :label="$t('wms.basedata.st.boxType.boxStructure')" width="100" :formatter="boxType"/>
-        <el-table-column prop="desiccant_num" :label="$t('wms.basedata.st.boxType.desiccantQuantity')" width="100"/>
+        <el-table-column prop="box_structure" :label="$t('wms.basedata.st.boxType.boxStructure')" width="100" :formatter="boxType" />
+        <el-table-column prop="desiccant_num" :label="$t('wms.basedata.st.boxType.desiccantQuantity')" width="100" />
        <el-table-column
          v-permission="['admin','sectattr:edit','sectattr:del']"
          :label="$t('common.operation')"
--- a/lms/nladmin-ui/src/views/wms/basedata/st/userStor/index.vue
+++ b/lms/nladmin-ui/src/views/wms/basedata/st/userStor/index.vue
@@ -13,9 +13,9 @@
          class="filter-item"
          @keyup.enter.native="crud.toQuery"
        />
-        <rrOperation/>
+        <rrOperation />
      </div>
-      <crudOperation :permission="permission"/>
+      <crudOperation :permission="permission" />
    </div>
    <!-- 表单渲染 -->
    <el-row :gutter="15">
@@ -34,9 +34,9 @@
            @selection-change="crud.selectionChangeHandler"
            @current-change="handleCurrentChange"
          >
-            <el-table-column show-overflow-tooltip prop="username" :label="$t('common.username')"/>
-            <el-table-column show-overflow-tooltip prop="person_name" :label="$t('common.personName')"/>
-            <el-table-column prop="name" :label="$t('common.dept')"/>
+            <el-table-column show-overflow-tooltip prop="username" :label="$t('common.username')" />
+            <el-table-column show-overflow-tooltip prop="person_name" :label="$t('common.personName')" />
+            <el-table-column prop="name" :label="$t('common.dept')" />
            <!--<el-table-column show-overflow-tooltip prop="dept" label="部门">
              <template slot-scope="scope">
                <div>{{ scope.row.dept.name }}</div>
@@ -44,7 +44,7 @@
            </el-table-column>-->
          </el-table>
          <!--分页组件-->
-          <pagination/>
+          <pagination />
        </el-card>
      </el-col>
      <!-- 菜单授权 -->
@@ -71,14 +71,15 @@
            :data="tableData"
            tooltip-effect="dark"
            style="width: 100%"
-            @selection-change="handleSelectionChange">
+            @selection-change="handleSelectionChange"
+          >
            <el-table-column
              type="selection"
-              width="55">
-            </el-table-column>
+              width="55"
+            />
            <el-table-column prop="stor_code" :label="$t('wms.basedata.st.userStor.warehouseCode')" />
-            <el-table-column prop="stor_name" :label="$t('wms.basedata.st.userStor.warehouseName')"/>
-            <el-table-column prop="simple_name" :label="$t('wms.basedata.st.userStor.simpleName')"/>
+            <el-table-column prop="stor_name" :label="$t('wms.basedata.st.userStor.warehouseName')" />
+            <el-table-column prop="simple_name" :label="$t('wms.basedata.st.userStor.simpleName')" />
          </el-table>
        </el-card>
      </el-col>
--- a/lms/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/coolregionio.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/coolregionio.vue
@@ -71,13 +71,13 @@
      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="520px">
        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
          <el-form-item :label="$t('wms.pdm.ivt.coolpointivt.pointCode')" prop="point_code">
-            <el-input v-model="form.point_code" style="width: 370px;" :disabled="true"/>
+            <el-input v-model="form.point_code" style="width: 370px;" :disabled="true" />
          </el-form-item>
          <el-form-item :label="$t('wms.pdm.ivt.coolpointivt.productArea')">
-            <el-input v-model="form.product_area" style="width: 370px;" :disabled="true"/>
+            <el-input v-model="form.product_area" style="width: 370px;" :disabled="true" />
          </el-form-item>
          <el-form-item :label="$t('wms.pdm.ivt.coolpointivt.isUsed')">
-            <el-switch v-model="form.is_used" active-value="1" inactive-value="0"/>
+            <el-switch v-model="form.is_used" active-value="1" inactive-value="0" />
          </el-form-item>
          <el-form-item :label="$t('wms.pdm.ivt.coolpointivt.fullAxisStatus')" prop="full_point_status">
            <el-select
@@ -95,7 +95,7 @@
            </el-select>
          </el-form-item>
          <el-form-item :label="$t('wms.pdm.ivt.coolpointivt.containerName')">
-            <el-input v-model="form.container_name" style="width: 370px;"/>
+            <el-input v-model="form.container_name" style="width: 370px;" />
          </el-form-item>
          <el-form-item :label="$t('wms.pdm.ivt.coolpointivt.emptyAxisStatus')" prop="empty_point_status">
            <el-select
@@ -114,7 +114,7 @@
            </el-select>
          </el-form-item>
          <el-form-item :label="$t('wms.pdm.ivt.coolpointivt.emptyVehicleCode')">
-            <el-input v-model="form.empty_vehicle_code" style="width: 370px;"/>
+            <el-input v-model="form.empty_vehicle_code" style="width: 370px;" />
          </el-form-item>
          <el-form-item :label="$t('wms.pdm.ivt.coolpointivt.inventoryStatus')" prop="cool_ivt_status">
            <el-select
@@ -141,18 +141,18 @@
      <!--表格渲染-->
      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
        <el-table-column show-overflow-tooltip prop="bill_code" :label="$t('wms.pdm.ivt.coolpointivt.billCode')" width="120px" />
-        <el-table-column prop="io_type" :label="$t('wms.pdm.ivt.coolpointivt.ioType')" >
+        <el-table-column prop="io_type" :label="$t('wms.pdm.ivt.coolpointivt.ioType')">
          <template slot-scope="scope">
            {{ dict.label.io_type[scope.row.io_type] }}
          </template>
        </el-table-column>
        <el-table-column show-overflow-tooltip prop="qty" :label="$t('wms.pdm.ivt.coolpointivt.quantity')" />
- <!--       <el-table-column prop="bill_status" :label="$t('wms.pdm.ivt.coolpointivt.billStatus')" >
+        <!--       <el-table-column prop="bill_status" :label="$t('wms.pdm.ivt.coolpointivt.billStatus')" >
          <template slot-scope="scope">
            {{ dict.label.st_bill_status[scope.row.bill_status] }}
          </template>
        </el-table-column>-->
-  <!--      <el-table-column prop="is_used" :label="$t('wms.pdm.ivt.coolpointivt.isUsed')" >
+        <!--      <el-table-column prop="is_used" :label="$t('wms.pdm.ivt.coolpointivt.isUsed')" >
          <template slot-scope="scope">
            {{ dict.label.is_used[scope.row.is_used] }}
          </template>
@@ -165,7 +165,7 @@
        <el-table-column prop="create_time" :label="$t('wms.pdm.ivt.coolpointivt.createdTime')" min-width="150" show-overflow-tooltip />
        <el-table-column prop="confirm_optname" :label="$t('wms.pdm.ivt.coolpointivt.confirmedBy')" />
        <el-table-column prop="confirm_time" :label="$t('wms.pdm.ivt.coolpointivt.confirmedTime')" min-width="150" show-overflow-tooltip />
-<!--        <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
+        <!--        <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
          <template slot-scope="scope">
            <udOperation
              :data="scope.row"
@@ -189,7 +189,7 @@ import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'

-const defaultForm = { iostorinv_id: null, bill_code: null, io_type: null, material_id: null, pcsn: null, vehicle_code: null, qty: null, qty_unit_id: null, bill_status: null,  start_point_code: null, end_point_code: null, cust_id: null, create_mode: null, task_id: null, remark: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null, confirm_optid: null, confirm_optname: null, confirm_time: null, is_delete: null }
+const defaultForm = { iostorinv_id: null, bill_code: null, io_type: null, material_id: null, pcsn: null, vehicle_code: null, qty: null, qty_unit_id: null, bill_status: null, start_point_code: null, end_point_code: null, cust_id: null, create_mode: null, task_id: null, remark: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null, confirm_optid: null, confirm_optname: null, confirm_time: null, is_delete: null }
 export default {
  name: 'CoolRegionIO',
  dicts: ['sch_cool_ivt_status', 'ST_CREATE_MODE', 'point_location', 'product_area', 'st_bill_status', 'io_type'],
--- a/lms/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/index.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/index.vue
@@ -6,7 +6,7 @@
        <Inventory />
      </el-tab-pane>
      <el-tab-pane :label="$t('wms.pdm.ivt.coolpointivt.coolRegionIO')">
-        <CoolRegionIO/>
+        <CoolRegionIO />
      </el-tab-pane>
    </el-tabs>
  </div>
--- a/lms/nladmin-ui/src/views/wms/pdm/ivt/hotpointivt/Dialog.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/ivt/hotpointivt/Dialog.vue
@@ -10,13 +10,13 @@
  >
    <el-form ref="form" :model="form1" size="mini" label-width="110px">
      <el-form-item :label="$t('wms.pdm.ivt.hotpointivt.containerName')" prop="container_name">
-        <el-input v-model="form1.container_name" clearable size="mini"/>
+        <el-input v-model="form1.container_name" clearable size="mini" />
      </el-form-item>
      <el-form-item :label="$t('wms.pdm.ivt.hotpointivt.bakingTime')" prop="oven_time">
-        <el-input v-model="form1.oven_time" clearable size="mini"/>
+        <el-input v-model="form1.oven_time" clearable size="mini" />
      </el-form-item>
      <el-form-item :label="$t('wms.pdm.ivt.hotpointivt.bakingTemperature')" prop="temperature">
-        <el-input v-model="form1.temperature" clearable size="mini"/>
+        <el-input v-model="form1.temperature" clearable size="mini" />
      </el-form-item>
    </el-form>

@@ -45,6 +45,12 @@ export default {
      type: Object
    }
  },
+  data() {
+    return {
+      form1: {},
+      dialogVisible: false
+    }
+  },
  watch: {
    dialogShow: {
      handler(newValue, oldValue) {
@@ -53,12 +59,6 @@ export default {
      }
    }
  },
-  data() {
-    return {
-      form1: {},
-      dialogVisible: false
-    }
-  },
  methods: {
    handleClose(done) {
      this.$confirm(this.$t('wms.pdm.ivt.hotpointivt.confirmClose'))
--- a/lms/nladmin-ui/src/views/wms/pdm/ivt/package/index.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/ivt/package/index.vue
@@ -80,7 +80,7 @@
      >
        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
          <el-form-item :label="$t('wms.pdm.ivt.package.pointCode')" prop="point_code">
-            <el-input v-model="form.point_code" style="width: 370px;" disabled/>
+            <el-input v-model="form.point_code" style="width: 370px;" disabled />
          </el-form-item>
          <el-form-item :label="$t('wms.pdm.ivt.package.productArea')">
            <el-select
@@ -136,7 +136,7 @@
            <el-input v-model="form.container_name2" style="width: 370px;" />
          </el-form-item>
          <el-form-item :label="$t('wms.pdm.ivt.package.sortSeq')" prop="sort_seq">
-            <el-input v-model="form.sort_seq" style="width: 370px;" disabled/>
+            <el-input v-model="form.sort_seq" style="width: 370px;" disabled />
          </el-form-item>
          <el-form-item :label="$t('common.is_used')" prop="is_used">
            <el-switch v-model="form.is_used" active-value="1" inactive-value="0" />
@@ -174,7 +174,7 @@
            {{ dict.label.is_used[scope.row.is_used] }}
          </template>
        </el-table-column>
-        <el-table-column prop="update_time" :label="$t('common.update_time')" show-overflow-tooltip width="150px;"/>
+        <el-table-column prop="update_time" :label="$t('common.update_time')" show-overflow-tooltip width="150px;" />
        <el-table-column v-permission="[]" :label="$t('common.Operate')" width="120px" align="center" fixed="right">
          <template slot-scope="scope">
            <udOperation
--- a/lms/nladmin-ui/src/views/wms/pdm/ivt/packageinfoivt/index.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/ivt/packageinfoivt/index.vue
@@ -223,8 +223,8 @@ export default {
      sort: 'ivt_id,desc',
      crudMethod: { ...crudDeliverypointivt },
      query: {
-        packageinfo_area:'3',
-        size:100
+        packageinfo_area: '3',
+        size: 100
      },
      optShow: {
        add: false,
@@ -256,19 +256,19 @@ export default {
    [CRUD.HOOK.beforeRefresh]() {
      return true
    },
-    rowStyle({row,index}){
-      let backgroun = {}
-      if (row.container_name!=null && row.update_time!=null && row.update_time!=undefined){
-        let now = new Date()
-        let before = new Date(row.update_time)
-        const diff = now.getTime() - before.getTime();
-        let min = Math.floor(diff/(1000*60))
+    rowStyle({ row, index }) {
+      const backgroun = {}
+      if (row.container_name != null && row.update_time != null && row.update_time != undefined) {
+        const now = new Date()
+        const before = new Date(row.update_time)
+        const diff = now.getTime() - before.getTime()
+        const min = Math.floor(diff / (1000 * 60))
        console.log(min)
-        if (min>120){
-          backgroun.background = 'red';
+        if (min > 120) {
+          backgroun.background = 'red'
        }
      }
-      return backgroun;
+      return backgroun
    },
    hand(value) {
      this.crud.toQuery()
--- a/lms/nladmin-ui/src/views/wms/pdm/order/rawfoilworkorder/index.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/order/rawfoilworkorder/index.vue
@@ -67,16 +67,17 @@
            </el-select>
          </el-form-item>

-          <el-form-item :label="$t('wms.pdm.order.rawfoilworkorder.orderDate')"
+          <el-form-item
+            v-model="query.createTime"
+            :label="$t('wms.pdm.order.rawfoilworkorder.orderDate')"
            <el-date-picker
-              v-model="query.createTime"
-              type="daterange"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              :start-placeholder="$t('common.startDate')"
-              :end-placeholder="$t('common.endDate')"
-              :default-time="['00:00:00', '23:59:59']"
-              @change="crud.toQuery"
-            />
+            type="daterange"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            :start-placeholder="$t('common.startDate')"
+            :end-placeholder="$t('common.endDate')"
+            :default-time="['00:00:00', '23:59:59']"
+            @change="crud.toQuery"
+          />
          </el-form-item>

          <rrOperation />
--- a/lms/nladmin-ui/src/views/wms/st/inStor/productscrap/index.vue
+++ b/lms/nladmin-ui/src/views/wms/st/inStor/productscrap/index.vue
@@ -164,17 +164,17 @@
            <el-link type="warning" @click="crud.toView(scope.row)">{{ scope.row.scrap_code }}</el-link>
          </template>
        </el-table-column>
-        <el-table-column :formatter="stateFormat" prop="bill_status" :label="$t('wms.st.inStor.productscrap.documentStatus')" :min-width="flexWidth('bill_status',crud.data,'单据状态')"/>
-        <el-table-column prop="stor_name" :label="$t('wms.st.inStor.productscrap.warehouse')" :min-width="flexWidth('stor_name',crud.data,'仓库')"/>
-        <el-table-column prop="biz_date" :label="$t('wms.st.inStor.productscrap.businessDate')" :min-width="flexWidth('biz_date',crud.data,'业务日期')"/>
-        <el-table-column :label="$t('wms.st.inStor.productscrap.detailCount')" prop="detail_count" :min-width="flexWidth('detail_count',crud.data,'明细数')"/>
-        <el-table-column :label="$t('wms.st.inStor.productscrap.totalWeight')" prop="total_qty" :min-width="flexWidth('total_qty',crud.data,'总重量')"/>
-        <el-table-column prop="ext_code" :label="$t('wms.st.inStor.productscrap.externalIdentifier')" :min-width="flexWidth('ext_code',crud.data,'外部标识')"/>
-        <el-table-column prop="input_optname" :label="$t('wms.st.inStor.productscrap.createdBy')" :min-width="flexWidth('input_optname',crud.data,'创建人')"/>
-        <el-table-column prop="input_time" :label="$t('wms.st.inStor.productscrap.createdDate')" :min-width="flexWidth('input_time',crud.data,'创建日期')"/>
-        <el-table-column prop="confirm_optname" :label="$t('wms.st.inStor.productscrap.confirmedBy')" :min-width="flexWidth('confirm_optname',crud.data,'确认人')"/>
-        <el-table-column prop="confirm_time" :label="$t('wms.st.inStor.productscrap.confirmedTime')" :min-width="flexWidth('confirm_time',crud.data,'确认时间')"/>
-        <el-table-column prop="remark" :label="$t('wms.st.inStor.productscrap.remark')" :min-width="flexWidth('remark',crud.data,'备注')"/>
+        <el-table-column :formatter="stateFormat" prop="bill_status" :label="$t('wms.st.inStor.productscrap.documentStatus')" :min-width="flexWidth('bill_status',crud.data,'单据状态')" />
+        <el-table-column prop="stor_name" :label="$t('wms.st.inStor.productscrap.warehouse')" :min-width="flexWidth('stor_name',crud.data,'仓库')" />
+        <el-table-column prop="biz_date" :label="$t('wms.st.inStor.productscrap.businessDate')" :min-width="flexWidth('biz_date',crud.data,'业务日期')" />
+        <el-table-column :label="$t('wms.st.inStor.productscrap.detailCount')" prop="detail_count" :min-width="flexWidth('detail_count',crud.data,'明细数')" />
+        <el-table-column :label="$t('wms.st.inStor.productscrap.totalWeight')" prop="total_qty" :min-width="flexWidth('total_qty',crud.data,'总重量')" />
+        <el-table-column prop="ext_code" :label="$t('wms.st.inStor.productscrap.externalIdentifier')" :min-width="flexWidth('ext_code',crud.data,'外部标识')" />
+        <el-table-column prop="input_optname" :label="$t('wms.st.inStor.productscrap.createdBy')" :min-width="flexWidth('input_optname',crud.data,'创建人')" />
+        <el-table-column prop="input_time" :label="$t('wms.st.inStor.productscrap.createdDate')" :min-width="flexWidth('input_time',crud.data,'创建日期')" />
+        <el-table-column prop="confirm_optname" :label="$t('wms.st.inStor.productscrap.confirmedBy')" :min-width="flexWidth('confirm_optname',crud.data,'确认人')" />
+        <el-table-column prop="confirm_time" :label="$t('wms.st.inStor.productscrap.confirmedTime')" :min-width="flexWidth('confirm_time',crud.data,'确认时间')" />
+        <el-table-column prop="remark" :label="$t('wms.st.inStor.productscrap.remark')" :min-width="flexWidth('remark',crud.data,'备注')" />
      </el-table>
      <!--分页组件-->
      <pagination />
--- a/lms/nladmin-ui/src/views/wms/st/inbill/index.vue
+++ b/lms/nladmin-ui/src/views/wms/st/inbill/index.vue
@@ -229,7 +229,7 @@
          </template>
        </el-table-column>
        <el-table-column show-overflow-tooltip :formatter="stateFormat" prop="bill_status" :label="$t('wms.st.inbill.documentStatus')" />
-        <el-table-column prop="stor_name" :label="$t('wms.st.inbill.warehouse')" width="100px;"/>
+        <el-table-column prop="stor_name" :label="$t('wms.st.inbill.warehouse')" width="100px;" />
        <el-table-column show-overflow-tooltip prop="bill_type" min-width="120" :formatter="bill_typeFormat" :label="$t('wms.st.inbill.businessType')" />
        <el-table-column show-overflow-tooltip min-width="120" prop="biz_date" :label="$t('wms.st.inbill.businessDate')" />
        <el-table-column show-overflow-tooltip prop="create_mode" :formatter="create_modeFormat" :label="$t('wms.st.inbill.generationMethod')" />
@@ -241,9 +241,9 @@
        </el-table-column>
        <el-table-column :label="$t('wms.st.inbill.deliveryNote')" align="center" prop="vbeln" width="150px" />
        <el-table-column :label="$t('wms.st.inbill.remark')" align="center" prop="remark" />
-        <el-table-column :label="$t('wms.st.inbill.createdBy')" align="center" prop="input_optname" width="100px;"/>
+        <el-table-column :label="$t('wms.st.inbill.createdBy')" align="center" prop="input_optname" width="100px;" />
        <el-table-column :label="$t('wms.st.inbill.createdTime')" align="center" prop="input_time" width="150" />
-        <el-table-column :label="$t('wms.st.inbill.updatedBy')" align="center" prop="update_optname" width="100px;"/>
+        <el-table-column :label="$t('wms.st.inbill.updatedBy')" align="center" prop="update_optname" width="100px;" />
        <el-table-column :label="$t('wms.st.inbill.updatedTime')" align="center" prop="update_time" width="150" />
        <el-table-column :label="$t('wms.st.inbill.allocatedBy')" align="center" prop="dis_optname" width="140px" />
        <el-table-column :label="$t('wms.st.inbill.allocatedTime')" align="center" prop="dis_time" width="150" />