朱兆平 / vue_cli · 提交

转到一个项目

作者 小范
提交 41e52859014b604c3a679a2a0f918a4431e5b55e 1 个父辈 4aecc583

仓库场站管理优化

内嵌 并排对比
正在显示 6 个修改的文件 包含 120 行增加 和 75 行删除
@@ -30,27 +30,27 @@ @@ -30,27 +30,27 @@
30 fixed 30 fixed
31 prop="areano" 31 prop="areano"
32 label="库区编号" 32 label="库区编号"
33 - width="160"> 33 + width="140">
34 </el-table-column> 34 </el-table-column>
35 <el-table-column 35 <el-table-column
36 prop="stationname" 36 prop="stationname"
37 label="库区名称" 37 label="库区名称"
38 - width="160"> 38 + width="140">
39 </el-table-column> 39 </el-table-column>
40 <el-table-column 40 <el-table-column
41 prop="houseid" 41 prop="houseid"
42 label="所属仓库" 42 label="所属仓库"
43 - width="240"> 43 + width="120">
44 </el-table-column> 44 </el-table-column>
45 <el-table-column 45 <el-table-column
46 prop="length" 46 prop="length"
47 label="库区长度" 47 label="库区长度"
48 - width="120"> 48 + width="80">
49 </el-table-column> 49 </el-table-column>
50 <el-table-column 50 <el-table-column
51 prop="width" 51 prop="width"
52 label="库区宽度" 52 label="库区宽度"
53 - width="160"> 53 + width="80">
54 </el-table-column> 54 </el-table-column>
55 <el-table-column 55 <el-table-column
56 prop="areanum" 56 prop="areanum"
@@ -60,17 +60,17 @@ @@ -60,17 +60,17 @@
60 <el-table-column 60 <el-table-column
61 prop="areavol" 61 prop="areavol"
62 label="库区体积" 62 label="库区体积"
63 - width="160"> 63 + width="80">
64 </el-table-column> 64 </el-table-column>
65 <el-table-column 65 <el-table-column
66 prop=" owner" 66 prop=" owner"
67 label="分配货主" 67 label="分配货主"
68 - width="160"> 68 + width="120">
69 </el-table-column> 69 </el-table-column>
70 <el-table-column 70 <el-table-column
71 prop="surpluslocation" 71 prop="surpluslocation"
72 label="剩余库位" 72 label="剩余库位"
73 - width="240"> 73 + width="80">
74 </el-table-column> 74 </el-table-column>
75 <el-table-column 75 <el-table-column
76 prop="totallocation" 76 prop="totallocation"
@@ -80,7 +80,7 @@ @@ -80,7 +80,7 @@
80 <el-table-column 80 <el-table-column
81 prop="xstart" 81 prop="xstart"
82 label="库区X起始位" 82 label="库区X起始位"
83 - width="160"> 83 + width="80">
84 </el-table-column> 84 </el-table-column>
85 <el-table-column 85 <el-table-column
86 prop="xend" 86 prop="xend"
@@ -90,7 +90,7 @@ @@ -90,7 +90,7 @@
90 <el-table-column 90 <el-table-column
91 prop="ystart" 91 prop="ystart"
92 label="库区Y起始位" 92 label="库区Y起始位"
93 - width="160"> 93 + width="80">
94 </el-table-column> 94 </el-table-column>
95 <el-table-column 95 <el-table-column
96 prop="yend" 96 prop="yend"
@@ -100,7 +100,7 @@ @@ -100,7 +100,7 @@
100 <el-table-column 100 <el-table-column
101 prop="zstart" 101 prop="zstart"
102 label="库区Z起始位" 102 label="库区Z起始位"
103 - width="160"> 103 + width="80">
104 </el-table-column> 104 </el-table-column>
105 <el-table-column 105 <el-table-column
106 prop="zend" 106 prop="zend"
@@ -109,7 +109,8 @@ @@ -109,7 +109,8 @@
109 </el-table-column> 109 </el-table-column>
110 <el-table-column 110 <el-table-column
111 fixed="right" 111 fixed="right"
112 - label="操作"> 112 + label="操作"
  113 + width="200">
