优化

src/views/audit/Information/index.vue

@@ -324,7 +324,7 @@
 					}else{
 						this.isOrganizationCode = false
 					}
-					console.log(this.isOrganizationCode)
+					// console.log(this.isOrganizationCode)
 					this.$nextTick(() => (this as any).$refs.addFormId.setValue(data));
 					loading.close();
 				} else loading.close();

src/views/audit/productManagement/index.vue

@@ -1320,6 +1320,9 @@
 						if (!/^\d{1,32}$/.test(v.barCode)){
 							return this.$message.warning('69码-商品条码为数字，最大32位');
 						}
+						if (!/^\d{1,32}$/.test(v.skuCode)){
+							return this.$message.warning('物料编码不能输入中文');
+						}
 						
 						// if(v.weight&&v.weight!=0){
 						// 	v.weight = v.weight/1000
@@ -1766,7 +1769,7 @@
 			val2.name = this.tableRadio.fname;
 			val2.shortName = this.tableRadio.fname;
 			// 物料属性赋值
-			console.log(this.materialSpec)
+			// console.log(this.materialSpec)
 			if(this.materialSpec==0){
 				var val = (this.$refs.singeTable as any).getValue();
 				if(JSON.stringify(val[0]) === "{}" || val[0] === null){
@@ -1798,7 +1801,7 @@
 			}
 			if(this.materialSpec==1){
 				var val = (this.$refs.table as any).getValue();
-				console.log(val)
+				// console.log(val)
 				if(!val || JSON.stringify(val[0]) === "{}" || val[0] === null || val.length==0){
 					val = [{
 						skuTitle: this.tableRadio.fname,

src/views/components/pie01.vue

@@ -73,7 +73,7 @@ export default class Pie01 extends Vue {
             }
           },
           label:{
-            formatter: '{b}: {d}' + '%'
+            formatter: '{b}: \n{d}' + '%'
           }
         }
       ]

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

@@ -275,6 +275,10 @@ export default class BatchbyOneModal extends Vue {
       this.$message("订单信息不完整，请编辑信息！");
       return
     }
+    if(_value.tmsBusinessMan.length > 10){
+      this.$message("业务员名称不能超过10个字符！");
+      return
+    }
     // if(!this.currentPrice[_value.omsOrderIds]){
     //   this.$message('请选择价格！')
     //   return

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

@@ -196,6 +196,10 @@ export default class CarpoolModal extends Vue {
       this.$message("订单信息不完整，请编辑信息！");
       return
     }
+    if(this.value.tmsBusinessMan.length > 10){
+      this.$message("业务员名称不能超过10个字符！");
+      return
+    }
     let params:any=(this as any).$lodash.cloneDeep(this.value);
     // if(this.priceData){
     //   try{

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

@@ -124,7 +124,7 @@ export default class ExpressDeliveryModal extends Vue {
       rules:{
         tmsBusinessMan:[{
           required: true, message: '业务员不能为空！', trigger: 'blur'
-        },{ min: 0, max: 5, message: '业务员名字不能超过10个字符！', trigger: 'blur' }],
+        },{ min: 0, max: 10, message: '业务员名字不能超过10个字符！', trigger: 'blur' }],
         tmsBusinessPhone:[{
           required: true, message: '业务员手机不能为空！', trigger: 'blur'
         },{
@@ -271,7 +271,7 @@ export default class ExpressDeliveryModal extends Vue {
   setValue(data:Array<any>){
     this.data =data;
     this.value={};
-    this.value.tmsBusinessMan = (this as any).$store.getters.userInfo.userName;
+    this.value.tmsBusinessMan = (this as any).$store.getters.userInfo.nickName;
     this.value.tmsBusinessPhone = (this as any).$store.getters.userInfo.phonenumber;
     this.value.subItem=[];
     this.checked = false;

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

@@ -124,7 +124,7 @@ export default class ExpressDeliveryModal extends Vue {
       rules:{
         tmsBusinessMan:[{
           required: true, message: '业务员不能为空！', trigger: 'blur'
-        },{ min: 0, max: 5, message: '业务员名字不能超过10个字符！', trigger: 'blur' }],
+        },{ min: 0, max: 10, message: '业务员名字不能超过10个字符！', trigger: 'blur' }],
         tmsBusinessPhone:[{
           required: true, message: '业务员手机不能为空！', trigger: 'blur'
         },{
@@ -271,7 +271,7 @@ export default class ExpressDeliveryModal extends Vue {
   setValue(data:Array<any>){
     this.data =data;
     this.value={};
-    this.value.tmsBusinessMan = (this as any).$store.getters.userInfo.userName;
+    this.value.tmsBusinessMan = (this as any).$store.getters.userInfo.nickName;
     this.value.tmsBusinessPhone = (this as any).$store.getters.userInfo.phonenumber;
     this.value.subItem=[];
     this.checked = false;
@@ -430,7 +430,6 @@ export default class ExpressDeliveryModal extends Vue {
             materialSkuId:item.omsOrderItemId
           })
         }
-        
       }
     }
     delete params.subItem;