YL2767 1 day ago
parent
commit
e0ba77e3a7
3 changed files with 462 additions and 608 deletions
  1. 20
    2
      src/view/maint/material.vue
  2. 1
    1
      src/view/record/inrecord.vue
  3. 441
    605
      src/view/ware/storechange.vue

+ 20
- 2
src/view/maint/material.vue View File

19
 				</el-table-column>
19
 				</el-table-column>
20
 				<el-table-column prop="model" label="尺寸" width="120">
20
 				<el-table-column prop="model" label="尺寸" width="120">
21
 				</el-table-column>
21
 				</el-table-column>
22
+				<el-table-column prop="attri1" label="属性1" width="120">
23
+				</el-table-column>
24
+				<el-table-column prop="attri2" label="属性2" width="120">
25
+				</el-table-column>
26
+				<el-table-column prop="attri3" label="属性3" width="120">
27
+				</el-table-column>
22
 				<el-table-column label="操作">
28
 				<el-table-column label="操作">
23
 					<template slot-scope="scope">
29
 					<template slot-scope="scope">
24
 						<el-button size="mini" @click="handleEdit(scope.row)">编辑</el-button>
30
 						<el-button size="mini" @click="handleEdit(scope.row)">编辑</el-button>
47
 				<el-form-item label="钢种">
53
 				<el-form-item label="钢种">
48
 					<el-input v-model="material.standard"></el-input>
54
 					<el-input v-model="material.standard"></el-input>
49
 				</el-form-item>
55
 				</el-form-item>
50
-				 		<el-form-item label="尺寸">
56
+				<el-form-item label="尺寸">
51
 				 	<el-input v-model="material.model"></el-input>
57
 				 	<el-input v-model="material.model"></el-input>
52
-				 </el-form-item>
58
+				</el-form-item>
59
+				<el-form-item label="属性1">
60
+				 	<el-input v-model="material.attri1"></el-input>
61
+				</el-form-item>
62
+				<el-form-item label="属性2">
63
+				 	<el-input v-model="material.attri2"></el-input>
64
+				</el-form-item>
65
+				<el-form-item label="属性3">
66
+				 	<el-input v-model="material.attri3"></el-input>
67
+				</el-form-item>
53
 				<el-form-item>
68
 				<el-form-item>
54
 					<el-button type="success" @click="handleSave">保存</el-button>
69
 					<el-button type="success" @click="handleSave">保存</el-button>
55
 					<el-button @click="handleCancelSave">取消</el-button>
70
 					<el-button @click="handleCancelSave">取消</el-button>
89
 					code: '',
104
 					code: '',
90
 					standard: '',
105
 					standard: '',
91
 					model: '',
106
 					model: '',
107
+					attri1: '',
108
+					attri2: '',
109
+					attri3: '',
92
 				},
110
 				},
93
 				isShow: false,
111
 				isShow: false,
94
 				loading: true,
112
 				loading: true,

+ 1
- 1
src/view/record/inrecord.vue View File

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

+ 441
- 605
src/view/ware/storechange.vue
File diff suppressed because it is too large
View File


Loading…
Cancel
Save