Merge branch 'master' of http://47.107.53.207:3000/ymy/oms

src/views/audit/manufacturer/index.vue

@@ -207,6 +207,9 @@
 					telephone: [{
 						required: true, message: '请输入手机号码', trigger: 'blur'
 					}],
+					// phonenum: [{
+					// 	required: true, message: '请输入联系电话', trigger: 'blur'
+					// }],
 					financeType: [{
 						required: true, message: '请输入财务系统类型', trigger: 'change'
 					}],
@@ -413,6 +416,7 @@
 			(this as any).$refs.addFormId.validate().then(() => {
 				let query = (this as any).$refs.addFormId.getValue();
 				query.status = this.radio;
+				query.accountId = this.$store.getters.userInfo.userId;
 				// 手机验证
 				let reg = /^1[3456789]\d{9}$/;
 				// let reg2 = /^0\d{2,3}-\d{7,8}$/;

src/views/audit/productManagement/index.vue

@@ -1655,11 +1655,9 @@
 		}
 		// 确定关联金蝶财务系统物料
 		doConfirm() {
-			console.log(this.tableRadio)
 			if(JSON.stringify(this.tableRadio) === "{}" || this.tableRadio === null || this.tableRadio === {}) { return this.$message.warning('请选择物料'); }
 			// 表单赋值赋值
 			var val2 = (this as any).$refs.form.getValue();
-			console.log(val2)
 			val2.name = this.tableRadio.fname;
 			val2.shortName = this.tableRadio.fname;
 			// 物料属性赋值
@@ -1681,12 +1679,13 @@
 					volume: '0',
 				}];
 			}else{
-				val.skuTitle = this.tableRadio.fname;
-				val.skuSubtitle = this.tableRadio.skuSubtitle;
-				val.financialCode = this.tableRadio.financialCode;
-				val.unit = this.tableRadio.unit;
-				val.unitCode = this.tableRadio.unitCode;
+				val[0].skuTitle = this.tableRadio.fname;
+				val[0].skuSubtitle = this.tableRadio.fname;
+				val[0].financialCode = this.tableRadio.fnumber;
+				val[0].unit = this.tableRadio.fbaseUnitName;
+				val[0].unitCode = this.tableRadio.fbaseUnitCode;
 			}
+			console.log(222,val);
 			(this as any).$refs.singeTable.setValue(val);
 			(this as any).$refs.form.setValue(val2);
 			this.vxeValue = false;