commit by yzf

src/views/half/components/EditView.vue

@@ -275,25 +275,25 @@ export default {
 			this.typeList[1] = _data.types.filter(s => s.FDepth != 1) || [];
 			let dataColumn = _data.columns || [];
 
-			// let editColumn = dataColumn.filter(it => {
-			// 	let b = false;
-			// 	if (this.dataInfoObj.FCanEdit != 2) {
-			// 		if (it.fieldType == 7) b = this.userPower[1].indexOf(it.id) >= 0;
-			// 		else b = this.userPower[0].indexOf(it.id) >= 0;
-			// 		if (b) {
-			// 			it.customSlot = it.key;
-			// 			it.cellClass = "edit-item"
-			// 		}
-			// 	}
-			// 	return b;
-			// });
-
-
 			let editColumn = dataColumn.filter(it => {
+				let b = false;
+				if (this.dataInfoObj.FCanEdit != 2) {
+					if (it.fieldType == 7) b = this.userPower[1].indexOf(it.id) >= 0;
+					else b = this.userPower[0].indexOf(it.id) >= 0;
+					if (b) {
 						it.customSlot = it.key;
 						it.cellClass = "edit-item"
-				return it;
+					}
+				}
+				return b;
 			});
+
+
+			// let editColumn = dataColumn.filter(it => {
+			// 	it.customSlot = it.key;
+			// 	it.cellClass = "edit-item"
+			// 	return it;
+			// });
 			debugger
 
 			if (editColumn.length > 0) {
@@ -487,7 +487,7 @@ export default {
 					return false;
 				}
 				console.log('this.editColumn', this.editColumn);
-				for (let col of this.editColumn) {
+				for (let col of this.dataColumn) {
 					let valTemp = row[col.key];
 					if (this.dataInfoObj.FViewType == 10) {
 						if (!dataObj[col.table]) {
@@ -531,6 +531,7 @@ export default {
 			let updateLog = updateObj.LogList.join("、");
 			// 发送保存请求
 			console.log('updateObj', updateObj);
+				delete updateObj.LogList
 				let _result = await updateBatchById3(updateObj);
 				if (_result.Code === 200) {
 					await commonSave({

src/views/half/components/EditViewOFF.vue

@@ -322,19 +322,7 @@ export default {
 
 					return items["cellClass"] = "";
 				})
-				// let k3Code = item.FBaseMaterialDesc;
+
-				// if (k3Code.indexOf("@") > 0) {
-				// 	item.FK3Code = k3Code.substr(0, k3Code.indexOf("@"));
-				// 	item.FK3Name = k3Code.substr(k3Code.indexOf("@") + 1);
-				// } else {
-				// 	item.FK3Code = "";
-				// 	item.FK3Name = "";
-				// }
-				// if (k3Code.lastIndexOf(".") > 0) {
-				// 	item.FK3ShortCode = item.FK3Code.substr(item.FK3Code.lastIndexOf(".") + 1);
-				// } else {
-				// 	item.FK3ShortCode = "";
-				// }
 				let info = _data.infos.find(s => s.FDataID == item.FMaterialID) || null;
 				if (info != null) {
 					col7.forEach((col) => {
@@ -465,7 +453,6 @@ export default {
 							if (item.key != "FTypeID1" && item.key != "FTypeID2" && result[item.key]) {
 								data[item.key] = result[item.key]
 							}
-							//data[item.key] = result[item.key] || data[item.key] || "";
 						});
 
 					}

src/views/half/route.vue

@@ -306,6 +306,7 @@ export default {
 			else {
 				return layer.msg("未知事项类型");
 			}
+			debugger
 			this.objInfoObj = data;
 			this.editType = type;
 			this.showEditBox[data.FBoxType] = true;

src/views/materia/components/EditView.vue

@@ -442,12 +442,8 @@ export default {
 					}) || null;
 
 					if (result != null && result.FID) {
-						let col7 = this.dataColumn.filter(s => s.fieldType == 7) || [];
+
-						col7.forEach((item) => {
+						console.log('data.FTypeID1', data.FTypeID1);
-							if (item.table == "TFS_MaterialInfo") {
-								data[item.key] = result[item.key] || data[item.key] || "";
-							}
-						});
 
 						let type1 = this.typeList[0].filter(t => t.FValue == data.FTypeID1)[0];
 						let typeName = type1.FName;
@@ -471,44 +467,15 @@ export default {
 						if (typeName.indexOf("成品") > 0) {
 							data.FViewType = 1
 						}
-						let $this=this;
+						data["info"] = this.materialInfoList.Data.find(s => s.FDataID == data.FTypeID2);
-						this.dataList.map(function (item) {
-							if(item.FID==data.FID)
-							{
-								item.info=$this.materialInfoList.Data.find(s=>s.FDataID==data.FTypeID2);	
-							}
-							return item;
-						})
-						this.dataColumn.map(function (item) {
-							let str = result[item.key + "Type"];
 
-							if (typeof (str) != "undefined") {
+						this.editColumn.forEach((item) => {
-								switch (str) {
+							if (item.key != "FTypeID1" && item.key != "FTypeID2" && result[item.key]&&result[item.key]!="") {
-									case "1":
+								data[item.key] = result[item.key]
-										if (typeof (item.cellClass) == "undefined") {
-											return item["cellClass"] = "one";
-										}
-										return item.cellClass = item.cellClass.split(" ")[0] + " one";
-									case "2":
-										if (typeof (item.cellClass) == "undefined") {
-											return item["cellClass"] = "twe";
-										}
-										return item.cellClass = item.cellClass.split(" ")[0] + " twe";
-									case "3":
-										if (typeof (item.cellClass) == "undefined") {
-											return item["cellClass"] = "three";
-										}
-										return item.cellClass = item.cellClass.split(" ")[0] + " three";
-									case "4":
-										if (typeof (item.cellClass) == "undefined") {
-											return item["cellClass"] = "four";
-										}
-										return item.cellClass = item.cellClass.split(" ")[0] + " four";
-								}
 							}
+							//data[item.key] = result[item.key] || data[item.key] || "";
+						});
 
-							return item["cellClass"]="";
-						})
 					}
 				}
 			}
@@ -565,19 +532,19 @@ export default {
 				}
 				
 				for (let key in dataObj) {
+					debugger
 					if (!updateObj[key]) updateObj[key] = [];
 					updateObj[key].push(dataObj[key]);
 				}
 			});
 
 
-			if(!allTypeSelected)
+			if (!allTypeSelected) {
-			{
 				return false;
 			}
 
 			let updateLog = updateObj.LogList.join("、");
-			
+			debugger
 			if (updateLog != "") {
 				delete updateObj.LogList
 				// 发送保存请求

src/views/materia/route.vue

@@ -312,7 +312,7 @@
 				for (let i = 0; i < this.showEditBox.length; i++) {
 					this.showEditBox[i] = false;
 				}
-
+				debugger
 				data.FTeamID = data.FMaterialTeamID;
 				data.FMdfMaterialTeamId = data.FMaterialTeamID;
 				this.objInfoObj = data;