朱兆平 / vue_cli · 提交

转到一个项目

作者 朱兆平
提交 c335cfec2f77b101ed1f18f22c07db420bb1ea46 2 个父辈 1a15d833 694e8f1e

Merge remote-tracking branch 'origin/master'

内嵌 并排对比
正在显示 5 个修改的文件 包含 120 行增加 和 15 行删除
@@ -39,6 +39,8 @@ export const selectByHouseid = params => { return axios.get(`${baseUrl1}/selectB @@ -39,6 +39,8 @@ export const selectByHouseid = params => { return axios.get(`${baseUrl1}/selectB
39 //库存管理 39 //库存管理
40 export const selectNewInventroys = params => { return axios.get(`${baseUrl2}/selectNewInventroys`, { params: params }); }; 40 export const selectNewInventroys = params => { return axios.get(`${baseUrl2}/selectNewInventroys`, { params: params }); };
41 41
  42 +export const selectBylocationno = params => { return axios.get(`${baseUrl2}/selectBylocationno`, { params: params }); };
  43 +
42 export const delInventoryrecord = params => { return axios.get(`${baseUrl2}/delInventoryrecord`, { params: params }); }; 44 export const delInventoryrecord = params => { return axios.get(`${baseUrl2}/delInventoryrecord`, { params: params }); };
43 45
44 export const addInventoryrecord = params => { return http.post(`${baseUrl2}/addInventoryrecord`,params)}; 46 export const addInventoryrecord = params => { return http.post(`${baseUrl2}/addInventoryrecord`,params)};
@@ -31,6 +31,7 @@ @@ -31,6 +31,7 @@
31 :cell-style="{textAlign:'center'}" 31 :cell-style="{textAlign:'center'}"
32 style="border-radius: 10px 10px 0px 0px;line-height: 25px" 32 style="border-radius: 10px 10px 0px 0px;line-height: 25px"
33 :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small" 33 :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small"
  34 + @row-dblclick="tableRowClick"
34 > 35 >
35 <el-table-column 36 <el-table-column
36 fixed 37 fixed
@@ -305,6 +306,12 @@ @@ -305,6 +306,12 @@
305 </el-dialog> 306 </el-dialog>
306 </el-row> 307 </el-row>
307 </el-card> 308 </el-card>
  309 + <el-dialog title="库位" :visible.sync="dialogVisible" fullscreen >
  310 + <LOCATIONS :parent-area-id="selectedAreaId" />
  311 + <span slot="footer" class="dialog-footer">
  312 + <el-button type="info" @click="dialogVisible = false">关 闭</el-button>
  313 + </span>
  314 + </el-dialog>
308 </el-row> 315 </el-row>
309 </template> 316 </template>
310 317
@@ -317,16 +324,18 @@ @@ -317,16 +324,18 @@
317 selectByHouseid 324 selectByHouseid
318 } from '../../api/consigner/station'; 325 } from '../../api/consigner/station';
319 import jsutil from "@/common/js/util"; 326 import jsutil from "@/common/js/util";
  327 + import LOCATIONS from "./locations"
