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

src/views/materia/all.vue

@@ -47,7 +47,7 @@
 							<span v-else style="color:#1E9FFF">已完成</span>
 						</template>
 						<template v-if="dataInfoObj == undefined|| !dataInfoObj.FID" v-slot:operator="{ data }">
-							<lay-button size="xs" type="primary" @click="showEditMaterial(3)">视图</lay-button>
+							<lay-button size="xs" type="primary" @click="showEditMaterial(3, data)">视图</lay-button>
 						</template>
 					</lay-table>
 				</lay-card>
@@ -59,7 +59,7 @@
 		<lay-layer :area="modelArea[2]" v-model="showEditBox[2]" title="修改物料">
 			<EditMateria v-if="showEditBox[2]" :dataInfoObj="objInfoObj" @cancelClick="cancelClick"></EditMateria>
 		</lay-layer>
-		<lay-layer :area="modelArea[3]" v-model="showEditBox[3]" title="编辑物料">
+		<lay-layer :area="modelArea[3]" v-model="showEditBox[3]" title="物料视图">
 			<EditView v-if="showEditBox[3]" :dataInfoObj="objInfoObj" @cancelClick="cancelClick"></EditView>
 		</lay-layer>
 	</lay-container>
@@ -297,7 +297,17 @@
 				this.editType = 1;
 
 			},
-			showEditMaterial(i){
+			showEditMaterial(i, data){
+				for (let i = 0; i < this.showEditBox.length; i++) {
+					this.showEditBox[i] = false;
+				}
+
+				if (i == 3) {
+					data.FTeamID = data.FID;
+					data.FCanEdit = 2;
+					this.objInfoObj = data;
+				}				
+
 				this.showEditBox[i] = true;
 			},
 			_clickSetInfo(data, type) {

src/views/materia/components/EditView.vue

@@ -287,8 +287,14 @@ export default {
 						return t.FID === item.FTypeID2
 					})
 
-					item.FTypeID1 = fType1.FName;
-					item.FTypeID2 = fType2.FName;
+					if (fType1) {
+						item.FTypeID1 = fType1.FName;
+					}
+					
+					if (fType2) {
+						item.FTypeID2 = fType2.FName;
+					}
+					
 				}
 			});
 			
@@ -453,6 +459,9 @@ export default {
 				}
 			});
 			let updateLog = updateObj.LogList.join("、");
+
+			console.log('this.dataInfoObj.step', this.dataInfoObj.step);
+			
 			if (updateLog != "") {
 				delete updateObj.LogList
 				// 发送保存请求