Merge branch 'master' into sit

src/config/env.development.js

@@ -7,12 +7,8 @@ module.exports = {
     // userApi: 'http://www.invoice.com/',
     // baseApi: 'http://www.stock.com/',
 
-    userApi: "http://inv.test241.wanyuhengtong.com/",
-    baseApi: "http://stock.test241.wanyuhengtong.com/",
-    // userApi: 'http://inv.sitw.wanyuhengtong.com/',
-    // baseApi: 'http://stock.api.wanyuhengtong.com/',
-    // userApi: 'http://inv.sitw.wanyuhengtong.com/',
-    // baseApi: 'http://stock.api.wanyuhengtong.com/',
+    userApi: 'http://inv.sitw.wanyuhengtong.com/',
+    baseApi: 'http://stock.api.wanyuhengtong.com/',
   },
   webUrl: "http://share.sitw.wanyuhengtong.com/#/test-good-share?id=",
   fileURL: `https://api2.edusit.zretchome.com`,

src/views/sellOut/salesOrder/components/order-out-table.vue

@@ -365,6 +365,55 @@ export default {
       }
       this.loading = false;
     },
+    async addrRefresh(e) {
+      if (!this.loading) {
+        this.loading = true;
+        const { arrive_time, orderCode, wsend_num } = this.sitem;
+        const { list } = e;
+        console.log(list);
+        let t_num = 0,
+          add_num = 0;
+        let model = {
+          arrtime: arrive_time,
+          orderCode: orderCode,
+          addrlist: [],
+        };
+        list.forEach((a) => {
+          add_num += a.receipt_quantity * 1;
+          let item = {
+            contactor: a.contactor,
+            mobile: a.mobile,
+            addr: a.addr,
+            addr_code: a.addr_code,
+            receipt_quantity: a.receipt_quantity,
+          };
+          model.addrlist.push(item);
+        });
+        if (wsend_num * 1 < t_num + add_num) {
+          this.$message.warning("导入地址总数量不能大于未发货总数量！");
+          this.loading = false;
+          return;
+        }
+        const { code, message } = await asyncRequest.saleaddr(model);
+        this.loading = false;
+        if (code === 0) {
+          this.$notify.success({
+            title: "地址导入成功！",
+            message: "",
+          });
+          this.showModelThis = false;
+          // 刷新
+          this.$emit("refresh");
+        } else if (code >= 100 && code <= 104) {
+          await this.logout();
+        } else {
+          this.$message.warning(message);
+        }
+      }
+
+      // this.tableData = [];
+      // this.tableData.push(...list);
+    },
     editRow(index) {
       let findex = this.stockForm.good_stock.findIndex((v) => v.edit === true);
       if (findex !== -1) {