样式调整

src/components/skuModal/productModal.vue

@@ -44,19 +44,21 @@ export default class ProductModal extends Vue {
         size:'mini',
       },
       columns:[
-        [{
-          span:10,
-          label:'物料编号',
-          prop:'skuid',
-          component:'by-input',
-          labelWidth:'120px',
-          compConfig:{
-            attr:{
-              clearable:true,
-              placeholder:'请输入物料编号'
-            }
-          }
-        },{
+        [
+        //   {
+        //   span:10,
+        //   label:'物料编号',
+        //   prop:'skuid',
+        //   component:'by-input',
+        //   labelWidth:'120px',
+        //   compConfig:{
+        //     attr:{
+        //       clearable:true,
+        //       placeholder:'请输入物料编号'
+        //     }
+        //   }
+        // },
+        {
           span:10,
           label:'商品名称',
           prop:'name',

src/views/audit/agencyGoods/index.vue

@@ -445,10 +445,10 @@
 			padding-right: 16px;
 			flex-shrink: 0;
 			.bill-tab {
-				width: 150px;
+				width: 210px;
 				height: 100%;
 				transition: all .5s;
-				overflow: hidden;
+				overflow: auto;
 			}
 			.tab-title {
 				font-size: 16px;

src/views/audit/distributor/index.vue

@@ -560,10 +560,10 @@
 			flex-shrink: 0;
 
 			.bill-tab {
-				width: 150px;
+				width: 210px;
 				height: 100%;
 				transition: all .5s;
-				overflow: hidden;
+				overflow: auto;
 			}
 
 			.tab-title {

src/views/audit/manufacturer/index.vue

@@ -565,10 +565,10 @@
 			flex-shrink: 0;
 
 			.bill-tab {
-				width: 150px;
+				width: 210px;
 				height: 100%;
 				transition: all .5s;
-				overflow: hidden;
+				overflow: auto;
 			}
 
 			.tab-title {

src/views/audit/organClassify/index.vue

@@ -404,10 +404,10 @@
 			padding-right: 16px;
 			flex-shrink: 0;
 			.bill-tab {
-				width: 150px;
+				width: 210px;
 				height: 100%;
 				transition: all .5s;
-				overflow: hidden;
+				overflow: auto;
 			}
 			.tab-title {
 				font-size: 16px;

src/views/audit/productClassification/index.vue

@@ -438,10 +438,10 @@
 			flex-shrink: 0;
 
 			.bill-tab {
-				width: 150px;
+				width: 210px;
 				height: 100%;
 				transition: all .5s;
-				overflow: hidden;
+				overflow: auto;
 			}
 
 			.tab-title {

src/views/audit/supplier/index.vue

@@ -555,10 +555,10 @@
 			flex-shrink: 0;
 
 			.bill-tab {
-				width: 150px;
+				width: 210px;
 				height: 100%;
 				transition: all .5s;
-				overflow: hidden;
+				overflow: auto;
 			}
 
 			.tab-title {

src/views/audit/virtually/index.vue

@@ -437,10 +437,10 @@
 			flex-shrink: 0;
 
 			.bill-tab {
-				width: 150px;
+				width: 210px;
 				height: 100%;
 				transition: all .5s;
-				overflow: hidden;
+				overflow: auto;
 			}
 
 			.tab-title {

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

@@ -104,8 +104,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,
           tmsUnloadingProvince:item.receiverProvince,

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

@@ -65,8 +65,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.tmsUnloadingProvince=data[0].receiverProvince;
     this.value.tmsUnloadingProvinceNo=data[0].receiverProvinceCode;

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

@@ -188,13 +188,14 @@ export default class DeliveryGoodsInfo extends Vue {
         // orderType:[{
         //   required: true, message: '请选择订单类型！', trigger: 'change'
         // }],
-        tmsBusinessMan:[{
-          required: true, message: '业务员不能为空！', trigger: 'blur'
-        }],
+        tmsBusinessMan:[
+          { required: true, message: '业务员不能为空！', trigger: 'blur' },
+          { min: 0, max: 5, message: '业务员名字不能超过10个字符！', trigger: 'blur' }
+        ],
         tmsBusinessPhone:[{
           required: true, message: '业务员手机不能为空！', trigger: 'blur'
         },{
-          validator: this.validatePhone, trigger: 'blur' 
+          validator: this.validatePhone, trigger: 'blur'
         }],
         tmsShipmentConsignor:[{
           required: true, message: '发货人不能为空！', trigger: 'blur'

src/views/oms/order/components/expressDeliveryModal.vue

@@ -108,9 +108,11 @@ export default class ExpressDeliveryModal extends Vue {
       rules:{
         tmsBusinessMan:[{
           required: true, message: '业务员不能为空！', trigger: 'blur'
-        }],
+        },{ min: 0, max: 5, message: '业务员名字不能超过10个字符！', trigger: 'blur' }],
         tmsBusinessPhone:[{
           required: true, message: '业务员手机不能为空！', trigger: 'blur'
+        },{
+          validator: this.validatePhone, trigger: 'blur'
         }],
         storeHouseId:[{
           required: true, message: '请选择仓库！', trigger: 'change'
@@ -227,15 +229,26 @@ export default class ExpressDeliveryModal extends Vue {
       }]
     ]
   }
-
+  validatePhone(rule:any, value:any, callback:any){
+    if (value) {
+      if(!/^1[3|4|5|6|7|8|9][0-9]\d{8}$/.test(value)) {
+        callback(new Error('手机号格式不正确！'));                                                                                                             
+      }else{
+        callback();
+      }
+      
+    } else {
+      callback();
+    }
+  }
   setShow(v:boolean){
     this.drawer=v;
   }
   setValue(data:Array<any>){
     this.data =data;
     this.value={};
-    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.checked = false;
     const requestId =  new Date().getTime() + this.getUuid();

src/views/oms/order/components/loadOrderModal.vue

@@ -368,6 +368,7 @@ export default class LoadOrderModal extends Vue {
   .title{
     width: 100px;
     text-align: right;
+    margin: 0 !important;
     >span{
       color: #F00;
     }

src/views/oms/order/index.vue

@@ -1134,7 +1134,6 @@ export default class Order extends Vue {
     box-sizing: border-box;
     padding: 4px 4px 0;
     position: relative;
-   
     .my-collapse{
       padding: 0 4px;
       background: #FFF;
@@ -1169,6 +1168,8 @@ export default class Order extends Vue {
     box-sizing: border-box;
     padding-left: 8px;
     height: 100%;
+    min-width: 850px;
+    overflow-x: auto;
     .tool{
       width: 100%;
     }