1111

src/view/maint/material.vue

@@ -19,6 +19,12 @@
 				</el-table-column>
 				<el-table-column prop="model" label="尺寸" width="120">
 				</el-table-column>
+				<el-table-column prop="attri1" label="属性1" width="120">
+				</el-table-column>
+				<el-table-column prop="attri2" label="属性2" width="120">
+				</el-table-column>
+				<el-table-column prop="attri3" label="属性3" width="120">
+				</el-table-column>
 				<el-table-column label="操作">
 					<template slot-scope="scope">
 						<el-button size="mini" @click="handleEdit(scope.row)">编辑</el-button>
@@ -47,9 +53,18 @@
 				<el-form-item label="钢种">
 					<el-input v-model="material.standard"></el-input>
 				</el-form-item>
-				 		<el-form-item label="尺寸">
+				<el-form-item label="尺寸">
 				 	<el-input v-model="material.model"></el-input>
-				 </el-form-item>
+				</el-form-item>
+				<el-form-item label="属性1">
+				 	<el-input v-model="material.attri1"></el-input>
+				</el-form-item>
+				<el-form-item label="属性2">
+				 	<el-input v-model="material.attri2"></el-input>
+				</el-form-item>
+				<el-form-item label="属性3">
+				 	<el-input v-model="material.attri3"></el-input>
+				</el-form-item>
 				<el-form-item>
 					<el-button type="success" @click="handleSave">保存</el-button>
 					<el-button @click="handleCancelSave">取消</el-button>
@@ -89,6 +104,9 @@
 					code: '',
 					standard: '',
 					model: '',
+					attri1: '',
+					attri2: '',
+					attri3: '',
 				},
 				isShow: false,
 				loading: true,

src/view/record/inrecord.vue

@@ -481,7 +481,7 @@
 				]
 
 				for(var i=0;i<imptData.length;i++){
-					imptData[i]["addUserUserDesc"] = imptData[i].addUser.userDesc;
+					imptData[i]["addUseruserDesc"] = imptData[i].addUser.userDesc;
 					imptData[i]["recordType"]      = imptData[i]["recordType"] == 0 ? "入库取消" : "入库";
 					imptData[i]["outFlag"]      = imptData[i]["outFlag"] == 0 ? "正常在库" : "已出库";
 				}