113 <template slot-scope="scope"> 114 <template slot-scope="scope">
114 <el-button type="success" size="mini" @click="applyEdit(scope.row)">编辑</el-button> 115 <el-button type="success" size="mini" @click="applyEdit(scope.row)">编辑</el-button>
115 <el-button type="danger" size="mini" @click="applyDel(scope.$index,scope.row)">删除</el-button> 116 <el-button type="danger" size="mini" @click="applyDel(scope.$index,scope.row)">删除</el-button>
@@ -9,12 +9,12 @@ @@ -9,12 +9,12 @@
9 <template slot="prepend">仓库编号</template> 9 <template slot="prepend">仓库编号</template>
10 </el-input> 10 </el-input>
11 </el-col> 11 </el-col>
12 - <el-col :span="7">  
13 - <el-input v-model="queryInfo.housename" prefix-icon="el-icon-search" size="small" style="width: 280px"  
14 - placeholder="场站编号" clearable>  
15 - <template slot="prepend">仓库名称</template>  
16 - </el-input>  
17 - </el-col> 12 +<!-- <el-col :span="7">-->
  13 +<!-- <el-input v-model="queryInfo.housename" prefix-icon="el-icon-search" size="small" style="width: 280px"-->
  14 +<!-- placeholder="场站编号" clearable>-->
  15 +<!-- <template slot="prepend">仓库名称</template>-->
  16 +<!-- </el-input>-->
  17 +<!-- </el-col>-->
18 <el-col :span="6"> 18 <el-col :span="6">
19 <el-button type="primary" icon="el-icon-search" size="small" @click="getList()"> 19 <el-button type="primary" icon="el-icon-search" size="small" @click="getList()">
20 查询 20 查询
@@ -36,22 +36,22 @@ @@ -36,22 +36,22 @@
36 fixed 36 fixed
37 prop="houseid" 37 prop="houseid"
38 label="仓库编号" 38 label="仓库编号"
39 - width="160"> 39 + width="100">
40 </el-table-column> 40 </el-table-column>
41 <el-table-column 41 <el-table-column
42 prop="housename" 42 prop="housename"
43 label="仓库名称" 43 label="仓库名称"
44 - width="160"> 44 + width="120">
45 </el-table-column> 45 </el-table-column>
46 <el-table-column 46 <el-table-column
47 prop="houseadr" 47 prop="houseadr"
48 label="仓库地址" 48 label="仓库地址"
49 - width="160"> 49 + width="120">
50 </el-table-column> 50 </el-table-column>
51 <el-table-column 51 <el-table-column
52 prop="houseuser" 52 prop="houseuser"
53 label="仓库负责人名称" 53 label="仓库负责人名称"
54 - width="240"> 54 + width="120">
55 </el-table-column> 55 </el-table-column>
56 <el-table-column 56 <el-table-column
57 prop="housetype" 57 prop="housetype"
@@ -61,42 +61,41 @@ @@ -61,42 +61,41 @@
61 <el-table-column 61 <el-table-column
62 prop="ismeta" 62 prop="ismeta"
63 label="是否虚拟仓库" 63 label="是否虚拟仓库"
64 - width="160"> 64 + width="100">
  65 + <template slot-scope="scope">
  66 + <span v-if="scope.row.ismeta ==='0'">否</span>
  67 + <span v-if="scope.row.ismeta ==='1'">是</span>
  68 + </template>
