From c684d53db9aa88e08cc6ec4609253bcc7969d20c Mon Sep 17 00:00:00 2001
From: leo <10200039@qq.com>
Date: Sun, 14 May 2023 19:56:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=8F=E5=90=8CBUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Need/components/EditView.vue | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/views/Need/components/EditView.vue b/src/views/Need/components/EditView.vue
index 03acd1e..0329630 100644
--- a/src/views/Need/components/EditView.vue
+++ b/src/views/Need/components/EditView.vue
@@ -437,11 +437,16 @@ export default {
 					}) || null;
 
 					if (result != null && result.FID) {
-						let col7 = this.dataColumn.filter(s => s.fieldType == 7) || [];
-						col7.forEach((item) => {
-							if (item.table == "TFS_MaterialInfo") {
+						// let col7 = this.dataColumn.filter(s => s.fieldType == 7) || [];
+						// col7.forEach((item) => {
+						// 	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] || "";
-							}
+							}							
 						});
 
 						let type1 = this.typeList[0].filter(t => t.FValue == data.FTypeID1)[0];
@@ -556,6 +561,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]);