修改固定相

src/views/Need/all.vue

@@ -302,7 +302,6 @@
 				this.pageInfo.total = result.Data.Total || 0;
 				this.dataList = result.Data.List;
 				this.hasLoaded = true;
-				debugger
 			},
 			//日期处理
 			dateFormat(dataStr) {

src/views/Need/components/EditView.vue

@@ -202,8 +202,9 @@ export default {
 				teamId: this.dataInfoObj.FTeamID,
 				viewType: this.dataInfoObj.FViewType
 			});
-			console.log('_data', _data);
+			
-			debugger
+			let freezingCols = await GetFreezingColumns();
+
 			if (this.dataInfoObj.FViewType == 1 || this.dataInfoObj.FViewType == 10) {
 				this.inputCodeValue = _data.rows[0]?_data.rows[0].HalfCode:"";
 				this.inputDescValue = _data.rows[0]?_data.rows[0].HalfDesc:"";
@@ -255,7 +256,6 @@ export default {
 			let col7 = dataColumn.filter(s => s.fieldType == 7) || [];
 
 			_data.rows.forEach((item, i) => {
-
 				columnsList = _data.columns.map(function (items) {
 					let info = _data.infos[i]
 					if (info) {
@@ -270,7 +270,7 @@ export default {
 								return items.cellClass = items.cellClass + " three";
 							case "4":
 								return items.cellClass = items.cellClass + " four";
-						}
+							}
 						}
 					}
 					
@@ -301,21 +301,35 @@ export default {
 			let saveId = this.dataInfoObj.FViewType + "_" + this.dataInfoObj.FID;
 			localStorage.setItem('EditView' + saveId, JSON.stringify(_data.rows));
 
-			console.log('editColumn', editColumn);
 			this.editColumn = editColumn;
 			this.dataList = _data.rows;
 			this.dataColumn = dataColumn;
 			this.originalColumns = this.deepCopy(dataColumn);
-			this.getFreezingColumns();
 
-			debugger
+			let freezingColumns = freezingCols.FFreezingColumns
+
+			if (freezingColumns) {
+				let c_list = freezingColumns.split(",")
+				c_list.forEach(c => {
+					if(c && c.length > 0) {
+						this.freezingColumnSetting.push(c)
+					}
+				})
+			}
+
+			if (this.freezingColumnSetting && this.freezingColumnSetting.length > 0) {
+				this.dataColumn = ref([]);
+				this.setFreezingColumns();
+			}
+
+
 			this._changeType(_data.rows[0],2);
 			setTimeout(function () {
 				layer.close(idx);
 			}, 500);
 		},
 		async getFreezingColumns() {
-			let result = await GetFreezingColumns();			
+			let result = await GetFreezingColumns();
 			let freezingColumns = result.FFreezingColumns
 
 			if (freezingColumns) {
@@ -348,13 +362,11 @@ export default {
 
 					if (result != null && result.FID) {
 						let col7 = this.dataColumn.filter(s => s.fieldType == 7) || [];
-						console.log('this.typeList[0]', this.typeList[0].filter(t => t.FValue == data.FTypeID1)[0]);
 						col7.forEach((item) => {
 							if (item.table == "TFS_MaterialInfo") {
 								data[item.key] = result[item.key] || data[item.key] || "";
 							}
 						});
-						console.log('data.FTypeID1', data.FTypeID1);
 
 						let type1 = this.typeList[0].filter(t => t.FValue == data.FTypeID1)[0];
 						let typeName = type1.FName;
@@ -422,11 +434,9 @@ export default {
 			};
 			let saveId = this.dataInfoObj.FViewType + "_" + this.dataInfoObj.FID;
 			let cacheDataList = JSON.parse(localStorage.getItem('EditView' + saveId));
-			console.log('cacheDataList', cacheDataList);
 			this.dataList.forEach((row, index) => {
 				let cache = cacheDataList[index];
 				let dataObj = {};
-				console.log('this.editColumn', this.editColumn);
 				for (let col of this.editColumn) {
 					let valTemp = row[col.key];
 					if (this.dataInfoObj.FViewType == 10) {
@@ -456,8 +466,6 @@ export default {
 					}
 				}
 
-				console.log('dataObj', dataObj);
-
 				for (let key in dataObj) {
 					if (!updateObj[key]) updateObj[key] = [];
 					updateObj[key].push(dataObj[key]);
@@ -467,8 +475,6 @@ export default {
 			if (updateLog != "") {
 				delete updateObj.LogList
 				// 发送保存请求
-				debugger
-				console.log('updateObj', updateObj);
 				let _result = await updateBatchById2(updateObj);
 				if (_result.Code === 200) {
 					await commonSave({
@@ -515,7 +521,6 @@ export default {
 			} else {
 				this.dataColumn = this.tmpDataColumn;			
 			}
-			this.$nextTick();
 		},
 		setFreezingColumnsSetting(fcs) {
 			this.freezingColumnSetting = fcs;

src/views/materia/components/EditView.vue

@@ -199,6 +199,8 @@ export default {
 				teamType: 1
 			}, "MaterialTeamwork");
 
+			let freezingCols = await GetFreezingColumns();
+
 			this.typeList[0] = _data.types.filter(s => s.FDepth == 1) || [];
 			this.typeList[1] = _data.types.filter(s => s.FDepth != 1) || [];
 			let dataColumn = _data.columns || [];
@@ -306,7 +308,22 @@ export default {
 			this.dataList = _data.rows;
 			this.dataColumn = dataColumn;
 			this.originalColumns = this.deepCopy(dataColumn);
-			this.getFreezingColumns();
+
+			let freezingColumns = freezingCols.FFreezingColumns
+
+			if (freezingColumns) {
+				let c_list = freezingColumns.split(",")
+				c_list.forEach(c => {
+					if(c && c.length > 0) {
+						this.freezingColumnSetting.push(c)
+					}
+				})
+			}
+
+			if (this.freezingColumnSetting && this.freezingColumnSetting.length > 0) {
+				this.dataColumn = ref([]);
+				this.setFreezingColumns();
+			}
 
 			if (this.dataInfoObj.FCanEdit != 2) {
 				this._changeType(_data.rows[0],2);