aike/emis-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-05-26 18:44:55 +08:00
parent 5100b44d97
commit fa71704ef3
2 changed files with 90 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/views/emis/emisWaybill/waybillModify.vue
View File

@ -355,16 +355,19 @@
</el-col>
<el-col :span="12">
<el-form-item label="总件数" prop="parcelQty" label-width="70px">
<el-input v-model="form.parcelQty" style="text-align: right;" @blur="handleInitGenGoods" @keyup.enter.native="handleInitGenGoods" placeholder="" />
<el-input v-model="form.parcelQty" style="text-align: right;" @keyup.enter.native="handleInitGenGoods" placeholder="" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="实际重量" prop="billWeight" label-width="70px">
<el-input v-model="form.billWeight" @blur="handleCalcSettlementWeight" style="text-align: right;min-width: 80px" placeholder="请输入实际重量" >
<el-input v-model="form.billWeight" @keyup.enter.native="handleCalcSettlementWeight" style="text-align: right;min-width: 80px" placeholder="请输入实际重量" >
<span slot="suffix">(kg)</span>
</el-input>
</el-form-item>
</el-col>
<!-- @blur="handleCalcSettlementWeight" -->
<el-col :span="24">
<el-form-item label="" prop="goodsType" label-width="0px">
<!-- <GoodsSimplePicker v-model="form.goodsType" @onChange="onGoodsChange" placeholder="选择货物信息"></GoodsSimplePicker> -->
@ -412,7 +415,7 @@
</el-table-column>
<el-table-column prop="cargoQty" label="件数" align="center" width="60">
<template slot-scope="scope">
<el-input v-model="scope.row.cargoQty" @blur="(val)=>handleCargoQtyChange(scope.row)" size="mini" placeholder=""></el-input>
<el-input v-model="scope.row.cargoQty" @blur="(val)=>handleCargoQtyChange(scope.row)" @keyup.enter.native="(val)=>handleCargoQtyChange(scope.row)" size="mini" placeholder=""></el-input>
</template>
</el-table-column>
<el-table-column prop="volume" label="体积(m³)" align="center" width="80">
@ -462,17 +465,17 @@
<el-col :span="12">
<el-form-item label="总体积" prop="totalVolume" label-width="70px" >
<div style="">
<el-input v-model="form.totalVolume" @input="handleCalcVolumeWeight" style="text-align: right;width: 120px" placeholder="体积" >
<el-input v-model="form.totalVolume" @blur="handleCalcVolumeWeight" @keyup.enter.native="handleCalcVolumeWeight" style="text-align: right;width: 120px" placeholder="体积" >
<span slot="suffix">(m³)</span>
</el-input>
</div>
</el-form-item>
</el-col>
<!-- @blur="handleCalcVolumeWeight" -->
<el-col :span="12">
<el-form-item label="体积重量" prop="volumeWeight" label-width="70px">
<el-input v-model="form.volumeWeight" @input="calcBillFee" placeholder="" disabled>
<el-input v-model="form.volumeWeight" placeholder="" disabled>
<span slot="suffix">(kg)</span>
</el-input>
</el-form-item>
@ -480,7 +483,7 @@
<el-col :span="12">
<el-form-item label="结算重量" prop="settlementWeight" label-width="70px">
<el-input v-model="form.settlementWeight" @input="calcBillFee" placeholder="" disabled >
<el-input v-model="form.settlementWeight" placeholder="" disabled >
<span slot="suffix">(kg)</span>
</el-input>
</el-form-item>
@ -1328,6 +1331,8 @@ methods: {
onProductChange(item){
this.form.transLine=item[0];
this.form.productType=item[1];
this.calcBillFee();
},
onSendSiteSelect(item){
if(!item){
@ -1545,6 +1550,7 @@ methods: {
}
calcSetteldWeight(postData).then(response => {
this.form.settlementWeight = response.data.settlementWeight;
this.form.feeWeight = this.form.settlementWeight ;
@ -1569,8 +1575,6 @@ methods: {
&& this.form.customsEclaration
){
let calcFeeType=this.form.calcFeeType;
if(calcFeeType==3){
calcFeeType=1;
@ -1589,22 +1593,40 @@ methods: {
}
calcWaybillFee(postData).then(response => {
let newFeeList=response.data.feeList;
let newFeeMap = new Map();
newFeeList.forEach(item=>{
newFeeMap[item.feeCode]=item;
});
let newFeeList=[];
let newFeeMap = new Map();
if(response.data.feeList){
newFeeList=response.data.feeList;
newFeeList.forEach(item=>{
newFeeMap[item.feeCode]=item;
});
}
let custFeeList = [];
this.form.feeItems.forEach(item=>{
if(item.blAutoGen!='1' && !(item.feeCode in newFeeMap)){
custFeeList.push(item);
}
});
this.form.feeItems = newFeeList.concat(custFeeList);
this.handleCalcFeeItem();
// if(newFeeList && newFeeList.lenght>0){
// }else{
// this.form.feeItems=[]
// this.handleCalcFeeItem();
// // this.$confirm('该产品未配置报价，请联系管理员！', '提示', {
// // confirmButtonText: '确认',
// // cancelButtonText: '返回',
// // type: 'warning'
// // });
// }
let custFeeList = [];
this.form.feeItems.forEach(item=>{
if(item.blAutoGen!='1' && !(item.feeCode in newFeeMap)){
custFeeList.push(item);
}
});
this.form.feeItems = newFeeList.concat(custFeeList);
this.handleCalcFeeItem();
});
}
},

68
src/views/emis/emisWaybill/waybillRecord.vue
View File

@ -355,16 +355,19 @@
</el-col>
<el-col :span="12">
<el-form-item label="总件数" prop="parcelQty" label-width="70px">
<el-input v-model="form.parcelQty" style="text-align: right;" @blur="handleInitGenGoods" @keyup.enter.native="handleInitGenGoods" placeholder="" />
<el-input v-model="form.parcelQty" style="text-align: right;" @keyup.enter.native="handleInitGenGoods" placeholder="" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="实际重量" prop="billWeight" label-width="70px">
<el-input v-model="form.billWeight" @blur="handleCalcSettlementWeight" style="text-align: right;min-width: 80px" placeholder="请输入实际重量" >
<el-input v-model="form.billWeight" @keyup.enter.native="handleCalcSettlementWeight" style="text-align: right;min-width: 80px" placeholder="请输入实际重量" >
<span slot="suffix">(kg)</span>
</el-input>
</el-form-item>
</el-col>
<!-- @blur="handleCalcSettlementWeight" -->
<el-col :span="24">
<el-form-item label="" prop="goodsType" label-width="0px">
<!-- <GoodsSimplePicker v-model="form.goodsType" @onChange="onGoodsChange" placeholder="选择货物信息"></GoodsSimplePicker> -->
@ -412,7 +415,7 @@
</el-table-column>
<el-table-column prop="cargoQty" label="件数" align="center" width="60">
<template slot-scope="scope">
<el-input v-model="scope.row.cargoQty" @blur="(val)=>handleCargoQtyChange(scope.row)" size="mini" placeholder=""></el-input>
<el-input v-model="scope.row.cargoQty" @blur="(val)=>handleCargoQtyChange(scope.row)" @keyup.enter.native="(val)=>handleCargoQtyChange(scope.row)" size="mini" placeholder=""></el-input>
</template>
</el-table-column>
<el-table-column prop="volume" label="体积(m³)" align="center" width="80">
@ -462,17 +465,17 @@
<el-col :span="12">
<el-form-item label="总体积" prop="totalVolume" label-width="70px" >
<div style="">
<el-input v-model="form.totalVolume" @input="handleCalcVolumeWeight" style="text-align: right;width: 120px" placeholder="体积" >
<el-input v-model="form.totalVolume" @blur="handleCalcVolumeWeight" @keyup.enter.native="handleCalcVolumeWeight" style="text-align: right;width: 120px" placeholder="体积" >
<span slot="suffix">(m³)</span>
</el-input>
</div>
</el-form-item>
</el-col>
<!-- @blur="handleCalcVolumeWeight" -->
<el-col :span="12">
<el-form-item label="体积重量" prop="volumeWeight" label-width="70px">
<el-input v-model="form.volumeWeight" @input="calcBillFee" placeholder="" disabled>
<el-input v-model="form.volumeWeight" placeholder="" disabled>
<span slot="suffix">(kg)</span>
</el-input>
</el-form-item>
@ -480,7 +483,7 @@
<el-col :span="12">
<el-form-item label="结算重量" prop="settlementWeight" label-width="70px">
<el-input v-model="form.settlementWeight" @input="calcBillFee" placeholder="" disabled >
<el-input v-model="form.settlementWeight" placeholder="" disabled >
<span slot="suffix">(kg)</span>
</el-input>
</el-form-item>
@ -1328,6 +1331,8 @@ methods: {
onProductChange(item){
this.form.transLine=item[0];
this.form.productType=item[1];
this.calcBillFee();
},
onSendSiteSelect(item){
if(!item){
@ -1545,6 +1550,7 @@ methods: {
}
calcSetteldWeight(postData).then(response => {
this.form.settlementWeight = response.data.settlementWeight;
this.form.feeWeight = this.form.settlementWeight ;
@ -1569,8 +1575,6 @@ methods: {
&& this.form.customsEclaration
){
let calcFeeType=this.form.calcFeeType;
if(calcFeeType==3){
calcFeeType=1;
@ -1589,22 +1593,40 @@ methods: {
}
calcWaybillFee(postData).then(response => {
let newFeeList=response.data.feeList;
let newFeeMap = new Map();
newFeeList.forEach(item=>{
newFeeMap[item.feeCode]=item;
});
let newFeeList=[];
let newFeeMap = new Map();
if(response.data.feeList){
newFeeList=response.data.feeList;
newFeeList.forEach(item=>{
newFeeMap[item.feeCode]=item;
});
}
let custFeeList = [];
this.form.feeItems.forEach(item=>{
if(item.blAutoGen!='1' && !(item.feeCode in newFeeMap)){
custFeeList.push(item);
}
});
this.form.feeItems = newFeeList.concat(custFeeList);
this.handleCalcFeeItem();
// if(newFeeList && newFeeList.lenght>0){
// }else{
// this.form.feeItems=[]
// this.handleCalcFeeItem();
// // this.$confirm('该产品未配置报价，请联系管理员！', '提示', {
// // confirmButtonText: '确认',
// // cancelButtonText: '返回',
// // type: 'warning'
// // });
// }
let custFeeList = [];
this.form.feeItems.forEach(item=>{
if(item.blAutoGen!='1' && !(item.feeCode in newFeeMap)){
custFeeList.push(item);
}
});
this.form.feeItems = newFeeList.concat(custFeeList);
this.handleCalcFeeItem();
});
}
},