优化处理

src/benyun/components/byForm/byForm.vue

@@ -150,7 +150,9 @@ export default class ByForm extends VueViews {
     this.$nextTick(()=>{
       this.setChildrenComValue();
     })
-    
+    setTimeout(()=>{
+      this.clearValidate();
+    },100)
     this.$forceUpdate();
   }
 

src/components/userModal/userModal.vue

@@ -157,7 +157,7 @@ export default class UserModal extends VueViews {
       this.load = false;
       (this.$refs.view as any).setTableValue(res.rows);
       let page = {
-        total: res.data.total //总条数
+        total: res.total //总条数
       };
       (this.$refs.view as any).setPage(page)
 

src/router/index.ts

@@ -29,10 +29,10 @@ export const constantRoutes: Array<any> = [
   //   component: () => import('@/views/register.vue'),
   //   hidden: true
   // },
-  {
-    path: '*',
-    redirect: '/index'
-  },
+  // {
+  //   path: '*',
+  //   redirect: '/index'
+  // },
   {
     path: '/',
     component: Layout,

src/views/oms/B2BOrder/components/addOrder.vue

@@ -423,7 +423,7 @@ export default class AddOrder extends Vue {
       itemCount:4,
       rules:{
         buyerNickname:[{
-          required: true, message: '买家账号不能为空！', trigger: 'blur'
+          required: true, message: '买家账号不能为空！', trigger: 'change'
         }],
         receiverDistrictCode:[{
           required: true, message: '收货地址不能为空！', trigger: 'blur'

src/views/oms/B2BOrder/components/batchbyOneModal.vue

@@ -50,6 +50,7 @@ import DeliveryGoodsInfo from "./deliveryGoodsInfo.vue";
 import DeliveryPrice from "./deliveryPrice.vue";
 import { add,multiply,subtract,divide } from '@/benyun/utils/accuracy'
 import { queryPricePackage,addmultiple,getInventoryByStoreHouseIdAndSkuids } from  '@/api/delivery'
+import  api from '@/api/currency'
 import Format from '@/benyun/utils/dateFormat'
 
 @Component({components:{DeliveryGoodsInfo,DeliveryPrice}})
@@ -65,6 +66,7 @@ export default class BatchbyOneModal extends Vue {
   load = false;
   priceObj:any={};
   currentPrice:any={};
+  warehouseData:Array<any>=[];
   setShow(v:boolean){
     this.drawer=v;
     this.priceObj={};
@@ -112,8 +114,8 @@ export default class BatchbyOneModal extends Vue {
         const requestId =  new Date().getTime() + this.getUuid()
         let obj:any={
           tmsTransportMethod:'零担',
-          // tmsBusinessMan: (this as any).$store.getters.userInfo.userName,
-          // tmsBusinessPhone: (this as any).$store.getters.userInfo.phonenumber,
+          tmsBusinessMan: (this as any).$store.getters.userInfo.userName,
+          tmsBusinessPhone: (this as any).$store.getters.userInfo.phonenumber,
           requestId:requestId,
           omsOrderIds:item.id,
           weight:item.weight,
@@ -127,7 +129,10 @@ export default class BatchbyOneModal extends Vue {
           tmsUnloadingStreetNo:item.receiverTownCode,
           tmsUnloadingAddress:item.receiverAddress,
           tmsUnloadingConsignor:item.receiverName,
-          tmsUnloadingContacts:item.receiverMobile
+          tmsUnloadingContacts:item.receiverMobile,
+          wmsSendType: 'B2BCK',
+          tmsArrivalDate: this.getTime(3600 * 1000 * 24 * 2),
+          tmsDeliveryDate: this.getTime(3600 * 1000 * (24 * 2 + 2)),
         };
 
         obj.subItem=[];
@@ -157,6 +162,7 @@ export default class BatchbyOneModal extends Vue {
         }
         this.data.push(obj)
       }
+      this.loadWarehouse()
     }else{
       this.data = []
     }
@@ -166,6 +172,35 @@ export default class BatchbyOneModal extends Vue {
       (this.$refs.info as any).showModal = true;
     })
   }
+  loadWarehouse() {
+    api.pageList({
+      pageNo: 1,
+      pageSize: 1000
+    }, 'maindataStorehouse').then((res: any) => {
+      this.warehouseData = res.data.records;
+      if(this.warehouseData.length > 0){
+        this.data[0].tmsShipmentConsignor=this.warehouseData[0].shipper;
+        this.data[0].tmsShipmentContacts=this.warehouseData[0].shipperPhone;
+        this.data[0].tmsShipmentProvince= this.warehouseData[0].province;
+        this.data[0].tmsShipmentProvinceNo=this.warehouseData[0].provinceCode;
+        this.data[0].tmsShipmentCity= this.warehouseData[0].city;
+        this.data[0].tmsShipmentCityNo= this.warehouseData[0].cityCode;
+        this.data[0].tmsShipmentRegion= this.warehouseData[0].region;
+        this.data[0].tmsShipmentRegionNo= this.warehouseData[0].regionCode;
+        this.data[0].tmsShipmentStreetNo= this.warehouseData[0].streetCode;
+        this.data[0].tmsShipmentStreet= this.warehouseData[0].street;
+        this.data[0].tmsShipmentAddress=this.warehouseData[0].address;
+        this.data[0].storeHouseId= this.warehouseData[0].id;
+        this.data[0].storeHouseName= this.warehouseData[0].name;
+      }
+    }).catch(() => {})
+  }
+  getTime(n:number) {
+    const start = new Date();
+    start.setTime(start.getTime() + n);
+    const t = Format(new Date(start),'yyyy-MM-dd HH:mm:ss');
+    return t
+  }
   getUuid(){
     return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1);
   }

src/views/oms/B2BOrder/components/carpoolModal.vue

@@ -64,8 +64,8 @@ export default class CarpoolModal extends Vue {
     this.data =data;
     this.value={};
     this.value.tmsTransportMethod = '整车';
-    // this.value.tmsBusinessMan = (this as any).$store.getters.userInfo.userName;
-    // this.value.tmsBusinessPhone = (this as any).$store.getters.userInfo.phonenumber;
+    this.value.tmsBusinessMan = (this as any).$store.getters.userInfo.userName;
+    this.value.tmsBusinessPhone = (this as any).$store.getters.userInfo.phonenumber;
     this.value.subItem=[];
     this.value.weight = data[0].weight;
     this.value.tmsUnloadingProvince=data[0].receiverProvince;
@@ -79,6 +79,9 @@ export default class CarpoolModal extends Vue {
     this.value.tmsUnloadingAddress=data[0].receiverAddress;
     this.value.tmsUnloadingConsignor=data[0].receiverName;
     this.value.tmsUnloadingContacts=data[0].receiverMobile;
+    this.value.wmsSendType='B2BCK';
+    this.value.tmsArrivalDate=this.getTime(3600 * 1000 * 24 * 2);
+    this.value.tmsDeliveryDate=this.getTime(3600 * 1000 * (24 * 2 + 2));
     this.checked = false;
     const requestId =  new Date().getTime() + this.getUuid();
     this.value.requestId = requestId;
@@ -113,6 +116,12 @@ export default class CarpoolModal extends Vue {
       (this.$refs.info as any).showModal = true;
     })
   }
+  getTime(n:number) {
+    const start = new Date();
+    start.setTime(start.getTime() + n);
+    const t = Format(new Date(start),'yyyy-MM-dd HH:mm:ss');
+    return t
+  }
   getUuid(){
     return (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1);
   }

src/views/oms/B2BOrder/components/deliveryGoodsInfo.vue

@@ -17,29 +17,34 @@
         </div>
       </div> -->
       <div class="info-row">
-        <div class="info-col">
+        <div class="info-col col-width">
           <span class="label">业务员：</span>
           <span :title="value.tmsBusinessMan">{{ value.tmsBusinessMan }}</span>
         </div>
-        
-      </div>
-      <div class="info-row">
         <div class="info-col col-width">
           <span class="label">业务员手机：</span>
           <span :title="value.tmsBusinessPhone">{{ value.tmsBusinessPhone }}</span>
         </div>
+      </div>
+      <div class="info-row">
+        <div class="info-col">
+          <span class="label">发货仓库：</span>
+          <span :title="value.storeHouseName">{{ value.storeHouseName }}</span>
+        </div>
+      </div>
+      <div class="info-row">
         <div class="info-col col-width" v-if="!sendState">
           <span class="label">发货状态：</span>
           <span v-if="value.state == 'success'">发货中</span>
           <span v-if="value.state == 'fail'" style="color: #F00;">发货失败</span>
         </div>
-      </div>
-      <div class="info-row">
         <div class="info-col col-width">
           <span class="label">运输方式：</span>
           <span :title="value.tmsTransportMethod">{{ value.tmsTransportMethod }}</span>
         </div>
-        <div class="info-col col-width">
+      </div>
+      <div class="info-row">
+        <div class="info-col">
           <span class="label">备注：</span>
           <span :title="value.tmsRemark">{{ value.tmsRemark }}</span>
         </div>
@@ -314,7 +319,8 @@ export default class DeliveryGoodsInfo extends Vue {
               tmsShipmentStreetNo: 'streetCode',
               tmsShipmentStreet: 'street',
               tmsShipmentAddress:'address',
-              storeHouseId: 'id'
+              storeHouseId: 'id',
+              storeHouseName: 'name'
             }
           }
         }

src/views/system/user/index.vue

@@ -428,7 +428,7 @@ export default {
       rules: {
         userName: [
           { required: true, message: "用户名称不能为空", trigger: "blur" },
-          { min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur' }
+          { min: 2, max: 10, message: '用户名称长度必须介于 2 和 10 之间', trigger: 'blur' }
         ],
         nickName: [
           { required: true, message: "用户昵称不能为空", trigger: "blur" }