修正商场预约

src/views/mail/order/add.vue

@@ -1,6 +1,6 @@
 <template>
   <basic-container>
-    <div class="avue-crud">
+    <div class="avue-crud"  v-loading="subloading"  element-loading-text="正在拼命加载中">
       <el-form
               ref="form"
               :model="form"
@@ -123,8 +123,8 @@
           </el-col>
         </el-row>
       </el-form>
-
-      <el-tabs type="border-card" @tab-click="handleClick">
+     
+      <el-tabs type="border-card" @tab-click="handleClick" >
         <el-tab-pane label="订单">
           <el-button class="el-btn-xz" type="primary" link @click="handleAddOrder">新 增</el-button>
           <tablecmt
@@ -235,6 +235,7 @@
       </el-tabs>
       <el-form-item style="margin-left: 45%; margin-top: 5px">
         <el-button type="primary" icon="el-icon-circle-close" @click="onSubmit"
+        :disabled="subloading"
         >提交(配送订单预约)
         </el-button>
         <el-button icon="el-icon-circle-close" @click="$router.go(-1)">返 回</el-button>
@@ -635,6 +636,7 @@
   export default {
     data() {
       return {
+        subloading:false,//提交加载效果
         columnList: [
           {
             prop: 'waybillNumber',
@@ -2268,7 +2270,6 @@
         this.obj = row;
         let page = this.page;
         this.toggleAllSelection;
-        console.log('row>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>', row);
         if (this.reservationId) {
           const res = await getReservationPackageListByOrderId(
                   this.reservationId,
@@ -2276,7 +2277,6 @@
                   page.currentPage,
                   page.pageSize
           );
-          console.log('->>>>>>>>>>>>>>>>>>查看包件', res);
           if (res.data.data) {
             this.packageData = res.data.data.data.packageList;
             let idList = res.data.data.data.reservationPackageList.map(v => {
@@ -2287,7 +2287,8 @@
           this.isaddvalue = true;
           this.loading = false;
         } else {
-          getPackageListByStockArticleId(page.currentPage, page.pageSize, row.id).then(res => {
+          console.log(">>>>> id ，",row.id);
+          getPackageListByStockArticleId(page.currentPage, page.pageSize, {id:row.id}).then(res => {
             console.log('res---------------->', res);
             // console.log(res.data.data.records);
             if (res.data.data) {
@@ -2412,6 +2413,7 @@
         this.isaddvalue = false;
       },
       onSubmit() {
+       
         // 日期必填
         if (!this.form.reservationDate) {
           this.$message({
@@ -2440,6 +2442,7 @@
           inventoryIds.push(item.id);
           inventoryList.push(item);
         });
+
         orderIds.join(',');
         inventoryIds.join(',');
         this.form.stockArticleIds = orderIds.toString();
@@ -2490,6 +2493,7 @@
           operation = false;
           return;
         }
+        this.subloading=true;//开启加载效果
         // this.form.stockArticleList = this.packageList;
         console.log('>>>>>>>>', this.form);
         console.log("this.reservationId >>>>>",this.reservationId)
@@ -2511,6 +2515,8 @@
           this.form.warehouseId = this.warehouseId;
           add(this.form).then((res) => {
             if(res.data.code !== 200) return
+           
+        this.subloading=false;//关闭加载效果
             this.$message({
               type: 'success',
               message: '操作成功!',

src/views/mail/order/list.vue

@@ -434,16 +434,7 @@ export default {
           fixed: false,
           sortable: true,
         },
-        {
-          prop: 'totalNumber',
-          label: '订单总件数',
-          type: 1,
-          values: '',
-          width: '160',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
+       
         {
           prop: 'consigneeUnit',
           label: '收货单位',
@@ -462,6 +453,16 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
+        },
+        {
+          prop: 'totalNumber',
+          label: '订单总件数',
+          type: 1,
+          values: '',
+          width: '160',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
         }, {
           prop: 'handQuantity',
           label: '在库件数',
@@ -1377,13 +1378,14 @@ export default {
           // };
           // i.freezeStatusName = freezeStatusMap[i.freezeStatus] || freezeStatusMap.default;
           // i.groundingStatusName = groundingStatusMap[i.groundingStatus] || groundingStatusMap.default;
-          i.handQuantity = nuMap[i.handQuantity] || i.handQuantity;
+          // i.handQuantity = nuMap[i.handQuantity] || i.handQuantity;
           i.sortingQuantity = nuMap[i.sortingQuantity] || i.sortingQuantity;
           i.deliveryQuantity = nuMap[i.deliveryQuantity] || i.deliveryQuantity;
           i.signinQuantity = nuMap[i.signinQuantity] || i.signinQuantity;
           i.transferQuantity = nuMap[i.transferQuantity] || i.transferQuantity;
           i.availableQuantity = nuMap[i.availableQuantity] || i.availableQuantity;
-          i.notReceived = parseInt( i.totalNumber) - parseInt( i.handQuantity);
+          i.notReceived = parseInt(i.totalNumber) -parseInt(i.incomingNum);
+          i.handQuantity = parseInt(i.incomingNum) - parseInt(i.deliveryQuantity)
           return i;
         });
         this.loading = false;