|  |  |  | @ -22,22 +22,24 @@ | 
			
		
	
		
			
				
					|  |  |  |  | 				</lay-button> | 
			
		
	
		
			
				
					|  |  |  |  | 			</template> | 
			
		
	
		
			
				
					|  |  |  |  | 			<template v-for="item in editColumn" v-slot:[item.key]="{ data }"> | 
			
		
	
		
			
				
					|  |  |  |  | 				<lay-select v-if="item.key == 'FTypeID1' && data['Power'].indexOf(item.key+',')>-1" size="sm" v-model="data['FTypeID1']" | 
			
		
	
		
			
				
					|  |  |  |  | 					@change="_changeType(data, 1)" :showEmpty="false"> | 
			
		
	
		
			
				
					|  |  |  |  | 				<lay-select v-if="item.key == 'FTypeID1' && data['Power'].indexOf(item.key + ',') > -1" size="sm" | 
			
		
	
		
			
				
					|  |  |  |  | 					v-model="data['FTypeID1']" @change="_changeType(data, 1)" :showEmpty="false"> | 
			
		
	
		
			
				
					|  |  |  |  | 					<lay-select-option v-for="(tIdv, tIdx) in typeList[0]" :key="tIdx" :value="tIdv.FID" | 
			
		
	
		
			
				
					|  |  |  |  | 						:label="tIdv.FName"></lay-select-option> | 
			
		
	
		
			
				
					|  |  |  |  | 				</lay-select> | 
			
		
	
		
			
				
					|  |  |  |  | 				<lay-select v-else-if="item.key == 'FTypeID2' && data['Power'].indexOf(item.key+',')>-1" size="sm" v-model="data['FTypeID2']" | 
			
		
	
		
			
				
					|  |  |  |  | 					@change="_changeType(data, 2)" :showEmpty="false"> | 
			
		
	
		
			
				
					|  |  |  |  | 				<lay-select v-else-if="item.key == 'FTypeID2' && data['Power'].indexOf(item.key + ',') > -1" size="sm" | 
			
		
	
		
			
				
					|  |  |  |  | 					v-model="data['FTypeID2']" @change="_changeType(data, 2)" :showEmpty="false"> | 
			
		
	
		
			
				
					|  |  |  |  | 					<lay-select-option v-show="data.FTypeID1 == tIdv.FParentID" v-for="(tIdv, tIdx) in typeList[1]" | 
			
		
	
		
			
				
					|  |  |  |  | 						:key="tIdx" :value="tIdv.FID" :label="tIdv.FName"></lay-select-option> | 
			
		
	
		
			
				
					|  |  |  |  | 				</lay-select> | 
			
		
	
		
			
				
					|  |  |  |  | 				<lay-select v-else-if="item.selectType && data['Power'].indexOf(item.key+',')>-1" size="sm" v-model="data[item.key]" :showEmpty="false"> | 
			
		
	
		
			
				
					|  |  |  |  | 				<lay-select v-else-if="item.selectType && data['Power'].indexOf(item.key + ',') > -1" size="sm" | 
			
		
	
		
			
				
					|  |  |  |  | 					v-model="data[item.key]" :showEmpty="false"> | 
			
		
	
		
			
				
					|  |  |  |  | 					<lay-select-option v-for="(tIdv, tIdx) in selectDataMap['FType' + item.selectTypeId]" :key="tIdx" | 
			
		
	
		
			
				
					|  |  |  |  | 						:value="tIdv.FValue" :label="tIdv.FName"></lay-select-option> | 
			
		
	
		
			
				
					|  |  |  |  | 				</lay-select> | 
			
		
	
		
			
				
					|  |  |  |  | 				<lay-input v-else-if="!item.dataType && data['Power'].indexOf(item.key+',')>-1" size="sm" v-model="data[item.key]"></lay-input> | 
			
		
	
		
			
				
					|  |  |  |  | 				<label v-else="">{{data[item.key]}}</label> | 
			
		
	
		
			
				
					|  |  |  |  | 				<lay-input v-else-if="!item.dataType && data['Power'].indexOf(item.key + ',') > -1" size="sm" | 
			
		
	
		
			
				
					|  |  |  |  | 					v-model="data[item.key]"></lay-input> | 
			
		
	
		
			
				
					|  |  |  |  | 				<label v-else="">{{ data[item.key] }}</label> | 
			
		
	
		
			
				
					|  |  |  |  | 			</template> | 
			
		
	
		
			
				
					|  |  |  |  | 		</lay-table> | 
			
		
	
		
			
				
					|  |  |  |  | 		<OperateLog v-if="dataInfoObj.FTeamID" ref="OperateLog" :dataInfoObj="dataInfoObj"></OperateLog> | 
			
		
	
	
		
			
				
					|  |  |  | @ -224,8 +226,8 @@ export default { | 
			
		
	
		
			
				
					|  |  |  |  | 					FRoleType: 84, | 
			
		
	
		
			
				
					|  |  |  |  | 					TeamId: this.dataInfoObj.FTeamID, | 
			
		
	
		
			
				
					|  |  |  |  | 					Type: 1 | 
			
		
	
		
			
				
					|  |  |  |  | 				}) || []).map(it => parseInt(it.F2)) | 
			
		
	
		
			
				
					|  |  |  |  | 				 | 
			
		
	
		
			
				
					|  |  |  |  | 				}) || []) | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  | 			} | 
			
		
	
		
			
				
					|  |  |  |  | 			this.initPage(layer.load(2)); | 
			
		
	
		
			
				
					|  |  |  |  | 		}, | 
			
		
	
	
		
			
				
					|  |  |  | @ -245,29 +247,25 @@ export default { | 
			
		
	
		
			
				
					|  |  |  |  | 			let $this = this; | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  | 			console.log('dataColumn', dataColumn); | 
			
		
	
		
			
				
					|  |  |  |  | 			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" | 
			
		
	
		
			
				
					|  |  |  |  | 					} | 
			
		
	
		
			
				
					|  |  |  |  | 			let editColumn = []; | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  | 			//判断视图权限 | 
			
		
	
		
			
				
					|  |  |  |  | 			_data.rows.forEach((itemRow) => { | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  | 				if (!itemRow["Power"]) { | 
			
		
	
		
			
				
					|  |  |  |  | 					itemRow["Power"] = ""; | 
			
		
	
		
			
				
					|  |  |  |  | 				} | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  | 				let powerColumns= $this.userPower[0].filter(s=>s.F1==itemRow.FViewType); | 
			
		
	
		
			
				
					|  |  |  |  | 				 | 
			
		
	
		
			
				
					|  |  |  |  | 				if(powerColumns) | 
			
		
	
		
			
				
					|  |  |  |  | 				{ | 
			
		
	
		
			
				
					|  |  |  |  | 					powerColumns.forEach((itemColums)=>{ | 
			
		
	
		
			
				
					|  |  |  |  | 						let dataColumn=_data.columns.find(s=>s.id==itemColums.F2); | 
			
		
	
		
			
				
					|  |  |  |  | 						itemRow["Power"]+=dataColumn.key+","; | 
			
		
	
		
			
				
					|  |  |  |  | 						 | 
			
		
	
		
			
				
					|  |  |  |  | 						if(!editColumn.find(s=>s.key==dataColumn.key)) | 
			
		
	
		
			
				
					|  |  |  |  | 						{ | 
			
		
	
		
			
				
					|  |  |  |  | 							dataColumn["customSlot"]=dataColumn.key; | 
			
		
	
		
			
				
					|  |  |  |  | 							dataColumn["cellClass"]="edit-item"; | 
			
		
	
		
			
				
					|  |  |  |  | 				let powerColumns = $this.userPower[0].filter(s => s.F1 == itemRow.FViewType); | 
			
		
	
		
			
				
					|  |  |  |  | 				if (powerColumns) { | 
			
		
	
		
			
				
					|  |  |  |  | 					powerColumns.forEach((itemColums) => { | 
			
		
	
		
			
				
					|  |  |  |  | 						let dataColumn = _data.columns.find(s => s.id == itemColums.F2); | 
			
		
	
		
			
				
					|  |  |  |  | 						itemRow["Power"] += dataColumn.key + ","; | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  | 						if (!editColumn.find(s => s.key == dataColumn.key)) { | 
			
		
	
		
			
				
					|  |  |  |  | 							dataColumn["customSlot"] = dataColumn.key; | 
			
		
	
		
			
				
					|  |  |  |  | 							dataColumn["cellClass"] = "edit-item"; | 
			
		
	
		
			
				
					|  |  |  |  | 							editColumn.push(dataColumn); | 
			
		
	
		
			
				
					|  |  |  |  | 						} | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
	
		
			
				
					|  |  |  | @ -318,7 +316,7 @@ export default { | 
			
		
	
		
			
				
					|  |  |  |  | 					return items["cellClass"] = ""; | 
			
		
	
		
			
				
					|  |  |  |  | 				}) | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  | 				 | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  | 				let info = _data.infos.find(s => s.FDataID == item.FMaterialID) || null; | 
			
		
	
		
			
				
					|  |  |  |  | 				if (info != null) { | 
			
		
	
		
			
				
					|  |  |  |  | 					col7.forEach((col) => { | 
			
		
	
	
		
			
				
					|  |  |  | @ -329,12 +327,12 @@ export default { | 
			
		
	
		
			
				
					|  |  |  |  | 				item.FTypeID2 = (item.FTypeID2 == 0 || item.FTypeID2 == -1) ? "" : item.FTypeID2; | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  | 			}); | 
			
		
	
		
			
				
					|  |  |  |  | 			 | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  | 			let saveId = this.dataInfoObj.FID; | 
			
		
	
		
			
				
					|  |  |  |  | 			localStorage.setItem('EditView' + saveId, JSON.stringify(_data.rows)); | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  | 			this.editColumn = editColumn; | 
			
		
	
		
			
				
					|  |  |  |  | 			 | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  | 			this.dataList = _data.rows.map(function (item) { | 
			
		
	
		
			
				
					|  |  |  |  | 				item["info"] = $this.materialInfoList.Data.find(s => s.FDataID == item.FTypeID2); | 
			
		
	
		
			
				
					|  |  |  |  | 				let fType1 = $this.typeList[0].find((t) => { | 
			
		
	
	
		
			
				
					|  |  |  | @ -456,7 +454,7 @@ export default { | 
			
		
	
		
			
				
					|  |  |  |  | 						data["info"] = this.materialInfoList.Data.find(s => s.FDataID == data.FTypeID2); | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  | 						this.editColumn.forEach((item) => { | 
			
		
	
		
			
				
					|  |  |  |  | 							if (item.key != "FTypeID1" && item.key != "FTypeID2" && result[item.key]&&result[item.key]!="") { | 
			
		
	
		
			
				
					|  |  |  |  | 							if (item.key != "FTypeID1" && item.key != "FTypeID2" && result[item.key] && result[item.key] != "") { | 
			
		
	
		
			
				
					|  |  |  |  | 								data[item.key] = result[item.key] | 
			
		
	
		
			
				
					|  |  |  |  | 							} | 
			
		
	
		
			
				
					|  |  |  |  | 							//data[item.key] = result[item.key] || data[item.key] || ""; | 
			
		
	
	
		
			
				
					|  |  |  | @ -477,7 +475,7 @@ export default { | 
			
		
	
		
			
				
					|  |  |  |  | 			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 = {}; | 
			
		
	
	
		
			
				
					|  |  |  | @ -547,12 +545,12 @@ export default { | 
			
		
	
		
			
				
					|  |  |  |  | 						updateObj.LogList.push(col.title + ":" + (valTemp == "" ? "删除" : valTemp)); | 
			
		
	
		
			
				
					|  |  |  |  | 					} | 
			
		
	
		
			
				
					|  |  |  |  | 				} | 
			
		
	
		
			
				
					|  |  |  |  | 				 | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  | 				// 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) {					 | 
			
		
	
		
			
				
					|  |  |  |  | 				for (let key in dataObj) { | 
			
		
	
		
			
				
					|  |  |  |  | 					if (!updateObj[key]) updateObj[key] = []; | 
			
		
	
		
			
				
					|  |  |  |  | 					updateObj[key].push(dataObj[key]); | 
			
		
	
		
			
				
					|  |  |  |  | 				} | 
			
		
	
	
		
			
				
					|  |  |  | @ -562,7 +560,7 @@ export default { | 
			
		
	
		
			
				
					|  |  |  |  | 				return false; | 
			
		
	
		
			
				
					|  |  |  |  | 			} | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  | 			let updateLog = updateObj.LogList.join("、");			 | 
			
		
	
		
			
				
					|  |  |  |  | 			let updateLog = updateObj.LogList.join("、"); | 
			
		
	
		
			
				
					|  |  |  |  | 			if (updateLog != "") { | 
			
		
	
		
			
				
					|  |  |  |  | 				delete updateObj.LogList | 
			
		
	
		
			
				
					|  |  |  |  | 				// 发送保存请求 | 
			
		
	
	
		
			
				
					|  |  |  | 
 |