65 </el-table-column> 69 </el-table-column>
66 <el-table-column 70 <el-table-column
67 - fixed  
68 prop="length" 71 prop="length"
69 label="仓库长度" 72 label="仓库长度"
70 - width="160"> 73 + width="80">
71 </el-table-column> 74 </el-table-column>
72 <el-table-column 75 <el-table-column
73 prop="width" 76 prop="width"
74 label="仓库宽度" 77 label="仓库宽度"
75 - width="160"> 78 + width="80">
76 </el-table-column> 79 </el-table-column>
77 <el-table-column 80 <el-table-column
78 prop="height" 81 prop="height"
79 label="仓库高度" 82 label="仓库高度"
80 - width="240"> 83 + width="80">
81 </el-table-column> 84 </el-table-column>
82 <el-table-column 85 <el-table-column
83 prop="area" 86 prop="area"
84 label="仓库面积" 87 label="仓库面积"
85 - width="120"> 88 + width="80">
86 </el-table-column> 89 </el-table-column>
87 <el-table-column 90 <el-table-column
88 prop="vol" 91 prop="vol"
89 label="仓库体积" 92 label="仓库体积"
90 - width="160"> 93 + width="80">
91 </el-table-column> 94 </el-table-column>
92 <el-table-column 95 <el-table-column
93 prop="stationid" 96 prop="stationid"
94 label="场站id" 97 label="场站id"
95 width="80"> 98 width="80">
96 - <template slot-scope="scope">  
97 - <span v-if="scope.row.stationid ==='0'">否</span>  
98 - <span v-if="scope.row.stationid ==='1'">是</span>  
99 - </template>  
100 </el-table-column> 99 </el-table-column>
101 <el-table-column 100 <el-table-column
102 prop="remark" 101 prop="remark"
@@ -105,7 +104,8 @@ @@ -105,7 +104,8 @@
105 </el-table-column> 104 </el-table-column>
106 <el-table-column 105 <el-table-column
107 fixed="right" 106 fixed="right"
108 - label="操作"> 107 + label="操作"
  108 + width="200">
