朱兆平 / vue_cli · 提交

转到一个项目

作者 小范
提交 526332427d3362ff1d80c01ce9faf1f34a22ea12 1 个父辈 eface364

库存管理界面新增更改主单号和查货物明细功能

内嵌 并排对比
正在显示 2 个修改的文件 包含 319 行增加 和 5 行删除
... ... @@ -11,6 +11,10 @@ let baseUrl5 = 'wms-server-warehouse/wms/area'
let baseUrl6 = 'wms-server-warehouse/wms/newbasesphcode'
//查询货物明细
export const selectBywaybillandFhl = params => { return axios.get(`${baseServiceURL}/awbinfo/selectBywaybillandFhl`, { params: params }); };
//查询出入库记录
export const selectNewInventroyrecords = params => { return axios.get(`${baseServiceURL}/newinventroyrecord/selectNewInventroyrecords`, { params: params }); };
//场站管理
export const selectStations = params => { return axios.get(`${baseUrl}/selectStations`, { params: params }); };
... ... @@ -44,6 +48,11 @@ export const selectBylocationno = params => { return axios.get(`${baseUrl2}/sele
export const delInventoryrecord = params => { return axios.get(`${baseUrl2}/delInventoryrecord`, { params: params }); };
export const addInventoryrecord = params => { return http.post(`${baseUrl2}/addInventoryrecord`,params)};
//更改分单号
export const ediNewInventroyByfhl = params => { return http.post(`${baseUrl2}/ediNewInventroyByfhl`,params)};
//更改主单号
export const ediNewInventroyBywaybill = params => { return http.post(`${baseUrl2}/ediNewInventroyBywaybill`,params)};
//批量入库
export const batchImpNewinventroyrecord = params => { return http.post(`${baseServiceURL}/newinventroyrecord/batchImpNewinventroyrecord`,params)};
... ...
... ... @@ -25,6 +25,9 @@
<el-button type="primary" icon="el-icon-search" size="small" @click="getList()">
查询
</el-button>
<el-button type="success" size="small" @click="changeFwb()" :disabled="this.sels.length===0">
更改主单号
</el-button>
<!-- <el-button type="success" icon="el-icon-edit" size="small" @click="applyAdd()">新增</el-button>-->
</el-col>
</el-row>
... ... @@ -34,16 +37,18 @@
<el-table
:data="tableData"
border
@selection-change="selsChange"
:cell-style="{textAlign:'center'}"
style="border-radius: 10px 10px 0px 0px;line-height: 25px"
:header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small"
>
<el-table-column type="selection" width="55" align="center"></el-table-column>
<el-table-column
fixed
label="操作"
width="160">
<template slot-scope="scope">
<el-button type="primary" size="mini">查看货物明细</el-button>
<el-button type="primary" size="mini" @click="queryDeta(scope.row)">查看货物明细</el-button>
</template>
</el-table-column>
<el-table-column
... ... @@ -90,7 +95,7 @@
label="操作"
width="200">
<template slot-scope="scope">
<el-button type="success" size="mini">更改主单</el-button>
<el-button type="warning" size="mini" @click="changeFhl(scope.row)">更改分单号</el-button>
<!-- <el-button type="success" size="mini" @click="applyEdit(scope.row)">编辑</el-button>-->
<!-- <el-button type="danger" size="mini" @click="applyDel(scope.$index,scope.row)">删除</el-button>-->
</template>
... ... @@ -109,6 +114,47 @@
:total="total">
</el-pagination>
</el-row>
<!-- 更改分单号-->
<el-row>
<el-dialog :title="detaFhl" :visible.sync="fhlDialog" width="40%" >
<el-form :model="fhlForm" :rules="fhlRules" ref="fhlForm" style="margin-top: 40px">
<el-row>
<el-col :span="8">
<el-form-item label="" :label-width="formLabelWidth" prop="billfhl">
<el-input placeholder="请输入更改后的分单号" v-model="fhlForm.billfhl" autocomplete="off" size="small" style="width: 400px">
<template slot="prepend">更改分单号为：</template>
</el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="fhlDialog = false" size="small">取 消</el-button>
<el-button type="primary" @click="fhlEdit()" size="small">提 交</el-button>
</div>
</el-dialog>
</el-row>
<!-- 更改主单号-->
<el-row>
<el-dialog :title="detaFwb" :visible.sync="fwbDialog" width="40%" >
<el-form :model="fwbForm" :rules="fwbRules" ref="fwbForm" style="margin-top: 40px">
<el-row>
<el-col :span="8">
<el-form-item label="" :label-width="formLabelWidth" prop="waybill">
<el-input placeholder="请输入更改后的主单号" v-model="fwbForm.waybill" autocomplete="off" size="small" style="width: 400px">
<template slot="prepend">更改主单号为：</template>
</el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="fwbDialog = false" size="small">取 消</el-button>
<el-button type="primary" @click="fwbEdit()" size="small">提 交</el-button>
</div>
</el-dialog>
</el-row>
<!-- 新增和编辑-->
<el-row>
<el-dialog :title="dialogMap[dialogApply]" :visible.sync="apply_dialog.addDialog" width="80%" >
<el-form :model="addForm" :rules="rules" ref="addForm" style="margin-top: 40px">
... ... @@ -282,6 +328,82 @@
</div>
</el-dialog>
</el-row>
<!-- //查看货物明细-->
<el-row>
<el-dialog :title="detaMap" :visible.sync="detaDialog" width="70%" >
<el-form :model="detaForm" :rules="detaRules" ref="detaForm" style="margin-top: 40px;padding-bottom: 30px">
<el-row>
<el-col :span="7">
<el-form-item label="" :label-width="formLabelWidth" prop="dest4">
<el-input disabled v-model="detaForm.dest4" autocomplete="off" size="small" style="width: 300px">
<template slot="prepend">代理人名称</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="" :label-width="formLabelWidth" prop="dest4city">
<el-input disabled v-model="detaForm.dest4city" autocomplete="off" size="small" style="width: 300px">
<template slot="prepend">代理人代码</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="" :label-width="formLabelWidth" prop="optime">
<el-input disabled v-model="detaForm.optime" autocomplete="off" size="small" style="width: 300px">
<template slot="prepend">入库时间</template>
</el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="7">
<el-form-item label="" :label-width="formLabelWidth" prop="pcs">
<el-input disabled v-model="detaForm.pcs" autocomplete="off" size="small" style="width: 300px">
<template slot="prepend">件&emsp;&emsp;&emsp;数</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="" :label-width="formLabelWidth" prop="weight">
<el-input disabled v-model="detaForm.weight" autocomplete="off" size="small" style="width: 300px">
<template slot="prepend">重&emsp;&emsp;&emsp;量</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="" :label-width="formLabelWidth" prop="feewt">
<el-input disabled v-model="detaForm.feewt" autocomplete="off" size="small" style="width: 300px">
<template slot="prepend">计费重量</template>
</el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="7">
<el-form-item label="" :label-width="formLabelWidth" prop="pack">
<el-input disabled v-model="detaForm.pack" autocomplete="off" size="small" style="width: 300px">
<template slot="prepend">包&emsp;&emsp;&emsp;装</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="" :label-width="formLabelWidth" prop="meas">
<el-input disabled v-model="detaForm.meas" autocomplete="off" size="small" style="width: 300px">
<template slot="prepend">尺&emsp;&emsp;&emsp;寸</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="" :label-width="formLabelWidth" prop="area">
<el-input disabled v-model="detaForm.vol" autocomplete="off" size="small" style="width: 300px">
<template slot="prepend">体&emsp;&emsp;积</template>
</el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-dialog>
</el-row>
</el-card>
</el-row>
</template>
... ... @@ -291,9 +413,10 @@
selectNewInventroys,
delInventroy,
addInventory,
ediInventroy, selectBylocationno,
ediInventroy, selectBylocationno,selectBywaybillandFhl,ediNewInventroyByfhl,ediNewInventroyBywaybill,
} from '../../api/consigner/station';
import jsutil from "@/common/js/util";
import {loginedUserInfo} from "../../api/user";
export default {
//name: "inventroy",
... ... @@ -311,6 +434,7 @@
},
total: 0,
tableData:[],
//新增编辑
dialogMap: {
update: '编辑',
create: '新增'
... ... @@ -349,8 +473,9 @@
remark3:'',
remark4:'',
remark5:'',
newwaybill:'',
newfhl:''
},
formLabelWidth: '80px',
rules: {
userName: [
// { required: true, message: '请输入申请人', trigger: 'blur' },
... ... @@ -370,6 +495,103 @@
// ],
],
},
//货物明细
detaDialog: false,
detaMap:'货物明细',
detaForm:{
dest4: '',
dest4city: '',
optime:'',
pcs: '',
weight: '',
feewt: '',
vol:'',
pack: '',
meas:'',
billid: '',
stocktypeid: '',
stockpre:'',
stockno: '',
productid: '',
carrierproductid: '',
delflag:'',
previousbillid: '',
domint:'',
customctl: '',
specopeid: '',
specopeidext:'',
sairportid: '',
scityid: '',
eairportid: '',
ecityid:'',
by1: '',
dest1:'',
dest1city: '',
by2: '',
dest2:'',
dest2city: '',
by3: '',
dest3: '',
dest3city:'',
by4: '',
cargono:'',
cargonm: '',
ctrlopedepartment: '',
shprname:'',
shprmobiletype: '',
shprtel: '',
shpraddress: '',
shprcountyr:'',
shpcomid: '',
shpaeocode:'',
shpcustomerid: '',
cnsnname: '',
cnsrmobiletype:'',
cnsntel: '',
cnsnaddress: '',
cnscountyr: '',
cnscomid:'',
cnsaeocode: '',
cnsrctcname:'',
cnsrctctel:'',
csgcustomerid: '',
collected: '',
exchagerate:'',
comat: '',
refrigerated: '',
whshold: '',
expcusttransit:'',
impcusttransit: '',
shorttrans:'',
shorttransbup: '',
cargoowner: '',
chargetime:'',
isinstruction: '',
notify: '',
fileattached: '',
ratetype:'',
processingmethod: '',
handlingcircs:'',
reservedtonnage:'',
},
formLabelWidth: '80px',
detaRules:{},
//更改分单号
fhlDialog: false,
detaFhl:'更改分单号',
fhlForm:{
billfhl:'',
},
fhlRules:{},
//更改主单号
/* 批量选中的列表 */
sels: [],
fwbDialog: false,
detaFwb:'更改主单号',
fwbForm:{
waybill:'',
},
fwbRules:{},
}
},
methods: {
... ... @@ -389,6 +611,89 @@
// this.loading = false;
// });
// },
//查询货物明细
//打开更改主单号
selsChange: function (sels) {
this.sels = sels;
},
changeFwb() {
this.fwbDialog = true;
// this.addForm=row;
},
fwbEdit() {
this.$confirm('是否更改?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}
).then(() => {
for(var i=0;i<this.sels.length;i++){
this.sels[i]['newwaybill']=this.fwbForm.waybill;
}
// console.log(this.sels)
ediNewInventroyBywaybill(this.sels).then(response => {
const res = response.data
if (res.code !== '200') {
return this.$message.error(res.msg)
}
this.$message.success(res.msg)
this.fwbDialog = false
this.getList()
}).catch(error => {
this.$message.error(error.toString())
})
}).catch(() => {
})
},
//打开更改分单号
changeFhl(row) {
this.fhlDialog = true;
this.addForm=row;
},
fhlEdit() {
const _this=this;
// 进行表单的预验证
_this.$refs.fhlForm.validate(valid => {
// 未通过，表单预校验
if (!valid) return
this.addForm.newfhl=this.fhlForm.billfhl;
ediNewInventroyByfhl(this.addForm).then((response) => {
// console.log(row)
const res = response.data
// console.log(res)
if (res.code != '200') {
return this.$message.error(res.msg)
}
this.$message.success(res.msg)
// 隐藏对话框
this.fhlDialog = false
// 刷新列表
this.getList()
}).catch(error => {
this.$message.error(error.toString())
})
})
},
//查询货物明细
queryDeta(row) {
const _this = this
this.detaDialog = true;
// console.log(row);
selectBywaybillandFhl({waybill:row.waybill,billfhl:row.billfhl}).then((response) => {
const res = response.data
// console.log(response.data)
if (res.code !== '200') {
return _this.$message.error('获取货物明细，失败！')
}
// 获取表单数据
_this.detaForm = res.data
_this.$message.success('获取货物明细，成功！')
}).catch(error => {
// 关闭加载
_this.$message.error(error.toString())
})
},
handleSizeChange(val) {
this.queryInfo.pageSize = val
this.getList()
... ... @@ -401,7 +706,7 @@
const _this = this
selectNewInventroys(this.queryInfo).then((response) => {
const res = response.data
console.log(response.data)
// console.log(response.data)
if (res.code !== '200') {
return _this.$message.error('获取消息收发记录，失败！')
}
... ...