From 7b7fa8945dc7c070da56076900db292f02832ba6 Mon Sep 17 00:00:00 2001
From: leo <10200039@qq.com>
Date: Wed, 10 May 2023 23:52:46 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E8=B7=AF=E7=BA=BF=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/materia/components/EditView.vue | 65 +++++++++++++----------
 1 file changed, 38 insertions(+), 27 deletions(-)

diff --git a/src/views/materia/components/EditView.vue b/src/views/materia/components/EditView.vue
index 4a50248..21b56c8 100644
--- a/src/views/materia/components/EditView.vue
+++ b/src/views/materia/components/EditView.vue
@@ -543,6 +543,19 @@ export default {
 					return false;
 				}
 
+				// let keys = Object.keys(this.materialInfoList.Data[0])
+				// dataObj["TFS_MaterialInfo"] = {};
+
+				// // 根据row设置MaterialInfo的值
+				// keys.forEach(key => {
+				// 	if (key in row && key != "FID") {
+				// 		dataObj["TFS_MaterialInfo"][key] = row[key]
+				// 	}					
+				// })
+
+				// dataObj["TFS_MaterialInfo"].FMaterialID = row["FMaterialID"]
+				// dataObj["TFS_MaterialInfo"].FType2 = row["FTypeID2"];
+
 				for (let col of this.editColumn) {
 					let valTemp = row[col.key];
 					if (valTemp != cache[col.key]) {
@@ -596,38 +609,36 @@ export default {
 			}
 
 			let updateLog = updateObj.LogList.join("、");
-			if (updateLog != "" || this.dataInfoObj.FType == 2) {
-				delete updateObj.LogList
-				// 发送保存请求
-				let _result = await updateMaterial(updateObj, "MaterialTeamwork");
-				if (_result.Code === 200) {
-					if (_result.Data.TaskId > 0) {
-						await commonSave({
-							teamId: updateObj.FTeamID,
-							type: this.dataInfoObj['FType'],
-							desc: updateLog
-						}, "OperateLog");
-						let $this = this;
-						//$this.initPage();
-						localStorage.setItem('EditView' + saveId, JSON.stringify(this.dataList));
-						setTimeout(function () {
-							layer.close(idx);
-							layer.msg('保存成功');
-							$this.$emit('cancelClick', true, false);
-							$this.$refs.OperateLog._getPageList();
-						}, 500);
-					} else if (_result.Data.TaskId == -9) {
+			delete updateObj.LogList
+			// 发送保存请求
+			let _result = await updateMaterial(updateObj, "MaterialTeamwork");
+			if (_result.Code === 200) {
+				if (_result.Data.TaskId > 0) {
+					await commonSave({
+						teamId: updateObj.FTeamID,
+						type: this.dataInfoObj['FType'],
+						desc: updateLog
+					}, "OperateLog");
+					let $this = this;
+					$this.initPage();
+					localStorage.setItem('EditView' + saveId, JSON.stringify(this.dataList));
+					setTimeout(function () {
 						layer.close(idx);
-						layer.msg('提交失败，没有相应权限的用户');
-					} else {
-						layer.close(idx);
-						layer.msg('提交失败');
-					}
+						layer.msg('保存成功');
+						$this.$emit('cancelClick', true, false);
+						$this.$refs.OperateLog._getPageList();
+					}, 500);
+				} else if (_result.Data.TaskId == -9) {
+					layer.close(idx);
+					layer.msg('提交失败，没有相应权限的用户');
+				} else {
+					layer.close(idx);
+					layer.msg('提交失败');
 				}
 			} else {
 				layer.close(idx);
-				layer.msg('您没有做任何更改')
 			}
+			
 		},
 		_clickFreezingColumnSetting() {
 			this.dataColumn = ref([]);