From e286948f47affea4352644c28b1034dcb0ce0c49 Mon Sep 17 00:00:00 2001
From: ldj_willow <ldj_willow@163.com>
Date: Thu, 27 Oct 2022 09:09:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/wms/pub/StructDialog.vue        |  4 +--
 .../src/views/wms/st/inbill/AddDtl.vue        | 32 +++++++++----------
 .../views/wms/st/inbill/BucketDtlDialog.vue   | 30 ++++++++---------
 .../src/views/wms/st/inbill/TaskDialog.vue    |  2 +-
 .../src/views/wms/st/inbill/ViewDialog.vue    | 22 ++++++-------
 .../src/views/wms/st/outbill/AddDialog.vue    |  6 ++--
 .../src/views/wms/st/outbill/TaskDialog.vue   |  2 +-
 .../src/views/wms/st/outbill/ViewDialog.vue   | 20 ++++++------
 .../src/views/wms/st/outbill/checkoutbill.js  |  2 +-
 9 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/lms/nladmin-ui/src/views/wms/pub/StructDialog.vue b/lms/nladmin-ui/src/views/wms/pub/StructDialog.vue
index c651e3dbc..c90bb88fc 100644
--- a/lms/nladmin-ui/src/views/wms/pub/StructDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/pub/StructDialog.vue
@@ -12,8 +12,8 @@
     <el-row>
       <el-col :span="6">
         <el-cascader
-          placeholder="所属库区"
           v-model="query.sect"
+          placeholder="所属库区"
           :options="sects"
           :props="{ checkStrictly: true }"
           clearable
@@ -79,7 +79,7 @@ export default {
       url: 'api/structattr',
       idField: 'struct_id',
       sort: 'struct_id,desc',
-      query: { search: '', is_lock: '1', lock_type: '',sect_id: '', stor_id: '' },
+      query: { search: '', is_lock: '1', lock_type: '', sect_id: '', stor_id: '' },
       crudMethod: { ...crudStructattr }
     })
   },
diff --git a/lms/nladmin-ui/src/views/wms/st/inbill/AddDtl.vue b/lms/nladmin-ui/src/views/wms/st/inbill/AddDtl.vue
index cd3631df5..2642801a8 100644
--- a/lms/nladmin-ui/src/views/wms/st/inbill/AddDtl.vue
+++ b/lms/nladmin-ui/src/views/wms/st/inbill/AddDtl.vue
@@ -22,22 +22,22 @@
           @keyup.enter.native="crud.toQuery"
         />
         <el-input
-            v-model="query.package_box_sn"
-            clearable
-            size="mini"
-            placeholder="箱号"
-            style="width: 200px;"
-            class="filter-item"
-            @keyup.enter.native="crud.toQuery"
+          v-model="query.package_box_sn"
+          clearable
+          size="mini"
+          placeholder="箱号"
+          style="width: 200px;"
+          class="filter-item"
+          @keyup.enter.native="crud.toQuery"
         />
         <el-input
-            v-model="query.container_name"
-            clearable
-            size="mini"
-            placeholder="子卷号"
-            style="width: 200px;"
-            class="filter-item"
-            @keyup.enter.native="crud.toQuery"
+          v-model="query.container_name"
+          clearable
+          size="mini"
+          placeholder="子卷号"
+          style="width: 200px;"
+          class="filter-item"
+          @keyup.enter.native="crud.toQuery"
         />
         <el-input
           v-model="query.material_search"
@@ -143,12 +143,12 @@ export default {
           return {
             rowspan: 2,
             colspan: 1
-          };
+          }
         } else {
           return {
             rowspan: 0,
             colspan: 0
-          };
+          }
         }
       }
     },
diff --git a/lms/nladmin-ui/src/views/wms/st/inbill/BucketDtlDialog.vue b/lms/nladmin-ui/src/views/wms/st/inbill/BucketDtlDialog.vue
index f1f15982c..33d2aee87 100644
--- a/lms/nladmin-ui/src/views/wms/st/inbill/BucketDtlDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/st/inbill/BucketDtlDialog.vue
@@ -17,38 +17,38 @@
       @select="handleSelectionChange"
       @select-all="onSelectAll"
     >
