Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemWeb

src/views/Need/components/EditView.vue

@@ -439,9 +439,14 @@ export default {
 					}) || null;
 
 					if (result != null && result.FID) {
-						let col7 = this.dataColumn.filter(s => s.fieldType == 7) || [];
+						// let col7 = this.dataColumn.filter(s => s.fieldType == 7) || [];
-						col7.forEach((item) => {
+						// col7.forEach((item) => {
-							if (item.table == "TFS_MaterialInfo") {
+						// 	if (item.table == "TFS_MaterialInfo") {
+						// 		data[item.key] = result[item.key] || data[item.key] || "";
+						// 	}
+						// });
+						this.dataColumn.forEach((item) => {
+							if (item.key != "FTypeID1" && item.key != "FTypeID2") {
 								data[item.key] = result[item.key] || data[item.key] || "";
 							}							
 						});
@@ -558,6 +563,14 @@ export default {
 					}
 				}
 
+				if (!dataObj["TFS_ViewMaterial"]) {
+					dataObj["TFS_ViewMaterial"] = {};
+				}
+				
+				dataObj["TFS_ViewMaterial"].FMaterialID = row["FMaterialID"];
+				dataObj["TFS_ViewMaterial"].FMRP1ProductType = row["FMRP1ProductType"];
+				dataObj["TFS_ViewMaterial"].FBaseMaterialCode = row["FBaseMaterialCode"]
+
 				for (let key in dataObj) {
 					if (!updateObj[key]) updateObj[key] = [];
 					updateObj[key].push(dataObj[key]);