109 <template slot-scope="scope"> 109 <template slot-scope="scope">
110 <el-button type="success" size="mini" @click="applyEdit(scope.row)">编辑</el-button> 110 <el-button type="success" size="mini" @click="applyEdit(scope.row)">编辑</el-button>
111 <el-button type="danger" size="mini" @click="applyDel(scope.$index,scope.row)">删除</el-button> 111 <el-button type="danger" size="mini" @click="applyDel(scope.$index,scope.row)">删除</el-button>
@@ -254,7 +254,6 @@ @@ -254,7 +254,6 @@
254 return { 254 return {
255 queryInfo: { 255 queryInfo: {
256 houseid:'', 256 houseid:'',
257 - housename:'',  
258 // 当前页数 257 // 当前页数
259 pageNum: 1, 258 pageNum: 1,
260 // 每页大小 259 // 每页大小
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
28 > 28 >
29 <el-table-column 29 <el-table-column
30 fixed 30 fixed
31 - prop="waybill" 31 + prop="goodno"
32 label="货物单号" 32 label="货物单号"
33 width="120"> 33 width="120">
34 </el-table-column> 34 </el-table-column>
@@ -93,22 +93,22 @@ @@ -93,22 +93,22 @@
93 </el-table-column> 93 </el-table-column>
94 <el-table-column 94 <el-table-column
95 prop="custel" 95 prop="custel"
96 - label="出入库客户联系电话" 96 + label="客户联系电话"
97 width="140"> 97 width="140">
98 </el-table-column> 98 </el-table-column>
99 <el-table-column 99 <el-table-column
100 prop="customer" 100 prop="customer"
101 - label="出入库客户联系人姓名" 101 + label="联系人姓名"
102 width="80"> 102 width="80">
103 </el-table-column> 103 </el-table-column>
104 <el-table-column 104 <el-table-column
105 prop="customername" 105 prop="customername"
106 - label="出入库客户名称" 106 + label="客户名称"
107 width="80"> 107 width="80">
108 </el-table-column> 108 </el-table-column>
109 <el-table-column 109 <el-table-column
110 prop="goodstype" 110 prop="goodstype"
111 - label="出入库货物类型" 111 + label="货物类型"
112 width="80"> 112 width="80">
113 </el-table-column> 113 </el-table-column>
114 <el-table-column 114 <el-table-column
@@ -138,7 +138,7 @@ @@ -138,7 +138,7 @@
138 <el-table-column 138 <el-table-column
139 fixed="right" 139 fixed="right"
140 label="操作" 140 label="操作"
141 - width="160"> 141 + width="200">
142 <template slot-scope="scope"> 142 <template slot-scope="scope">
143 <el-button type="success" size="mini" @click="applyEdit(scope.row)">编辑</el-button> 143 <el-button type="success" size="mini" @click="applyEdit(scope.row)">编辑</el-button>
144 <el-button type="danger" size="mini" @click="applyDel(scope.$index,scope.row)">删除</el-button> 144 <el-button type="danger" size="mini" @click="applyDel(scope.$index,scope.row)">删除</el-button>
@@ -163,8 +163,8 @@ @@ -163,8 +163,8 @@
163 <el-form :model="addForm" :rules="rules" ref="addForm" style="margin-top: 40px"> 163 <el-form :model="addForm" :rules="rules" ref="addForm" style="margin-top: 40px">
164 <el-row> 164 <el-row>
165 <el-col :span="7"> 165 <el-col :span="7">
166 - <el-form-item label="" :label-width="formLabelWidth" prop="waybill">  
167 - <el-input v-model="addForm.waybill" autocomplete="off" size="small" style="width: 300px"> 166 + <el-form-item label="" :label-width="formLabelWidth" prop="goodno">
  167 + <el-input v-model="addForm.goodno" autocomplete="off" size="small" style="width: 300px">
168 <template slot="prepend">货物单号</template> 168 <template slot="prepend">货物单号</template>
169 </el-input> 169 </el-input>
170 </el-form-item> 170 </el-form-item>
@@ -342,7 +342,7 @@ @@ -342,7 +342,7 @@
342 data() { 342 data() {
343 return { 343 return {
344 queryInfo: { 344 queryInfo: {
345 - waybill:'', 345 + goodno:'',
346 // 当前页数 346 // 当前页数
347 pageNum: 1, 347 pageNum: 1,
348 // 每页大小 348 // 每页大小
@@ -380,7 +380,7 @@ @@ -380,7 +380,7 @@
380 transcar: '', 380 transcar: '',
381 transtype:'', 381 transtype:'',
382 vol:'', 382 vol:'',
383 - waybill:'', 383 + goodno:'',
384 weight:'', 384 weight:'',
385 remark:'', 385 remark:'',
386 remark1:'', 386 remark1:'',
@@ -93,22 +93,22 @@ @@ -93,22 +93,22 @@
93 </el-table-column> 93 </el-table-column>
94 <el-table-column 94 <el-table-column
95 prop="custel" 95 prop="custel"
96 - label="出入库客户联系电话" 96 + label="客户联系电话"
97 width="140"> 97 width="140">
98 </el-table-column> 98 </el-table-column>
99 <el-table-column 99 <el-table-column
100 prop="customer" 100 prop="customer"
101 - label="出入库客户联系人姓名"  
102 - width="80"> 101 + label="联系人姓名"
  102 + width="100">
103 </el-table-column> 103 </el-table-column>
104 <el-table-column 104 <el-table-column
105 prop="customername" 105 prop="customername"
106 - label="出入库客户名称" 106 + label="客户名称"
107 width="80"> 107 width="80">
108 </el-table-column> 108 </el-table-column>
109 <el-table-column 109 <el-table-column
110 prop="goodstype" 110 prop="goodstype"
111 - label="出入库货物类型" 111 + label="货物类型"
112 width="80"> 112 width="80">
113 </el-table-column> 113 </el-table-column>
114 <el-table-column 114 <el-table-column
@@ -118,7 +118,7 @@ @@ -118,7 +118,7 @@
118 </el-table-column> 118 </el-table-column>
119 <el-table-column 119 <el-table-column
120 prop="ietype" 120 prop="ietype"
121 - label="出入库类型" 121 + label="类型"
122 width="60"> 122 width="60">
123 <template slot-scope="scope"> 123 <template slot-scope="scope">
124 <span v-if="scope.row.ietype ==='I'">进</span> 124 <span v-if="scope.row.ietype ==='I'">进</span>
@@ -224,9 +224,17 @@ @@ -224,9 +224,17 @@
224 </el-col> 224 </el-col>
225 <el-col :span="8"> 225 <el-col :span="8">
226 <el-form-item label="" :label-width="formLabelWidth" prop="transtype"> 226 <el-form-item label="" :label-width="formLabelWidth" prop="transtype">
227 - <el-input v-model="addForm.transtype" autocomplete="off" size="small" style="width: 300px">  
228 - <template slot="prepend">交易类型</template>  
229 - </el-input> 227 +<!-- <el-input v-model="addForm.transtype" autocomplete="off" size="small" style="width: 300px">-->
  228 +<!-- <template slot="prepend">交易类型</template>-->
  229 +<!-- </el-input>-->
  230 + <el-select v-model="addForm.transtype" placeholder="请选择交易类型" autocomplete="off" size="small" style="width: 300px">
  231 + <el-option
  232 + v-for="item in options1"
  233 + :key="item.value"
  234 + :label="item.label"
  235 + :value="item.value">
  236 + </el-option>
  237 + </el-select>
230 </el-form-item> 238 </el-form-item>
231 </el-col> 239 </el-col>
232 </el-row> 240 </el-row>
@@ -240,9 +248,17 @@ @@ -240,9 +248,17 @@
240 </el-col> 248 </el-col>
241 <el-col :span="8"> 249 <el-col :span="8">
242 <el-form-item label="" :label-width="formLabelWidth" prop="opttime"> 250 <el-form-item label="" :label-width="formLabelWidth" prop="opttime">
243 - <el-input v-model="addForm.opttime" autocomplete="off" size="small" style="width: 300px">  
244 - <template slot="prepend">出入库时间</template>  
245 - </el-input> 251 +<!-- <el-input v-model="addForm.opttime" autocomplete="off" size="small" style="width: 300px">-->
  252 +<!-- <template slot="prepend">出入库时间</template>-->
  253 +<!-- </el-input>-->
  254 + <el-date-picker
  255 + v-model="addForm.opttime"
  256 + type="datetime" size="mini"
  257 + value-format="yyyy-MM-dd HH:mm:ss"
  258 + format="yyyy-MM-dd HH:mm:ss"
  259 + style="width:300px"
  260 + placeholder="选择出入库时间">
  261 + </el-date-picker>
246 </el-form-item> 262 </el-form-item>
247 </el-col> 263 </el-col>
248 264
@@ -256,9 +272,9 @@ @@ -256,9 +272,9 @@
256 </el-row> 272 </el-row>
257 <el-row> 273 <el-row>
258 <el-col :span="7"> 274 <el-col :span="7">
259 - <el-form-item label="" :label-width="formLabelWidth" prop="goodstype">  
260 - <el-input v-model="addForm.goodstype" autocomplete="off" size="small" style="width: 300px">  
261 - <template slot="prepend">出入库货物类型</template> 275 + <el-form-item label="" :label-width="formLabelWidth" prop="transcar">
  276 + <el-input v-model="addForm.transcar" autocomplete="off" size="small" style="width: 300px">
  277 + <template slot="prepend">运输车辆信息</template>
262 </el-input> 278 </el-input>
263 </el-form-item> 279 </el-form-item>
264 </el-col> 280 </el-col>
@@ -279,10 +295,18 @@ @@ -279,10 +295,18 @@
279 </el-row> 295 </el-row>
280 <el-row> 296 <el-row>
281 <el-col :span="7"> 297 <el-col :span="7">
282 - <el-form-item label="" :label-width="formLabelWidth" prop="transcar">  
283 - <el-input v-model="addForm.transcar" autocomplete="off" size="small" style="width: 300px">  
284 - <template slot="prepend">运输车辆信息</template>  
285 - </el-input> 298 + <el-form-item label="" :label-width="formLabelWidth" prop="goodstype">
  299 + <!-- <el-input v-model="addForm.goodstype" autocomplete="off" size="small" style="width: 300px">-->
  300 + <!-- <template slot="prepend">出入库货物类型</template>-->
  301 + <!-- </el-input>-->
  302 + <el-select v-model="addForm.goodstype" placeholder="请选择出入库货物类型" autocomplete="off" size="small" style="width: 300px">
  303 + <el-option
  304 + v-for="item in options"
  305 + :key="item.value"
  306 + :label="item.label"
  307 + :value="item.value">
  308 + </el-option>
  309 + </el-select>
286 </el-form-item> 310 </el-form-item>
287 </el-col> 311 </el-col>
288 <el-col :span="8"> 312 <el-col :span="8">
@@ -389,6 +413,26 @@ @@ -389,6 +413,26 @@
389 remark4:'', 413 remark4:'',
390 remark5:'', 414 remark5:'',
391 }, 415 },
  416 + options: [{
  417 + value: '板箱',
  418 + label: '货物类型-板箱'
  419 + }, {
  420 + value: '运单',
  421 + label: '货物类型-运单'
  422 + }, {
  423 + value: '托盘',
  424 + label: '货物类型-托盘'
  425 + }],
  426 + options1: [{
  427 + value: '采购入库',
  428 + label: '交易类型-采购入库'
  429 + }, {
  430 + value: '生产入库',
  431 + label: '交易类型-生产入库'
  432 + }, {
  433 + value: '销售入库',
  434 + label: '交易类型-销售入库'
  435 + }],
392 formLabelWidth: '80px', 436 formLabelWidth: '80px',
393 rules: { 437 rules: {
394 userName: [ 438 userName: [
@@ -30,47 +30,47 @@ @@ -30,47 +30,47 @@
30 fixed 30 fixed
31 prop="locationno" 31 prop="locationno"
32 label="库位编号" 32 label="库位编号"
33 - width="160"> 33 + width="140">
34 </el-table-column> 34 </el-table-column>
35 <el-table-column 35 <el-table-column
36 prop="locationname" 36 prop="locationname"
37 label="库位名称" 37 label="库位名称"
38 - width="160"> 38 + width="140">
39 </el-table-column> 39 </el-table-column>
40 <el-table-column 40 <el-table-column
41 prop="areaid" 41 prop="areaid"
42 label="所属库区" 42 label="所属库区"
43 - width="160"> 43 + width="140">
44 </el-table-column> 44 </el-table-column>
45 <el-table-column 45 <el-table-column
46 prop="length" 46 prop="length"
47 label="库位长度" 47 label="库位长度"
48 - width="240"> 48 + width="80">
49 </el-table-column> 49 </el-table-column>
50 <el-table-column 50 <el-table-column
51 prop="width" 51 prop="width"
52 label="库位宽度" 52 label="库位宽度"
53 - width="120"> 53 + width="80">
54 </el-table-column> 54 </el-table-column>
55 <el-table-column 55 <el-table-column
56 prop="heigth" 56 prop="heigth"
57 label="库位高度" 57 label="库位高度"
58 - width="160"> 58 + width="80">
59 </el-table-column> 59 </el-table-column>
60 <el-table-column 60 <el-table-column
61 prop="area" 61 prop="area"
62 label="库位面积" 62 label="库位面积"
63 - width="160"> 63 + width="80">
64 </el-table-column> 64 </el-table-column>
65 <el-table-column 65 <el-table-column
66 prop="vol" 66 prop="vol"
67 label="库位体积" 67 label="库位体积"
68 - width="160"> 68 + width="80">
69 </el-table-column> 69 </el-table-column>
70 <el-table-column 70 <el-table-column
71 prop="xyz" 71 prop="xyz"
72 label="库位xyz" 72 label="库位xyz"
73 - width="240"> 73 + width="80">
74 </el-table-column> 74 </el-table-column>
75 <el-table-column 75 <el-table-column
76 prop="autodist" 76 prop="autodist"
@@ -79,7 +79,8 @@ @@ -79,7 +79,8 @@
79 </el-table-column> 79 </el-table-column>
80 <el-table-column 80 <el-table-column
81 fixed="right" 81 fixed="right"
82 - label="操作"> 82 + label="操作"
  83 + width="200">
83 <template slot-scope="scope"> 84 <template slot-scope="scope">
84 <el-button type="success" size="mini" @click="applyEdit(scope.row)">编辑</el-button> 85 <el-button type="success" size="mini" @click="applyEdit(scope.row)">编辑</el-button>
85 <el-button type="danger" size="mini" @click="applyDel(scope.$index,scope.row)">删除</el-button> 86 <el-button type="danger" size="mini" @click="applyDel(scope.$index,scope.row)">删除</el-button>
@@ -105,7 +105,7 @@ @@ -105,7 +105,7 @@
105 <el-col :span="9"> 105 <el-col :span="9">
106 <el-form-item label="" :label-width="formLabelWidth" prop="stationadr"> 106 <el-form-item label="" :label-width="formLabelWidth" prop="stationadr">
107 <el-input v-model="addForm.stationadr" autocomplete="off" size="small" style="width: 260px"> 107 <el-input v-model="addForm.stationadr" autocomplete="off" size="small" style="width: 260px">
108 - <template slot="prepend">场站名称</template> 108 + <template slot="prepend">场站地址</template>
109 </el-input> 109 </el-input>
110 </el-form-item> 110 </el-form-item>
111 </el-col> 111 </el-col>