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

src/views/half/components/EditView.vue

@@ -254,21 +254,22 @@ export default {
 			}
 			let columnsList = [];
 			let col7 = dataColumn.filter(s => s.fieldType == 7) || [];
-
 			_data.rows.forEach((item, i) => {
-
 				columnsList = _data.columns.map(function (items) {
-					let str = _data.infos[i][items.key + "Type"];
-					if (typeof (str) != "undefined") {
-						switch (str) {
-							case "1":
-								return items.cellClass = items.cellClass + " one";
-							case "2":
-								return items.cellClass = items.cellClass + " twe";
-							case "3":
-								return items.cellClass = items.cellClass + " three";
-							case "4":
-								return items.cellClass = items.cellClass + " four";
+					let info = _data.infos[i]
+					if (info) {
+						let str = info[items.key + "Type"];
+						if (typeof (str) != "undefined") {
+							switch (str) {
+								case "1":
+									return items.cellClass = items.cellClass + " one";
+								case "2":
+									return items.cellClass = items.cellClass + " twe";
+								case "3":
+									return items.cellClass = items.cellClass + " three";
+								case "4":
+									return items.cellClass = items.cellClass + " four";
+							}
 						}
 					}					
 
@@ -295,18 +296,31 @@ export default {
 				}
 				item.FTypeID1 = (item.FTypeID1 == 0 || item.FTypeID1 == -1) ? "" : item.FTypeID1;
 				item.FTypeID2 = (item.FTypeID2 == 0 || item.FTypeID2 == -1) ? "" : item.FTypeID2;
+
+				if (this.dataInfoObj.FCanEdit == 2) {
+					let fType1 = this.typeList[0].find((t) => {
+						return t.FID === item.FTypeID1
+					});
+
+					let fType2 = this.typeList[1].find((t) => {
+						return t.FID === item.FTypeID2
+					})
+
+					item.FTypeID1 = fType1.FName;
+					item.FTypeID2 = fType2.FName;
+				}
 			});
+			
 			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;
+			debugger
+
 			this.originalColumns = this.deepCopy(dataColumn);
 			this.getFreezingColumns();
 
-			debugger
 			this._changeType(_data.rows[0],2);
 			setTimeout(function () {
 				layer.close(idx);
@@ -465,7 +479,6 @@ export default {
 			if (updateLog != "") {
 				delete updateObj.LogList
 				// 发送保存请求
-				debugger
 				console.log('updateObj', updateObj);
 				let _result = await updateBatchById3(updateObj);
 				if (_result.Code === 200) {

src/views/half/route.vue

@@ -285,9 +285,12 @@ export default {
 			for (let i = 0; i < this.showEditBox.length; i++) {
 				this.showEditBox[i] = false;
 			}
-			if (data.FType == 1 ||data.FType == 2) {
+			if (data.FType == 1) {
 				data.FBoxType = 1; //配方选择
-			}else {
+			}else if(data.FType == 2){
+				data.FBoxType = 3;
+			}
+			else {
 				return layer.msg("未知事项类型");
 			}
 			this.objInfoObj = data;

src/views/materia/components/EditView.vue

@@ -256,6 +256,7 @@ export default {
 
 					return items["cellClass"]="";
 				})
+				
 				let k3Code = item.FBaseMaterialDesc;
 				if (k3Code.indexOf("@") > 0) {
 					item.FK3Code = k3Code.substr(0, k3Code.indexOf("@"));