Merge remote-tracking branch 'origin/master'

lms/nladmin-ui/src/views/wms/st/inbill/ViewDialog.vue

@@ -96,6 +96,7 @@
       <el-table
         ref="table"
         :data="tableDtl"
+        v-loading="loading"
         style="width: 100%;"
         max-height="300"
         size="mini"
@@ -126,6 +127,7 @@
       <el-table
         ref="table2"
         :data="tabledis"
+        v-loading="loading2"
         style="width: 100%;"
         max-height="300"
         size="mini"
@@ -172,6 +174,8 @@ export default {
   data() {
     return {
       dialogVisible: false,
+      loading2: false,
+      loading: true,
       tableDtl: [],
       tabledis: [],
       billtypelist: [],
@@ -212,6 +216,8 @@ export default {
       this.tableDtl = []
       this.tabledis = []
       this.$emit('TaskChanged')
+      this.loading = true
+      this.loading2 = false
     },
     bill_statusFormat(row) {
       return this.dict.label.io_bill_status[row.bill_status]
@@ -229,6 +235,7 @@ export default {
       if (current !== null) {
         this.tabledis = []
         this.currentdtl = current
+        this.loading2 = true
         this.queryTableDdis()
       } else {
         this.tabledis = []
@@ -248,14 +255,17 @@ export default {
     queryTableDtl() {
       checkoutbill.getOutBillDtl({ 'iostorinv_id': this.form.iostorinv_id }).then(res => {
         this.tableDtl = res
+        this.loading = false
       })
     },
     queryTableDdis() {
       if (this.currentdtl !== null) {
-        checkoutbill.getOutBillTask({ 'iostorinvdtl_id': this.currentdtl.iostorinvdtl_id }).then(res => {
+        checkoutbill.getOutBillTask2({ 'iostorinvdtl_id': this.currentdtl.iostorinvdtl_id }).then(res => {
           this.tabledis = res
         }).catch(() => {
           this.tabledis = []
+        }).finally(() => {
+          this.loading2 = false
         })
       }
     }

lms/nladmin-ui/src/views/wms/st/outbill/AddDialog.vue

@@ -57,8 +57,8 @@
         >
           <el-option
             v-for="item in dict.ST_INV_OUT_TYPE"
-            :disabled="item.value === '1099'"
             :key="item.value"
+            :disabled="item.value === '1099'"
             :label="item.label"
             :value="item.value"
           />
@@ -99,7 +99,7 @@
       <el-form-item label="业务日期" prop="biz_date">
         <el-date-picker v-model="form.biz_date" type="date" placeholder="选择日期" style="width: 210px" value-format="yyyy-MM-dd" :disabled="crud.status.view > 0" />
       </el-form-item>
-      <el-form-item label="移入仓库" prop="out_stor_id" v-if="form.bill_type === '1004'" required="true">
+      <el-form-item v-if="form.bill_type === '1004'" label="移入仓库" prop="out_stor_id" required="true">
         <label slot="label">移入仓库:</label>
         <el-select
           v-model="form.out_stor_id"
@@ -236,7 +236,7 @@
         </template>
       </el-table-column>-->
 
-<!--      <el-table-column prop="source_bill_type" label="源单类型" align="center" width="130px" :formatter="invtypeFormat" show-overflow-tooltip />-->
+      <!--      <el-table-column prop="source_bill_type" label="源单类型" align="center" width="130px" :formatter="invtypeFormat" show-overflow-tooltip />-->
       <el-table-column prop="source_bill_code" label="源单号" align="center" width="130px" show-overflow-tooltip />
       <el-table-column show-overflow-tooltip prop="remark" label="明细备注" align="center">
         <template scope="scope">
@@ -349,7 +349,7 @@ export default {
           this.crud.notify('移入仓库不能为空！', CRUD.NOTIFICATION_TYPE.INFO)
           return false
         }
-        /*if (this.form.out_stor_id === this.form.stor_id) {
+        /* if (this.form.out_stor_id === this.form.stor_id) {
           this.crud.notify('移出仓库和移入仓库不能一致！', CRUD.NOTIFICATION_TYPE.INFO)
           return false
         }*/
@@ -441,7 +441,7 @@ export default {
       const data = {
         'data': rows
       }
-      if(this.form.bill_type === '1011') {
+      if (this.form.bill_type === '1011') {
         rows.forEach((item) => {
           if (this.form.tableData.length !== 0) {
             this.flagnow = false
@@ -463,9 +463,10 @@ export default {
         })
         this.form.detail_count = this.form.tableData.length
       } else {
+        // 为了整箱出库
         checkoutbill.queryBox(data).then(res => {
           res.forEach((item) => {
-            debugger
+            // debugger
             if (this.form.tableData.length !== 0) {
               this.flagnow = false
               for (let i = 0; i < this.form.tableData.length; i++) {

lms/nladmin-ui/src/views/wms/st/outbill/index.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="app-container">
+    <!--  出库管理 -->
     <!--工具栏-->
     <div class="head-container">
       <div v-if="crud.props.searchToggle">