朱兆平 / 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
//库存管理
export const selectNewInventroys = params => { return axios.get(`${baseUrl2}/selectNewInventroys`, { params: params }); };
export const selectBylocationno = params => { return axios.get(`${baseUrl2}/selectBylocationno`, { params: params }); };
export const delInventoryrecord = params => { return axios.get(`${baseUrl2}/delInventoryrecord`, { params: params }); };
export const addInventoryrecord = params => { return http.post(`${baseUrl2}/addInventoryrecord`,params)};
... ...
... ... @@ -31,6 +31,7 @@
:cell-style="{textAlign:'center'}"
style="border-radius: 10px 10px 0px 0px;line-height: 25px"
:header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small"
@row-dblclick="tableRowClick"
>
<el-table-column
fixed
... ... @@ -305,6 +306,12 @@
</el-dialog>
</el-row>
</el-card>
<el-dialog title="库位" :visible.sync="dialogVisible" fullscreen >
<LOCATIONS :parent-area-id="selectedAreaId" />
<span slot="footer" class="dialog-footer">
<el-button type="info" @click="dialogVisible = false">关 闭</el-button>
</span>
</el-dialog>
</el-row>
</template>
... ... @@ -317,16 +324,18 @@
selectByHouseid
} from '../../api/consigner/station';
import jsutil from "@/common/js/util";
import LOCATIONS from "./locations"
export default {
// name: "area",
props:['parentHouseId'],
components:{LOCATIONS},
data() {
return {
queryInfo: {
houseid:'',
areano:'',
areaName:'',
// areaName:'',
// 当前页数
pageNum: 1,
// 每页大小
... ... @@ -392,6 +401,8 @@
// ],
],
},
dialogVisible:false,
selectedAreaId:""
}
},
methods: {
... ... @@ -422,7 +433,8 @@
},
getList() {
const _this = this
selectAreas(this.queryInfo).then((response) => {
selectAreas(_this.queryInfo).then((response) => {
console.log("查询参数：",this.queryInfo)
const res = response.data
if (res.code !== '200') {
return _this.$message.error('获取消息收发记录，失败！')
... ... @@ -538,6 +550,12 @@
}).catch(() => {
})
},
//行点击事件
tableRowClick(row, column, event) {
this.dialogVisible = true
this.selectedAreaId = row.areano
// console.log(row+column,event);
}
},
mounted() {
if (jsutil.checkNull(this.parentHouseId)){
... ...
... ... @@ -356,13 +356,13 @@
selectByStationno(params).then(res =>{
if (res !== '') {
setTimeout(() => {
this.loading = false;
this.stationids=res.data.data;
}, 200);
} else {
this.stationids = [];
}
}).finally(() =>{
this.loading = false;
});
},
handleSizeChange(val) {
... ...
... ... @@ -3,13 +3,25 @@
<el-card style="background-color: #F5F7FA">
<!-- 搜索区域-->
<el-row :gutter="10" class="toolbar">
<el-col :span="7">
<el-col :span="6">
<el-input v-model="queryInfo.waybill" prefix-icon="el-icon-search" size="small" style="width: 280px"
placeholder="货物单号" clearable>
<template slot="prepend">货物单号</template>
<template slot="prepend">主单号</template>
</el-input>
</el-col>
<el-col :span="6">
<el-input v-model="queryInfo.billfhl" prefix-icon="el-icon-search" size="small" style="width: 280px"
placeholder="货物单号" clearable>
<template slot="prepend">分单号</template>
</el-input>
</el-col>
<el-col :span="6">
<el-input v-model="queryInfo.locationno" prefix-icon="el-icon-search" size="small" style="width: 280px"
placeholder="货物单号" clearable>
<template slot="prepend">库位编号</template>
</el-input>
</el-col>
<el-col :span="5">
<el-button type="primary" icon="el-icon-search" size="small" @click="getList()">
查询
</el-button>
... ... @@ -275,14 +287,23 @@
</template>
<script>
import {selectNewInventroys,delInventroy,addInventory,ediInventroy} from '../../api/consigner/station';
import {
selectNewInventroys,
delInventroy,
addInventory,
ediInventroy, selectBylocationno,
} from '../../api/consigner/station';
import jsutil from "@/common/js/util";
export default {
name: "inventroy",
//name: "inventroy",
props:['parentLoId'],
data() {
return {
queryInfo: {
goodno:'',
waybill:'',
billfhl:'',
locationno:'',
// 当前页数
pageNum: 1,
// 每页大小
... ... @@ -310,7 +331,7 @@
goodstype: '',
house:'',
ietype:'',
location:'',
locationno:'',
opter:'',
opttime: '',
pcs: '',
... ... @@ -352,6 +373,22 @@
}
},
methods: {
//获取所属库位
// getLo:function(query){
// this.locationnos=[];
// this.loading = true;
// selectBylocationno({locationno:query}).then(res =>{
// if (res !== '') {
// setTimeout(() => {
// this.locationnos=res.data.data;
// }, 200);
// } else {
// this.locationnos = [];
// }
// }).finally(() =>{
// this.loading = false;
// });
// },
handleSizeChange(val) {
this.queryInfo.pageSize = val
this.getList()
... ... @@ -485,9 +522,20 @@
},
},
mounted() {
if (jsutil.checkNull(this.parentLoId)){
this.queryInfo.locationno = this.parentLoId;
}
this.getList();
// this.getYardList();
},
watch: {
parentLoId(value) {
if (jsutil.checkNull(this.parentLoId)){
this.queryInfo.locationno = this.parentLoId;
}
this.getList();
}
}
}
... ...
... ... @@ -9,6 +9,12 @@
<template slot="prepend">库位编号</template>
</el-input>
</el-col>
<el-col :span="7">
<el-input v-model="queryInfo.areaid" prefix-icon="el-icon-search" size="small" style="width: 280px"
placeholder="库位编号" clearable>
<template slot="prepend">库区编号</template>
</el-input>
</el-col>
<el-col :span="6">
<el-button type="primary" icon="el-icon-search" size="small" @click="getList()">
查询
... ... @@ -25,6 +31,7 @@
:cell-style="{textAlign:'center'}"
style="border-radius: 10px 10px 0px 0px;line-height: 25px"
:header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small"
@row-dblclick="tableRowClick"
>
<el-table-column
fixed
... ... @@ -223,6 +230,12 @@
</el-dialog>
</el-row>
</el-card>
<el-dialog title="库存" :visible.sync="dialogVisible" fullscreen >
<INVENTROY :parent-locations-id="selectedLoId" />
<span slot="footer" class="dialog-footer">
<el-button type="info" @click="dialogVisible = false">关 闭</el-button>
</span>
</el-dialog>
</el-row>
</template>
... ... @@ -234,14 +247,19 @@
ediLocation,
selectByAreaid
} from '../../api/consigner/station';
import jsutil from "@/common/js/util";
import INVENTROY from "./inventroy"
export default {
name: "locations",
// name: "locations",
props:['parentAreaId'],
components:{INVENTROY},
data() {
return {
queryInfo: {
locationno:'',
housename:'',
areaid:'',
// 当前页数
pageNum: 1,
// 每页大小
... ... @@ -301,6 +319,8 @@
// ], { required: true, message: '请选择申请状态', trigger: 'change' }
],
},
dialogVisible:false,
selectedLoId:''
}
},
methods: {
... ... @@ -308,16 +328,16 @@
getArea:function(query){
this.areaids=[];
this.loading = true;
selectByAreaid({areano:query}).then(res =>{
selectByAreaid({areaid:query}).then(res =>{
if (res !== '') {
setTimeout(() => {
this.loading = false;
this.areaids=res.data.data;
}, 200);
} else {
this.areaids = [];
}
}).finally(() =>{
this.loading = false;
});
},
handleSizeChange(val) {
... ... @@ -332,7 +352,7 @@
const _this = this
selectLocations(this.queryInfo).then((response) => {
const res = response.data
console.log(response.data)
// console.log(response.data)
if (res.code !== '200') {
return _this.$message.error('获取消息收发记录，失败！')
}
... ... @@ -441,11 +461,28 @@
}).catch(() => {
})
},
//行点击事件
tableRowClick(row, column, event) {
this.dialogVisible = true
this.selectedLoId = row.locationno
// console.log(row+column,event);
}
},
mounted() {
if (jsutil.checkNull(this.parentAreaId)){
this.queryInfo.areaid = this.parentAreaId;
}
this.getList();
// this.getYardList();
},
watch: {
parentHouseId(value) {
if (jsutil.checkNull(this.parentAreaId)){
this.queryInfo.areaid = this.parentAreaId;
}
this.getList();
}
}
}
... ...