Browse Source

b2c同步订单(店铺)调整参数和显示同步结果;商品同步(分销商)列表和同步界面。

逆水行舟 6 ngày trước cách đây
mục cha
commit
b9ebff937a
2 tập tin đã thay đổi với 39 bổ sung2 xóa
  1. 1 1
      src/benyun/utils/auth.ts
  2. 38 1
      src/views/oms/B2COrder/components/syncOrder.vue

+ 1 - 1
src/benyun/utils/auth.ts

@@ -6,7 +6,7 @@ const ExpiresInKey = "AdminOMS-Expires-In";
 
 export function getToken() {
   if (process.env.NODE_ENV === "development") {
-    return "eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyX2lkIjoxLCJ1c2VyX2tleSI6ImY0NzhjODUwLWU5NTAtNGZiZi04MTYxLTE4ZDBiZDliODNmNiIsInVzZXJuYW1lIjoiYWRtaW4ifQ.1l7udZTaQYAgyu-7t7f3rvhpIFVQm9ep2GMvTCacrYB97sEVHZvWDERQxd4VC9xSgATsX2yx7p4sj2t6CUWkQw";
+    return "eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyX2lkIjoxLCJ1c2VyX2tleSI6IjAzZjFlMWI2LWQ1ODktNDEwZC05ZTRmLTYzN2YzYzgyNzllOSIsInVzZXJuYW1lIjoiYWRtaW4ifQ.OUyBpz4uUWuW-xRO61FN2WSmUe6gL6Fv9dqOQ4s9Ag3yvinUpuo1jgdIu_ZXpezIVHoJrc5zl7U37hmfFG2ctQ";
   } else {
     return Cookies.get(TokenKey);
   }

+ 38 - 1
src/views/oms/B2COrder/components/syncOrder.vue

@@ -1,7 +1,7 @@
 <template>
     <vxe-modal v-model="value" id="syncOrder" width="500" v-loading="load" @hide="hide" height="300" show-footer
         title="同步订单(店铺)">
-        <el-form ref="form" :model="form" label-width="100px">
+        <el-form v-if="!isResult" ref="form" :model="form" label-width="100px">
             <el-form-item label="店铺" prop="shopId">
                 <el-select v-model="form.shopId" placeholder="请选择店铺">
                     <el-option v-for="(item, index) in shopList" :label="item.shopName"
@@ -17,6 +17,17 @@
                     placeholder="请选择修改时间"></el-date-picker>
             </el-form-item>
         </el-form>
+        <el-form v-else label-width="100px">
+            <el-form-item label="成功拉取(条):">
+                {{ result.successNumber }}
+            </el-form-item>
+            <el-form-item label="失败重复(条):">
+                {{ result.failNumber }}
+            </el-form-item>
+            <el-form-item label="所属店铺:">
+                {{ result.shopName }}
+            </el-form-item>
+        </el-form>
         <template #footer>
             <div class="btn">
                 <el-button plain size="small" @click="value = false">取消</el-button>
@@ -33,9 +44,16 @@ import { IResponeData, waterShop, syncOrder } from "@/api/omsOrder";
 export default class SyncDistributor extends Vue {
     value = false;
     load = false;
+    isResult = false;
+    result = {
+        successNumber: 0,
+        failNumber: 0,
+        shopName: ''
+    };
     shopList: { shopId: number, shopName: string }[] = [];
     form = {
         shopId: 0,
+        shopName: '',
         modifiedBegin: '',
         modifiedEnd: ''
     }
@@ -55,6 +73,12 @@ export default class SyncDistributor extends Vue {
     setShow(v: boolean) {
         this.loadShop();
         this.value = v;
+        this.isResult = false;
+        this.result = {
+            successNumber: 0,
+            failNumber: 0,
+            shopName: ''
+        };
     }
     setValue(v: any) {
     }
@@ -75,6 +99,8 @@ export default class SyncDistributor extends Vue {
             this.$message.error('请选择结束时间');
             return;
         }
+        this.form.shopName = this.shopList.find(item => item.shopId == this.form.shopId)?.shopName || '';
+
         //判断两个时间之间不能大于8天,并且开始时间不能大于结束时间
         const begin = new Date(this.form.modifiedBegin);
         const end = new Date(this.form.modifiedEnd);
@@ -94,7 +120,18 @@ export default class SyncDistributor extends Vue {
         }).then(() => {
             syncOrder(this.form).then(res => {
                 this.$message.success('同步成功');
+                this.isResult = true;
+                this.result.successNumber = res.data.successNumber;
+                this.result.failNumber = res.data.failNumber;
+                this.result.shopName = this.form.shopName;
+
             }).catch((err) => {
+                this.isResult = false;
+                this.result = {
+                    successNumber: 0,
+                    failNumber: 0,
+                    shopName: ''
+                }
                 console.error(err);
             }).finally(() => {
                 this.load = false;