调整

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.eyJ1c2VyX2lkIjoxLCJ1c2VyX2tleSI6IjdkZjhjYjIyLTMwMmMtNDFhZS1iNjRjLTc3NzYxOTlmZTI1MyIsInVzZXJuYW1lIjoiYWRtaW4ifQ.8ndcPiq0ZCXlRfIhBt71SGXMSCwNZyk88zcuuE7YgNo_uN_iBirzH-IschSiRwlyN9Co37j4gvwSUZ-AstpClw";
+    return "eyJhbGciOiJIUzUxMiJ9.eyJ1c2VyX2lkIjoxLCJ1c2VyX2tleSI6ImMzOTk2NWVkLWI4OTMtNDVjYS05NjRmLTdhZDk0YTViOWJjYyIsInVzZXJuYW1lIjoiYWRtaW4ifQ.y4FuV47qKKMPl08OhimIaJNhSftxD2YsNC2F3ccxZIgaP18TtJlgULeZjCi7M52rcPSjKQxnv7IyvxunEU16tg";
   } else {
     return Cookies.get(TokenKey);
   }

src/views/oms/B2COrder/components/orderTable.vue

@@ -13,6 +13,7 @@
         </div>
       </template>
     </vxe-column>
+    <vxe-column field="innerId" title="内部订单号(聚水潭)" width="140"> </vxe-column>
     <vxe-column field="rawSourceId" title="线上订单号" width="140"> </vxe-column>
     <vxe-column field="isSubmitted" title="审核状态" width="100">
       <template #default="{ row }">

src/views/oms/B2COrder/components/syncOrder.vue

@@ -75,6 +75,18 @@ export default class AddConfig extends Vue {
             this.$message.error('请选择结束时间');
             return;
         }
+        //判断两个时间之间不能大于8天，并且开始时间不能大于结束时间
+        const begin = new Date(this.form.modifiedBegin);
+        const end = new Date(this.form.modifiedEnd);
+        const diff = end.getTime() - begin.getTime();
+        if (diff > 7 * 24 * 60 * 60 * 1000) {
+            this.$message.error('时间范围不能大于7天');
+            return;
+        }
+        if (begin.getTime() > end.getTime()) {
+            this.$message.error('开始时间不能大于结束时间');
+            return;
+        }
         this.$confirm('确认同步订单吗？', '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',

src/views/oms/pullRecord/index.vue

@@ -42,6 +42,9 @@ export default class OrderPay extends Vue {
       columns: [{
         title: '订单来源',
         field: 'sourceName'
+      }, {
+        title: '内部订单号(聚水潭)',
+        field: 'biz'
       }, {
         title: '成功拉取数量',
         field: 'successQty',