Tang 3 years ago
parent
commit
c4fa983e8f

+ 54 - 25
src/views/Marketing/order/offlineOrder/batchRecord/secondStep/index.vue

@@ -15,6 +15,7 @@
     </div>
     </div>
     <div class="bodySy">
     <div class="bodySy">
       <el-table
       <el-table
+        v-loading="loading"
         :height="heightData"
         :height="heightData"
         :data="tableData"
         :data="tableData"
         :span-method="objectSpanMethod"
         :span-method="objectSpanMethod"
@@ -134,6 +135,7 @@ export default {
   components: { selectClass, setGoodsList },
   components: { selectClass, setGoodsList },
   data() {
   data() {
     return {
     return {
+      loading: false,
       disabledBtn: false,
       disabledBtn: false,
       orderSubmitStatus: true, //订单是否可提交
       orderSubmitStatus: true, //订单是否可提交
       tableSet: [
       tableSet: [
@@ -536,6 +538,7 @@ export default {
       }
       }
     },
     },
     getInitData(obj) {
     getInitData(obj) {
+      this.loading = true;
       this.toData = JSON.parse(JSON.stringify(obj.topData));
       this.toData = JSON.parse(JSON.stringify(obj.topData));
       let data = JSON.parse(JSON.stringify(obj.tableData));
       let data = JSON.parse(JSON.stringify(obj.tableData));
       this.$api
       this.$api
@@ -573,6 +576,9 @@ export default {
             }
             }
           });
           });
           this.decomposeFunc(data);
           this.decomposeFunc(data);
+        })
+        .finally(() => {
+          this.loading = false;
         });
         });
     },
     },
     decomposeFunc(obj) {
     decomposeFunc(obj) {
@@ -655,6 +661,7 @@ export default {
         }
         }
       }
       }
       this.disabledBtn = true;
       this.disabledBtn = true;
+      this.loading = true;
       if (int === 1 && !this.orderSubmitStatus) {
       if (int === 1 && !this.orderSubmitStatus) {
         var successList = this.tableData.filter((item) => {
         var successList = this.tableData.filter((item) => {
           return item.checked && item.success;
           return item.checked && item.success;
@@ -664,6 +671,7 @@ export default {
         });
         });
         this.$parent.changePage2("third", successList, errorList);
         this.$parent.changePage2("third", successList, errorList);
         this.disabledBtn = false;
         this.disabledBtn = false;
+        this.loading = false;
         return;
         return;
       }
       }
       let submitTable = this.tableData.filter((item) => {
       let submitTable = this.tableData.filter((item) => {
@@ -736,41 +744,62 @@ export default {
           }
           }
         }
         }
       });
       });
-      arr.forEach(async (item, index) => {
-        await this.submitFunApi(item);
-      });
+      for (let i = 0; i < arr.length; i++) {
+        await this.submitFunApi(arr[i]);
+      }
       if (arr.length) {
       if (arr.length) {
         this.$message("已提交下单内容");
         this.$message("已提交下单内容");
       }
       }
       this.disabledBtn = false;
       this.disabledBtn = false;
+      this.loading = false;
       this.orderSubmitStatus = false;
       this.orderSubmitStatus = false;
     },
     },
     submitFunApi(item) {
     submitFunApi(item) {
       var self = this;
       var self = this;
       return new Promise((resolve, reject) => {
       return new Promise((resolve, reject) => {
-        self.$api.apporderinputOrder(item).then((res) => {
-          if (res.code === 510 || res.code === 511) {
-            self.tableData.forEach((items, indexs) => {
-              if (items.userId === item.userId) {
-                self.$set(self.tableData[indexs], "errmsg", res.msg);
-              }
-            });
-          } else {
-            self.tableData.forEach((items, indexs) => {
-              if (items.userId === item.userId) {
-                if (items.errmsg) {
-                  self.$set(self.tableData[indexs], "errmsg", "");
+        self.$api
+          .apporderinputOrder(item)
+          .then((res) => {
+            if (res.code === 510 || res.code === 511) {
+              self.tableData.forEach((items, indexs) => {
+                if (items.userId === item.userId) {
+                  self.$set(self.tableData[indexs], "errmsg", res.msg);
                 }
                 }
-                self.$set(self.tableData[indexs], "success", true);
-                self.$set(self.tableData[indexs], "orderId", res.data.orderId);
-                self.$set(self.tableData[indexs], "orderSn", res.data.orderSn);
-                self.$set(self.tableData[indexs], "sheetId", res.data.sheetId);
-                self.$set(self.tableData[indexs], "sheetSn", res.data.sheetSn);
-              }
-            });
-          }
-          resolve(res);
-        });
+              });
+            } else {
+              self.tableData.forEach((items, indexs) => {
+                if (items.userId === item.userId) {
+                  if (items.errmsg) {
+                    self.$set(self.tableData[indexs], "errmsg", "");
+                  }
+                  self.$set(self.tableData[indexs], "success", true);
+                  self.$set(
+                    self.tableData[indexs],
+                    "orderId",
+                    res.data.orderId
+                  );
+                  self.$set(
+                    self.tableData[indexs],
+                    "orderSn",
+                    res.data.orderSn
+                  );
+                  self.$set(
+                    self.tableData[indexs],
+                    "sheetId",
+                    res.data.sheetId
+                  );
+                  self.$set(
+                    self.tableData[indexs],
+                    "sheetSn",
+                    res.data.sheetSn
+                  );
+                }
+              });
+            }
+          })
+          .finally(() => {
+            resolve(res);
+          });
       });
       });
     },
     },
   },
   },