-      <el-table-column prop="bucketunique" label="桶号" min-width="100" show-overflow-tooltip/>
-      <el-table-column prop="label" label="桶类别"/>
-      <el-table-column prop="material_code" label="物料编码" width="120px"/>
-      <el-table-column prop="material_name" label="物料名称" min-width="120"/>
-      <el-table-column prop="pcsn" label="批次" min-width="100" show-overflow-tooltip/>
+      <el-table-column prop="bucketunique" label="桶号" min-width="100" show-overflow-tooltip />
+      <el-table-column prop="label" label="桶类别" />
+      <el-table-column prop="material_code" label="物料编码" width="120px" />
+      <el-table-column prop="material_name" label="物料名称" min-width="120" />
+      <el-table-column prop="pcsn" label="批次" min-width="100" show-overflow-tooltip />
       <el-table-column prop="storage_qty" label="数量">
         <template slot-scope="scope">
           {{ fun(scope.row.storage_qty) }}
         </template>
       </el-table-column>
-      <el-table-column prop="qty_unit_name" label="单位"/>
-      <el-table-column prop="quality_scode" :formatter="qualityFormat" label="品质类型"/>
-      <el-table-column prop="ivt_level" :formatter="ivtFormat" label="库存等级"/>
-      <el-table-column prop="is_active" :formatter="activeFormat" label="是否可用"/>
-      <el-table-column prop="storagevehicle_code" label="载具号"/>
-      <el-table-column prop="record_order" label="顺序号"/>
-      <el-table-column prop="bag_qty" label="袋数"/>
+      <el-table-column prop="qty_unit_name" label="单位" />
+      <el-table-column prop="quality_scode" :formatter="qualityFormat" label="品质类型" />
+      <el-table-column prop="ivt_level" :formatter="ivtFormat" label="库存等级" />
+      <el-table-column prop="is_active" :formatter="activeFormat" label="是否可用" />
+      <el-table-column prop="storagevehicle_code" label="载具号" />
+      <el-table-column prop="record_order" label="顺序号" />
+      <el-table-column prop="bag_qty" label="袋数" />
     </el-table>
     <!--分页组件-->
-    <pagination/>
+    <pagination />
   </el-dialog>
 </template>
 
 <script>
 
