Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemWeb

src/views/half/components/EditView.vue

@@ -204,7 +204,7 @@ export default {
 				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:"";
@@ -322,17 +322,7 @@ export default {
 			this.dataColumn = dataColumn;
 			debugger
 			this.originalColumns = this.deepCopy(dataColumn);
-
+			let freezingColumns = freezingCols.FFreezingColumns
-			this.getFreezingColumns();
-
-			//this._changeType(_data.rows[0],2);
-			setTimeout(function () {
-				layer.close(idx);
-			}, 500);
-		},
-		async getFreezingColumns() {
-			let result = await GetFreezingColumns();
-			let freezingColumns = result.FFreezingColumns
 
 			if (freezingColumns) {
 				let c_list = freezingColumns.split(",")
@@ -347,7 +337,30 @@ export default {
 				this.dataColumn = ref([]);
 				this.setFreezingColumns();
 			}
+
+			//this._changeType(_data.rows[0],2);
+			setTimeout(function () {
+				layer.close(idx);
+			}, 500);
 		},
+		// async getFreezingColumns() {
+		// 	let result = await GetFreezingColumns();
+		// 	let freezingColumns = result.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();
+		// 	}
+		// },
 		cancelClick(isRefresh) {
 			isRefresh = isRefresh == undefined ? false : isRefresh;
 			this.$emit('cancelClick', isRefresh);

src/views/half/components/EditViewOFF.vue

@@ -202,7 +202,7 @@ export default {
 				teamId: this.dataInfoObj.FTeamID,
 				viewType: this.dataInfoObj.FViewType
 			});
-			debugger
+			let freezingCols = await GetFreezingColumns();
 			console.log('_data', _data);
 			if (this.dataInfoObj.FViewType == 1 || this.dataInfoObj.FViewType == 10) {
 				this.inputCodeValue = _data.rows[0] ? _data.rows[0].HalfCode : "";
@@ -272,7 +272,7 @@ export default {
 									return items.cellClass = items.cellClass + " four";
 							}
 						}
-					}			
+					}
 
 					return items["cellClass"] = "";
 				})
@@ -322,40 +322,30 @@ export default {
 
 			console.log('editColumn', editColumn);
 			this.editColumn = editColumn;
-			let $this=this;
+			let $this = this;
-			this.dataList = _data.rows.map(function(item){
+			this.dataList = _data.rows.map(function (item) {
-				
+
 				if ($this.dataInfoObj.FCanEdit == 2) {
 					let fType1 = $this.typeList[0].find((t) => {
-						if(item.FTypeID1){
+						if (item.FTypeID1) {
 							return t.FID == item.FTypeID1
 						}
 					});
 
 					let fType2 = $this.typeList[1].find((t) => {
-						if(item.FTypeID2){
+						if (item.FTypeID2) {
 							return t.FID == item.FTypeID2
 						}
 					})
 
-					item.FTypeID1 = fType1?fType1.FName:item.FTypeID1;
+					item.FTypeID1 = fType1 ? fType1.FName : item.FTypeID1;
-					item.FTypeID2 = fType2?fType2.FName:item.FTypeID2;
+					item.FTypeID2 = fType2 ? fType2.FName : item.FTypeID2;
 				}
 				return item;
 			});
 			this.dataColumn = dataColumn;
 			this.originalColumns = this.deepCopy(dataColumn);
-			this.getFreezingColumns();
+			let freezingColumns = freezingCols.FFreezingColumns
-
-			debugger
-			//this._changeType(_data.rows[0], 2);
-			setTimeout(function () {
-				layer.close(idx);
-			}, 500);
-		},
-		async getFreezingColumns() {
-			let result = await GetFreezingColumns();
-			let freezingColumns = result.FFreezingColumns
 
 			if (freezingColumns) {
 				let c_list = freezingColumns.split(",")
@@ -370,7 +360,32 @@ export default {
 				this.dataColumn = ref([]);
 				this.setFreezingColumns();
 			}
+
+
+			debugger
+			this._changeType(_data.rows[0], 2);
+			setTimeout(function () {
+				layer.close(idx);
+			}, 500);
 		},
+		// async getFreezingColumns() {
+		// 	let result = await GetFreezingColumns();
+		// 	let freezingColumns = result.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();
+		// 	}
+		// },
 		cancelClick(isRefresh) {
 			isRefresh = isRefresh == undefined ? false : isRefresh;
 			this.$emit('cancelClick', isRefresh);