commit by yzf

src/views/half/components/EditView.vue

@@ -256,9 +256,10 @@ export default {
 			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"];
+					let info = _data.infos[i]
+					if (info) {
+						let str = info[items.key + "Type"];
 						if (typeof (str) != "undefined") {
 							switch (str) {
 								case "1":
@@ -271,9 +272,11 @@ export default {
 									return items.cellClass = items.cellClass + " four";
 							}
 						}
+					}					
 
 					return items["cellClass"]="";
 				})
+				
 				let k3Code = item.FBaseMaterialDesc;
 				if (k3Code.indexOf("@") > 0) {
 					item.FK3Code = k3Code.substr(0, k3Code.indexOf("@"));
@@ -295,7 +298,21 @@ 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));
 

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

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