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

src/views/audit/productManagement/index.vue

@@ -1796,12 +1796,12 @@
 				}];
 				this.$message.success('关联物料 '+this.tableRadio.fname+' 成功');
 			}else{
+				this.$message.success('物料 '+val[0].skuTitle+' 信息变更为 '+this.tableRadio.fname);
 				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;
-				this.$message.success('物料 '+val[0].skuTitle+' 信息变更为 '+this.tableRadio.fname);
 			}
 			(this as any).$refs.singeTable.setValue(val);
 			(this as any).$refs.form.setValue(val2);