|  |  |  | @ -248,6 +248,7 @@ export default { | 
			
		
	
		
			
				
					|  |  |  |  | 			this.typeList[1] = _data.types.filter(s => s.FDepth != 1) || []; | 
			
		
	
		
			
				
					|  |  |  |  | 			let dataColumn = _data.columns || []; | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  | 			console.log('dataColumn', dataColumn); | 
			
		
	
		
			
				
					|  |  |  |  | 			let editColumn = dataColumn.filter(it => { | 
			
		
	
		
			
				
					|  |  |  |  | 				let b = false; | 
			
		
	
		
			
				
					|  |  |  |  | 				if (this.dataInfoObj.FCanEdit != 2) { | 
			
		
	
	
		
			
				
					|  |  |  | @ -343,8 +344,8 @@ export default { | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  | 				// } | 
			
		
	
		
			
				
					|  |  |  |  | 			}); | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  | 			let saveId = this.dataInfoObj.FViewType + "_" + this.dataInfoObj.FID; | 
			
		
	
		
			
				
					|  |  |  |  | 			 | 
			
		
	
		
			
				
					|  |  |  |  | 			let saveId = this.dataInfoObj.FID; | 
			
		
	
		
			
				
					|  |  |  |  | 			localStorage.setItem('EditView' + saveId, JSON.stringify(_data.rows)); | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  | 			this.editColumn = editColumn; | 
			
		
	
	
		
			
				
					|  |  |  | @ -387,6 +388,9 @@ export default { | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  | 			let freezingColumns = freezingCols.FFreezingColumns | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  | 			console.log('this.dataList', this.dataList); | 
			
		
	
		
			
				
					|  |  |  |  | 			console.log('this.dataColumn', this.dataColumn); | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  | 			if (freezingColumns) { | 
			
		
	
		
			
				
					|  |  |  |  | 				let c_list = freezingColumns.split(",") | 
			
		
	
		
			
				
					|  |  |  |  | 				c_list.forEach(c => { | 
			
		
	
	
		
			
				
					|  |  |  | @ -442,9 +446,6 @@ export default { | 
			
		
	
		
			
				
					|  |  |  |  | 					}) || null; | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  | 					if (result != null && result.FID) { | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  | 						console.log('data.FTypeID1', data.FTypeID1); | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  | 						let type1 = this.typeList[0].filter(t => t.FValue == data.FTypeID1)[0]; | 
			
		
	
		
			
				
					|  |  |  |  | 						let typeName = type1.FName; | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
	
		
			
				
					|  |  |  | @ -488,10 +489,10 @@ export default { | 
			
		
	
		
			
				
					|  |  |  |  | 				FViewType: this.dataInfoObj.FViewType, | 
			
		
	
		
			
				
					|  |  |  |  | 				FTeamworkType: this.dataInfoObj.FTeamworkType, | 
			
		
	
		
			
				
					|  |  |  |  | 			}; | 
			
		
	
		
			
				
					|  |  |  |  | 			let saveId = this.dataInfoObj.FViewType + "_" + this.dataInfoObj.FID; | 
			
		
	
		
			
				
					|  |  |  |  | 			let saveId = this.dataInfoObj.FID; | 
			
		
	
		
			
				
					|  |  |  |  | 			let cacheDataList = JSON.parse(localStorage.getItem('EditView' + saveId)); | 
			
		
	
		
			
				
					|  |  |  |  | 			let allTypeSelected = true | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  | 			 | 
			
		
	
		
			
				
					|  |  |  |  | 			this.dataList.forEach((row, index) => { | 
			
		
	
		
			
				
					|  |  |  |  | 				let cache = cacheDataList[index]; | 
			
		
	
		
			
				
					|  |  |  |  | 				let dataObj = {}; | 
			
		
	
	
		
			
				
					|  |  |  | @ -504,22 +505,53 @@ export default { | 
			
		
	
		
			
				
					|  |  |  |  | 				} | 
			
		
	
		
			
				
					|  |  |  |  | 				for (let col of this.editColumn) { | 
			
		
	
		
			
				
					|  |  |  |  | 					let valTemp = row[col.key]; | 
			
		
	
		
			
				
					|  |  |  |  | 					if (this.dataInfoObj.FViewType == 10) { | 
			
		
	
		
			
				
					|  |  |  |  | 						if (!dataObj[col.table]) { | 
			
		
	
		
			
				
					|  |  |  |  | 							dataObj[col.table] = {}; | 
			
		
	
		
			
				
					|  |  |  |  | 							dataObj[col.table].FMaterialID = row["FMaterialID"]; | 
			
		
	
		
			
				
					|  |  |  |  | 						} | 
			
		
	
		
			
				
					|  |  |  |  | 						dataObj[col.table][col.key] = valTemp; | 
			
		
	
		
			
				
					|  |  |  |  | 						if (col.key == "FTypeID1" || col.key == "FTypeID2") { | 
			
		
	
		
			
				
					|  |  |  |  | 							let temps = this.typeList[col.key == "FTypeID1" ? 0 : 1] || []; | 
			
		
	
		
			
				
					|  |  |  |  | 							let temp = temps.find(s => s.FID == valTemp) || null; | 
			
		
	
		
			
				
					|  |  |  |  | 							valTemp = temp == null ? "" : temp.FName; | 
			
		
	
		
			
				
					|  |  |  |  | 						} | 
			
		
	
		
			
				
					|  |  |  |  | 						updateObj.LogList.push(col.title + ":" + (valTemp == "" ? "删除" : valTemp)); | 
			
		
	
		
			
				
					|  |  |  |  | 					} else if (valTemp != cache[col.key]) { | 
			
		
	
		
			
				
					|  |  |  |  | 					// if (this.dataInfoObj.FViewType == 10) { | 
			
		
	
		
			
				
					|  |  |  |  | 					// 	if (!dataObj[col.table]) { | 
			
		
	
		
			
				
					|  |  |  |  | 					// 		dataObj[col.table] = {}; | 
			
		
	
		
			
				
					|  |  |  |  | 					// 		dataObj[col.table].FMaterialID = row["FMaterialID"]; | 
			
		
	
		
			
				
					|  |  |  |  | 					// 	} | 
			
		
	
		
			
				
					|  |  |  |  | 					// 	dataObj[col.table][col.key] = valTemp; | 
			
		
	
		
			
				
					|  |  |  |  | 					// 	if (col.key == "FTypeID1" || col.key == "FTypeID2") { | 
			
		
	
		
			
				
					|  |  |  |  | 					// 		let temps = this.typeList[col.key == "FTypeID1" ? 0 : 1] || []; | 
			
		
	
		
			
				
					|  |  |  |  | 					// 		let temp = temps.find(s => s.FID == valTemp) || null; | 
			
		
	
		
			
				
					|  |  |  |  | 					// 		valTemp = temp == null ? "" : temp.FName; | 
			
		
	
		
			
				
					|  |  |  |  | 					// 	} | 
			
		
	
		
			
				
					|  |  |  |  | 					// 	updateObj.LogList.push(col.title + ":" + (valTemp == "" ? "删除" : valTemp)); | 
			
		
	
		
			
				
					|  |  |  |  | 					// } else if (valTemp != cache[col.key]) { | 
			
		
	
		
			
				
					|  |  |  |  | 					// 	if (!dataObj[col.table]) { | 
			
		
	
		
			
				
					|  |  |  |  | 					// 		dataObj[col.table] = {}; | 
			
		
	
		
			
				
					|  |  |  |  | 					// 		dataObj[col.table].FMaterialID = row["FMaterialID"]; | 
			
		
	
		
			
				
					|  |  |  |  | 					// 	} | 
			
		
	
		
			
				
					|  |  |  |  | 					// 	dataObj[col.table][col.key] = valTemp; | 
			
		
	
		
			
				
					|  |  |  |  | 					// 	if (col.key == "FTypeID1" || col.key == "FTypeID2") { | 
			
		
	
		
			
				
					|  |  |  |  | 					// 		let temps = this.typeList[col.key == "FTypeID1" ? 0 : 1] || []; | 
			
		
	
		
			
				
					|  |  |  |  | 					// 		let temp = temps.find(s => s.FID == valTemp) || null; | 
			
		
	
		
			
				
					|  |  |  |  | 					// 		valTemp = temp == null ? "" : temp.FName; | 
			
		
	
		
			
				
					|  |  |  |  | 					// 	} | 
			
		
	
		
			
				
					|  |  |  |  | 					// 	updateObj.LogList.push(col.title + ":" + (valTemp == "" ? "删除" : valTemp)); | 
			
		
	
		
			
				
					|  |  |  |  | 					// } | 
			
		
	
		
			
				
					|  |  |  |  | 					if (valTemp != cache[col.key]) { | 
			
		
	
		
			
				
					|  |  |  |  | 						if (!dataObj[col.table]) { | 
			
		
	
		
			
				
					|  |  |  |  | 							dataObj[col.table] = {}; | 
			
		
	
		
			
				
					|  |  |  |  | 							dataObj[col.table].FMaterialID = row["FMaterialID"]; | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  | 							if (col.table == "TFS_ViewMaterial") { | 
			
		
	
		
			
				
					|  |  |  |  | 								dataObj[col.table].FMRP1ProductType = row["FMRP1ProductType"]; | 
			
		
	
		
			
				
					|  |  |  |  | 								dataObj[col.table].FTypeID2 = row["FTypeID2"]; | 
			
		
	
		
			
				
					|  |  |  |  | 							} | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  | 							if (col.table == "TFS_MaterialInfo") { | 
			
		
	
		
			
				
					|  |  |  |  | 								dataObj[col.table].FMRP1ProductType = row["FMRP1ProductType"]; | 
			
		
	
		
			
				
					|  |  |  |  | 								dataObj[col.table].FTypeID1 = row["FTypeID1"]; | 
			
		
	
		
			
				
					|  |  |  |  | 								dataObj[col.table].FTypeID2 = row["FTypeID2"]; | 
			
		
	
		
			
				
					|  |  |  |  | 								dataObj[col.table].FType2 = row["FTypeID2"]; | 
			
		
	
		
			
				
					|  |  |  |  | 							} | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  | 							if (col.table == "TFS_Material") { | 
			
		
	
		
			
				
					|  |  |  |  | 								dataObj[col.table].FTypeID1 = row["FTypeID1"]; | 
			
		
	
		
			
				
					|  |  |  |  | 								dataObj[col.table].FTypeID2 = row["FTypeID2"]; | 
			
		
	
		
			
				
					|  |  |  |  | 								dataObj[col.table].FType = row["FMRP1ProductType"]; | 
			
		
	
		
			
				
					|  |  |  |  | 							} | 
			
		
	
		
			
				
					|  |  |  |  | 						} | 
			
		
	
		
			
				
					|  |  |  |  | 						dataObj[col.table][col.key] = valTemp; | 
			
		
	
		
			
				
					|  |  |  |  | 						if (col.key == "FTypeID1" || col.key == "FTypeID2") { | 
			
		
	
	
		
			
				
					|  |  |  | @ -531,20 +563,21 @@ export default { | 
			
		
	
		
			
				
					|  |  |  |  | 					} | 
			
		
	
		
			
				
					|  |  |  |  | 				} | 
			
		
	
		
			
				
					|  |  |  |  | 				 | 
			
		
	
		
			
				
					|  |  |  |  | 				for (let key in dataObj) { | 
			
		
	
		
			
				
					|  |  |  |  | 					debugger | 
			
		
	
		
			
				
					|  |  |  |  | 				// dataObj["TFS_ViewMaterial"].FMRP1ProductType = row["FMRP1ProductType"]; | 
			
		
	
		
			
				
					|  |  |  |  | 				// dataObj["TFS_ViewMaterial"].FTypeID1 = row["FTypeID1"]; | 
			
		
	
		
			
				
					|  |  |  |  | 				// dataObj["TFS_ViewMaterial"].FTypeID2 = row["FTypeID2"]; | 
			
		
	
		
			
				
					|  |  |  |  | 				console.log('dataObj', dataObj); | 
			
		
	
		
			
				
					|  |  |  |  | 				for (let key in dataObj) {					 | 
			
		
	
		
			
				
					|  |  |  |  | 					if (!updateObj[key]) updateObj[key] = []; | 
			
		
	
		
			
				
					|  |  |  |  | 					updateObj[key].push(dataObj[key]); | 
			
		
	
		
			
				
					|  |  |  |  | 				} | 
			
		
	
		
			
				
					|  |  |  |  | 			}); | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  | 			if (!allTypeSelected) { | 
			
		
	
		
			
				
					|  |  |  |  | 				return false; | 
			
		
	
		
			
				
					|  |  |  |  | 			} | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  | 			let updateLog = updateObj.LogList.join("、"); | 
			
		
	
		
			
				
					|  |  |  |  | 			debugger | 
			
		
	
		
			
				
					|  |  |  |  | 			let updateLog = updateObj.LogList.join("、");			 | 
			
		
	
		
			
				
					|  |  |  |  | 			if (updateLog != "") { | 
			
		
	
		
			
				
					|  |  |  |  | 				delete updateObj.LogList | 
			
		
	
		
			
				
					|  |  |  |  | 				// 发送保存请求 | 
			
		
	
	
		
			
				
					|  |  |  | 
 |