-import CRUD, {crud} from '@crud/crud'
+import CRUD, { crud } from '@crud/crud'
 import crudOperation from '@crud/CRUD.operation'
 import pagination from '@crud/Pagination'
 
 export default {
   name: 'BucketDtlDiv',
-  components: {crudOperation, pagination},
+  components: { crudOperation, pagination },
   mixins: [crud()],
   props: {
     dialogShow: {
diff --git a/lms/nladmin-ui/src/views/wms/st/inbill/TaskDialog.vue b/lms/nladmin-ui/src/views/wms/st/inbill/TaskDialog.vue
index 48db4879d..67b208d77 100644
--- a/lms/nladmin-ui/src/views/wms/st/inbill/TaskDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/st/inbill/TaskDialog.vue
@@ -166,7 +166,7 @@ import crudRawAssist from '@/views/wms/st/inbill/rawassist'
 
 export default {
   name: 'TaskDialog',
-  components: {StructUpdateDiv },
+  components: { StructUpdateDiv },
   mixins: [crud()],
   dicts: ['io_bill_status', 'task_status'],
   props: {
diff --git a/lms/nladmin-ui/src/views/wms/st/inbill/ViewDialog.vue b/lms/nladmin-ui/src/views/wms/st/inbill/ViewDialog.vue
index 93c1cc984..2b1b21782 100644
--- a/lms/nladmin-ui/src/views/wms/st/inbill/ViewDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/st/inbill/ViewDialog.vue
@@ -8,7 +8,7 @@
     @close="close"
     @open="open"
   >
-    <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form"  size="mini" label-width="85px" label-suffix=":">
+    <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" size="mini" label-width="85px" label-suffix=":">
       <el-form-item label="单据号" prop="bill_code">
         <label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
         <el-input v-model="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px" />
@@ -105,9 +105,9 @@
         @current-change="handleDtlCurrentChange"
       >
         <el-table-column type="index" label="序号" width="55" align="center" />
-        <el-table-column min-width="120" show-overflow-tooltip  prop="bill_code" label="出入库单号" align="center" />
+        <el-table-column min-width="120" show-overflow-tooltip prop="bill_code" label="出入库单号" align="center" />
         <el-table-column :formatter="bill_statusFormat" prop="bill_status" label="状态" />
-        <el-table-column min-width="120" show-overflow-tooltip  prop="material_code" label="物料编码" align="center" />
+        <el-table-column min-width="120" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
         <el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
         <el-table-column prop="pcsn" label="批次号" align="center" />
         <el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
@@ -135,13 +135,13 @@
       >
         <el-table-column min-width="120" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
         <el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
-        <el-table-column  prop="pcsn" label="批次号" align="center" />
+        <el-table-column prop="pcsn" label="批次号" align="center" />
         <el-table-column prop="storagevehicle_code" label="载具号" align="center" />
-        <el-table-column  prop="bucket_num" label="桶数" :formatter="crud.formatNum0" align="center" />
+        <el-table-column prop="bucket_num" label="桶数" :formatter="crud.formatNum0" align="center" />
         <el-table-column prop="total_storage_qty" :formatter="crud.formatNum3" label="重量" align="center" />
-        <el-table-column  prop="start_point_code" label="起始位置" align="center" />
-        <el-table-column  prop="next_point_code" label="目的位置" align="center" />
-        <el-table-column  prop="task_code" label="任务号" align="center" />
+        <el-table-column prop="start_point_code" label="起始位置" align="center" />
+        <el-table-column prop="next_point_code" label="目的位置" align="center" />
+        <el-table-column prop="task_code" label="任务号" align="center" />
         <el-table-column prop="taskdtl_type" label="任务类型" align="center" width="150px" :formatter="taskdtl_typeFormat" />
         <el-table-column prop="task_status" label="状态" align="center" width="110px" :formatter="task_statusFormat" />
       </el-table>
@@ -153,8 +153,8 @@
 
 import { crud } from '@crud/crud'
 import checkoutbill from '@/views/wms/st/outbill/checkoutbill'
-import crudStorattr from "@/views/wms/basedata/st/stor/storattr";
-import crudRawAssist from "@/views/wms/st/inbill/rawassist";
+import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
+import crudRawAssist from '@/views/wms/st/inbill/rawassist'
 
 export default {
   name: 'ViewDialog',
@@ -179,7 +179,7 @@ export default {
       storlist: [],
       currentdtl: null,
       currentDis: {},
-      form:{}
+      form: {}
     }
   },
   watch: {
diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue b/lms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue
index dafe1aa1d..ca3ce3ec9 100644
--- a/lms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue
@@ -159,12 +159,12 @@
       </el-table-column>
       <el-table-column prop="plan_qty" label="出库重量" width="150" align="center">
         <template scope="scope">
-          <el-input-number v-model="scope.row.plan_qty" v-show="!scope.row.edit" :precision="3" :controls="false" :min="1" style="width: 120px" />
+          <el-input-number v-show="!scope.row.edit" v-model="scope.row.plan_qty" :precision="3" :controls="false" :min="1" style="width: 120px" />
           <span v-show="scope.row.edit">{{ scope.row.plan_qty }}</span>
         </template>
       </el-table-column>
       <el-table-column prop="qty_unit_name" label="单位" align="center" />
-     <!-- <el-table-column prop="quality_scode" label="品质类型" align="center" width="110px">
+      <!-- <el-table-column prop="quality_scode" label="品质类型" align="center" width="110px">
         <template slot-scope="scope">
           <el-select
             v-model="scope.row.quality_scode"
@@ -307,7 +307,7 @@ export default {
       crudStorattr.getStor({ 'is_productstore': '1' }).then(res => {
         this.storlist = res.content
       })
- /*     crudRawAssist.getType({ 'io_code': '0101', 'io_flag': '01' }).then(res => {
+      /*     crudRawAssist.getType({ 'io_code': '0101', 'io_flag': '01' }).then(res => {
         this.billtypelist = res
       })
       checkoutbill.getInvTypes().then(res => {
diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/TaskDialog.vue b/lms/nladmin-ui/src/views/wms/st/outbill/TaskDialog.vue
index 34cf30c22..8ff0a2acd 100644
--- a/lms/nladmin-ui/src/views/wms/st/outbill/TaskDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/st/outbill/TaskDialog.vue
@@ -1,8 +1,8 @@
 <template>
   <el-dialog
+    v-loading.fullscreen.lock="fullscreenLoading"
     append-to-body
     :visible.sync="dialogVisible"
-    v-loading.fullscreen.lock="fullscreenLoading"
     destroy-on-close
     :show-close="false"
     fullscreen
diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue b/lms/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue
index 555f89694..e99779221 100644
--- a/lms/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue
@@ -8,7 +8,7 @@
     @close="close"
     @open="open"
   >
-    <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form"  size="mini" label-width="85px" label-suffix=":">
+    <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" size="mini" label-width="85px" label-suffix=":">
       <el-form-item label="单据号" prop="bill_code">
         <label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
         <el-input v-model="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px" />
@@ -105,9 +105,9 @@
         @current-change="handleDtlCurrentChange"
       >
         <el-table-column type="index" label="序号" width="55" align="center" />
-        <el-table-column  prop="bill_code" label="出库单号" align="center" />
+        <el-table-column prop="bill_code" label="出库单号" align="center" />
         <el-table-column :formatter="bill_statusFormat" prop="bill_status" label="状态" />
-        <el-table-column  min-width="120" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
+        <el-table-column min-width="120" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
         <el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
         <el-table-column prop="pcsn" label="批次号" align="center" />
         <el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
@@ -135,12 +135,12 @@
       >
         <el-table-column min-width="120" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
         <el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
-        <el-table-column  prop="pcsn" label="子卷批次号" align="center" />
+        <el-table-column prop="pcsn" label="子卷批次号" align="center" />
         <el-table-column prop="storagevehicle_code" label="箱号" align="center" />
         <el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
-        <el-table-column  prop="start_point_code" label="起始位置" align="center" />
-        <el-table-column  prop="next_point_code" label="目的位置" align="center" />
-        <el-table-column  prop="task_code" label="任务号" align="center" />
+        <el-table-column prop="start_point_code" label="起始位置" align="center" />
+        <el-table-column prop="next_point_code" label="目的位置" align="center" />
+        <el-table-column prop="task_code" label="任务号" align="center" />
         <el-table-column prop="task_type" label="任务类型" align="center" width="150px" :formatter="taskdtl_typeFormat" />
         <el-table-column prop="task_status" label="状态" align="center" width="110px" :formatter="task_statusFormat" />
       </el-table>
@@ -152,8 +152,8 @@
 
 import { crud } from '@crud/crud'
 import checkoutbill from '@/views/wms/st/outbill/checkoutbill'
-import crudStorattr from "@/views/wms/basedata/st/stor/storattr";
-import crudRawAssist from "@/views/wms/st/inbill/rawassist";
+import crudStorattr from '@/views/wms/basedata/st/stor/storattr'
+import crudRawAssist from '@/views/wms/st/inbill/rawassist'
 
 export default {
   name: 'ViewDialog',
@@ -178,7 +178,7 @@ export default {
       storlist: [],
       currentdtl: null,
       currentDis: {},
-      form:{}
+      form: {}
     }
   },
   watch: {
diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/checkoutbill.js b/lms/nladmin-ui/src/views/wms/st/outbill/checkoutbill.js
index 4af94a5e0..ea2ceae94 100644
--- a/lms/nladmin-ui/src/views/wms/st/outbill/checkoutbill.js
+++ b/lms/nladmin-ui/src/views/wms/st/outbill/checkoutbill.js
@@ -155,4 +155,4 @@ export function getType() {
     method: 'get'
   })
 }
-export default { add, edit, del, allDiv, allCancel, getOutBillDtl, getOutBillDis, setPoint, getOutBillTask, getStructIvt, manualDiv, confirm, issueTask, finishTask, cancleTaskfinish, getInvTypes, paramByCodeType, schAreaType,backConfirm, getOutBillDisDtl, getType }
+export default { add, edit, del, allDiv, allCancel, getOutBillDtl, getOutBillDis, setPoint, getOutBillTask, getStructIvt, manualDiv, confirm, issueTask, finishTask, cancleTaskfinish, getInvTypes, paramByCodeType, schAreaType, backConfirm, getOutBillDisDtl, getType }