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

@@ -141,7 +141,7 @@ export default {
 			let back = column.table == "TFS_ViewMaterial" ? "background:rgb(246, 246, 246)" : "";
 			let info = row["info"];
 			if (info) {
-				if (typeof(document.getElementsByClassName(column.key + "_" + rowIndex + "_" + columnIndex)[0])!="undefined") {
+				if (typeof (document.getElementsByClassName(column.key + "_" + rowIndex + "_" + columnIndex)[0]) != "undefined") {
 					switch (info[column.key + "Type"]) {
 						case "1":
 							return document.getElementsByClassName(column.key + "_" + rowIndex + "_" + columnIndex)[0].classList.add("one");
@@ -178,7 +178,7 @@ export default {
 		const tmpDataColumn = ref([]);
 
 		const idx = ref([]);
-		const materialInfoList=ref([]);
+		const materialInfoList = ref([]);
 		return {
 			dataColumn,
 			dataList,
@@ -222,20 +222,20 @@ export default {
 				this.userPower[0] = (await getBasicRoleList({
 					FRoleType: 84,
 					FViewType: this.dataInfoObj.FViewType,
-					TeamId:this.dataInfoObj.FTeamID,
+					TeamId: this.dataInfoObj.FTeamID,
-					Type:1
+					Type: 1
 				}) || []).map(it => parseInt(it.F2))
 				this.userPower[1] = (await getBasicRoleList({
 					FRoleType: 44,
 					FViewType: this.dataInfoObj.FViewType,
-					TeamId:this.dataInfoObj.FTeamID,
+					TeamId: this.dataInfoObj.FTeamID,
-					Type:1
+					Type: 1
 				}) || []).map(it => parseInt(it.F2))
 			}
 			this.initPage(layer.load(2));
 		},
 		async initPage(idx) {
-			this.idx=idx;
+			this.idx = idx;
 			let _data = await getMaterialViewsByTeamId({
 				teamId: this.dataInfoObj.FTeamID,
 				teamWorkType: this.dataInfoObj.FTeamworkType,
@@ -299,7 +299,7 @@ export default {
 						}
 					}
 
-					return items["cellClass"]="";
+					return items["cellClass"] = "";
 				})
 
 				// let k3Code = item.FBaseMaterialDesc;
@@ -348,9 +348,9 @@ export default {
 			localStorage.setItem('EditView' + saveId, JSON.stringify(_data.rows));
 
 			this.editColumn = editColumn;
-			let $this=this;
+			let $this = this;
 			this.dataList = _data.rows.map(function (item) {
-				item["info"]=$this.materialInfoList.Data.find(s=>s.FDataID==item.FTypeID2);	
+				item["info"] = $this.materialInfoList.Data.find(s => s.FDataID == item.FTypeID2);
 				let fType1 = $this.typeList[0].find((t) => {
 					if (item.FTypeID1) {
 						return t.FID == item.FTypeID1
@@ -366,16 +366,16 @@ export default {
 					item.FTypeID1 = fType1 ? fType1.FName : item.FTypeID1;
 					item.FTypeID2 = fType2 ? fType2.FName : item.FTypeID2;
 				}
-				else{
+				else {
 
-					let isFTypeID1 = $this.editColumn.find((t)=>{
+					let isFTypeID1 = $this.editColumn.find((t) => {
-						return t.key=="FTypeID1";
+						return t.key == "FTypeID1";
 					})
-					let isFTypeID2 = $this.editColumn.find((t)=>{
+					let isFTypeID2 = $this.editColumn.find((t) => {
-						return t.key=="FTypeID2";
+						return t.key == "FTypeID2";
 					})
 
-					if(!isFTypeID1&&!isFTypeID2){
+					if (!isFTypeID1 && !isFTypeID2) {
 						item.FTypeID1 = fType1 ? fType1.FName : item.FTypeID1;
 						item.FTypeID2 = fType2 ? fType2.FName : item.FTypeID2;
 					}
@@ -390,7 +390,7 @@ export default {
 			if (freezingColumns) {
 				let c_list = freezingColumns.split(",")
 				c_list.forEach(c => {
-					if(c && c.length > 0) {
+					if (c && c.length > 0) {
 						this.freezingColumnSetting.push(c)
 					}
 				})
@@ -402,7 +402,7 @@ export default {
 			}
 
 			if (this.dataInfoObj.FCanEdit != 2) {
-				this._changeType(_data.rows[0],2);
+				this._changeType(_data.rows[0], 2);
 			}
 
 			setTimeout(function () {
@@ -416,7 +416,7 @@ export default {
 			if (freezingColumns) {
 				let c_list = freezingColumns.split(",")
 				c_list.forEach(c => {
-					if(c && c.length > 0) {
+					if (c && c.length > 0) {
 						this.freezingColumnSetting.push(c)
 					}
 				})
@@ -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"]="";
-						})
 					}
 				}
 			}
@@ -529,9 +496,9 @@ export default {
 				let cache = cacheDataList[index];
 				let dataObj = {};
 
-				if (row["FTypeID1"]==-1 || row["FTypeID2"]==-1||row["FTypeID1"]==''||row["FTypeID2"]=='') {
+				if (row["FTypeID1"] == -1 || row["FTypeID2"] == -1 || row["FTypeID1"] == '' || row["FTypeID2"] == '') {
 					layer.close(idx);
-					layer.msg("请先为所有物料选择分类", { icon : 2, time: 1000});
+					layer.msg("请先为所有物料选择分类", { icon: 2, time: 1000 });
 					allTypeSelected = false
 					return false;
 				}
@@ -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;