320 328
321 export default { 329 export default {
322 // name: "area", 330 // name: "area",
323 props:['parentHouseId'], 331 props:['parentHouseId'],
  332 + components:{LOCATIONS},
324 data() { 333 data() {
325 return { 334 return {
326 queryInfo: { 335 queryInfo: {
327 houseid:'', 336 houseid:'',
328 areano:'', 337 areano:'',
329 - areaName:'', 338 + // areaName:'',
330 // 当前页数 339 // 当前页数
331 pageNum: 1, 340 pageNum: 1,
332 // 每页大小 341 // 每页大小
@@ -392,6 +401,8 @@ @@ -392,6 +401,8 @@
392 // ], 401 // ],
393 ], 402 ],
394 }, 403 },
  404 + dialogVisible:false,
  405 + selectedAreaId:""
395 } 406 }
396 }, 407 },
397 methods: { 408 methods: {
@@ -422,7 +433,8 @@ @@ -422,7 +433,8 @@
422 }, 433 },
423 getList() { 434 getList() {
424 const _this = this 435 const _this = this
425 - selectAreas(this.queryInfo).then((response) => { 436 + selectAreas(_this.queryInfo).then((response) => {
  437 + console.log("查询参数：",this.queryInfo)
426 const res = response.data 438 const res = response.data
427 if (res.code !== '200') { 439 if (res.code !== '200') {
428 return _this.$message.error('获取消息收发记录，失败！') 440 return _this.$message.error('获取消息收发记录，失败！')
@@ -538,6 +550,12 @@ @@ -538,6 +550,12 @@
538 }).catch(() => { 550 }).catch(() => {
539 }) 551 })
540 }, 552 },
  553 + //行点击事件
  554 + tableRowClick(row, column, event) {
  555 + this.dialogVisible = true
  556 + this.selectedAreaId = row.areano
  557 + // console.log(row+column,event);
  558 + }
541 }, 559 },
542 mounted() { 560 mounted() {
543 if (jsutil.checkNull(this.parentHouseId)){ 561 if (jsutil.checkNull(this.parentHouseId)){
@@ -356,13 +356,13 @@ @@ -356,13 +356,13 @@
356 selectByStationno(params).then(res =>{ 356 selectByStationno(params).then(res =>{
357 if (res !== '') { 357 if (res !== '') {
358 setTimeout(() => { 358 setTimeout(() => {
359 - this.loading = false;  
360 this.stationids=res.data.data; 359 this.stationids=res.data.data;
361 }, 200); 360 }, 200);
362 } else { 361 } else {
363 this.stationids = []; 362 this.stationids = [];
364 } 363 }
365 - 364 + }).finally(() =>{
  365 + this.loading = false;
366 }); 366 });
367 }, 367 },
368 handleSizeChange(val) { 368 handleSizeChange(val) {
@@ -3,13 +3,25 @@ @@ -3,13 +3,25 @@
3 <el-card style="background-color: #F5F7FA"> 3 <el-card style="background-color: #F5F7FA">
4 <!-- 搜索区域--> 4 <!-- 搜索区域-->
5 <el-row :gutter="10" class="toolbar"> 5 <el-row :gutter="10" class="toolbar">
6 - <el-col :span="7"> 6 + <el-col :span="6">
7 <el-input v-model="queryInfo.waybill" prefix-icon="el-icon-search" size="small" style="width: 280px" 7 <el-input v-model="queryInfo.waybill" prefix-icon="el-icon-search" size="small" style="width: 280px"
8 placeholder="货物单号" clearable> 8 placeholder="货物单号" clearable>
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="6"> 12 <el-col :span="6">
  13 + <el-input v-model="queryInfo.billfhl" 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">
  19 + <el-input v-model="queryInfo.locationno" prefix-icon="el-icon-search" size="small" style="width: 280px"
  20 + placeholder="货物单号" clearable>
  21 + <template slot="prepend">库位编号</template>
  22 + </el-input>
  23 + </el-col>
  24 + <el-col :span="5">
13 <el-button type="primary" icon="el-icon-search" size="small" @click="getList()"> 25 <el-button type="primary" icon="el-icon-search" size="small" @click="getList()">
14 查询 26 查询
15 </el-button> 27 </el-button>
@@ -275,14 +287,23 @@ @@ -275,14 +287,23 @@
275 </template> 287 </template>
276 288
277 <script> 289 <script>
278 - import {selectNewInventroys,delInventroy,addInventory,ediInventroy} from '../../api/consigner/station'; 290 + import {
  291 + selectNewInventroys,
  292 + delInventroy,
  293 + addInventory,
  294 + ediInventroy, selectBylocationno,
  295 + } from '../../api/consigner/station';
  296 + import jsutil from "@/common/js/util";
279 297
280 export default { 298 export default {
281 - name: "inventroy", 299 + //name: "inventroy",
  300 + props:['parentLoId'],
282 data() { 301 data() {
283 return { 302 return {
284 queryInfo: { 303 queryInfo: {
285 - goodno:'', 304 + waybill:'',
  305 + billfhl:'',
  306 + locationno:'',
286 // 当前页数 307 // 当前页数
287 pageNum: 1, 308 pageNum: 1,
288 // 每页大小 309 // 每页大小
@@ -310,7 +331,7 @@ @@ -310,7 +331,7 @@
310 goodstype: '', 331 goodstype: '',
311 house:'', 332 house:'',
312 ietype:'', 333 ietype:'',
313 - location:'', 334 + locationno:'',
314 opter:'', 335 opter:'',
315 opttime: '', 336 opttime: '',
316 pcs: '', 337 pcs: '',
@@ -352,6 +373,22 @@ @@ -352,6 +373,22 @@
352 } 373 }
353 }, 374 },
354 methods: { 375 methods: {
  376 + //获取所属库位
  377 + // getLo:function(query){
  378 + // this.locationnos=[];
  379 + // this.loading = true;
  380 + // selectBylocationno({locationno:query}).then(res =>{
  381 + // if (res !== '') {
  382 + // setTimeout(() => {
  383 + // this.locationnos=res.data.data;
  384 + // }, 200);
  385 + // } else {
  386 + // this.locationnos = [];
  387 + // }
  388 + // }).finally(() =>{
  389 + // this.loading = false;
  390 + // });
  391 + // },
355 handleSizeChange(val) { 392 handleSizeChange(val) {
356 this.queryInfo.pageSize = val 393 this.queryInfo.pageSize = val
357 this.getList() 394 this.getList()
@@ -485,9 +522,20 @@ @@ -485,9 +522,20 @@
485 }, 522 },
486 }, 523 },
487 mounted() { 524 mounted() {
  525 + if (jsutil.checkNull(this.parentLoId)){
  526 + this.queryInfo.locationno = this.parentLoId;
  527 + }
488 this.getList(); 528 this.getList();
489 // this.getYardList(); 529 // this.getYardList();
490 530
  531 + },
  532 + watch: {
  533 + parentLoId(value) {
  534 + if (jsutil.checkNull(this.parentLoId)){
  535 + this.queryInfo.locationno = this.parentLoId;
  536 + }
  537 + this.getList();
  538 + }
491 } 539 }
492 540
493 } 541 }
@@ -9,6 +9,12 @@ @@ -9,6 +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.areaid" 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="6"> 18 <el-col :span="6">
13 <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()">
14 查询 20 查询
@@ -25,6 +31,7 @@ @@ -25,6 +31,7 @@
25 :cell-style="{textAlign:'center'}" 31 :cell-style="{textAlign:'center'}"
26 style="border-radius: 10px 10px 0px 0px;line-height: 25px" 32 style="border-radius: 10px 10px 0px 0px;line-height: 25px"
27 :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small" 33 :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small"
  34 + @row-dblclick="tableRowClick"
28 > 35 >
29 <el-table-column 36 <el-table-column
30 fixed 37 fixed
@@ -223,6 +230,12 @@ @@ -223,6 +230,12 @@
223 </el-dialog> 230 </el-dialog>
224 </el-row> 231 </el-row>
225 </el-card> 232 </el-card>
  233 + <el-dialog title="库存" :visible.sync="dialogVisible" fullscreen >
  234 + <INVENTROY :parent-locations-id="selectedLoId" />
  235 + <span slot="footer" class="dialog-footer">
  236 + <el-button type="info" @click="dialogVisible = false">关 闭</el-button>
  237 + </span>
  238 + </el-dialog>
226 </el-row> 239 </el-row>
227 </template> 240 </template>
228 241
@@ -234,14 +247,19 @@ @@ -234,14 +247,19 @@
234 ediLocation, 247 ediLocation,
235 selectByAreaid 248 selectByAreaid
236 } from '../../api/consigner/station'; 249 } from '../../api/consigner/station';
  250 + import jsutil from "@/common/js/util";
  251 + import INVENTROY from "./inventroy"
237 252
238 export default { 253 export default {
239 - name: "locations", 254 + // name: "locations",
  255 + props:['parentAreaId'],
  256 + components:{INVENTROY},
240 data() { 257 data() {
241 return { 258 return {
242 queryInfo: { 259 queryInfo: {
243 locationno:'', 260 locationno:'',
244 housename:'', 261 housename:'',
  262 + areaid:'',
245 // 当前页数 263 // 当前页数
246 pageNum: 1, 264 pageNum: 1,
247 // 每页大小 265 // 每页大小
@@ -301,6 +319,8 @@ @@ -301,6 +319,8 @@
301 // ], { required: true, message: '请选择申请状态', trigger: 'change' } 319 // ], { required: true, message: '请选择申请状态', trigger: 'change' }
302 ], 320 ],
303 }, 321 },
  322 + dialogVisible:false,
  323 + selectedLoId:''
304 } 324 }
305 }, 325 },
306 methods: { 326 methods: {
@@ -308,16 +328,16 @@ @@ -308,16 +328,16 @@
308 getArea:function(query){ 328 getArea:function(query){
309 this.areaids=[]; 329 this.areaids=[];
310 this.loading = true; 330 this.loading = true;
311 - selectByAreaid({areano:query}).then(res =>{ 331 + selectByAreaid({areaid:query}).then(res =>{
312 if (res !== '') { 332 if (res !== '') {
313 setTimeout(() => { 333 setTimeout(() => {
314 - this.loading = false;  
315 this.areaids=res.data.data; 334 this.areaids=res.data.data;
316 }, 200); 335 }, 200);
317 } else { 336 } else {
318 this.areaids = []; 337 this.areaids = [];
319 } 338 }
320 - 339 + }).finally(() =>{
  340 + this.loading = false;
321 }); 341 });
322 }, 342 },
323 handleSizeChange(val) { 343 handleSizeChange(val) {
@@ -332,7 +352,7 @@ @@ -332,7 +352,7 @@
332 const _this = this 352 const _this = this
333 selectLocations(this.queryInfo).then((response) => { 353 selectLocations(this.queryInfo).then((response) => {
334 const res = response.data 354 const res = response.data
335 - console.log(response.data) 355 + // console.log(response.data)
336 if (res.code !== '200') { 356 if (res.code !== '200') {
337 return _this.$message.error('获取消息收发记录，失败！') 357 return _this.$message.error('获取消息收发记录，失败！')
338 } 358 }
@@ -441,11 +461,28 @@ @@ -441,11 +461,28 @@
441 }).catch(() => { 461 }).catch(() => {
442 }) 462 })
443 }, 463 },
  464 + //行点击事件
  465 + tableRowClick(row, column, event) {
  466 + this.dialogVisible = true
  467 + this.selectedLoId = row.locationno
  468 + // console.log(row+column,event);
  469 + }
444 }, 470 },
445 mounted() { 471 mounted() {
  472 + if (jsutil.checkNull(this.parentAreaId)){
  473 + this.queryInfo.areaid = this.parentAreaId;
  474 + }
446 this.getList(); 475 this.getList();
447 // this.getYardList(); 476 // this.getYardList();
448 477
  478 + },
  479 + watch: {
  480 + parentHouseId(value) {
  481 + if (jsutil.checkNull(this.parentAreaId)){
  482 + this.queryInfo.areaid = this.parentAreaId;
  483 + }
  484 + this.getList();
  485 + }
449 } 486 }
450 487
451 } 488 }