diff --git a/src/views/emis/EmisBaseTools/AjustApplyTypePicker.vue b/src/views/emis/EmisBaseTools/AjustApplyTypePicker.vue index ccccbb9b..59af4b8a 100644 --- a/src/views/emis/EmisBaseTools/AjustApplyTypePicker.vue +++ b/src/views/emis/EmisBaseTools/AjustApplyTypePicker.vue @@ -120,13 +120,7 @@ this.dispatch('ElFormItem', 'el.form.change', [this.svalue]); }, queryData() { - // if(this.isFistInit && !this.value){ - // this.optionItems=[]; - // return; - // } - this.optionItems=[]; - let queryParams = { pageNum: 1, pageSize: 300, diff --git a/src/views/emis/EmisBaseTools/EmisGetNextSitePicker.vue b/src/views/emis/EmisBaseTools/EmisGetNextSitePicker.vue index eb8e0db5..4b08a9c2 100644 --- a/src/views/emis/EmisBaseTools/EmisGetNextSitePicker.vue +++ b/src/views/emis/EmisBaseTools/EmisGetNextSitePicker.vue @@ -129,7 +129,7 @@ if(val && this.queryParams.pageNum == 1){ this.dataList=[]; } - this.queryParams.queryData=val; + this.queryParams.searchValue=val; getNextStationList(this.queryParams).then(response => { this.dataList=response.rows; response.rows.forEach(item => { diff --git a/src/views/emis/emisWaybill/waybillAdjustApply.vue b/src/views/emis/emisWaybill/waybillAdjustApply.vue deleted file mode 100644 index e88b8b3f..00000000 --- a/src/views/emis/emisWaybill/waybillAdjustApply.vue +++ /dev/null @@ -1,2086 +0,0 @@ - - - - - - diff --git a/src/views/emis/emisWaybill/waybillRecord.vue b/src/views/emis/emisWaybill/waybillRecord.vue index aea54795..c6eb76e9 100644 --- a/src/views/emis/emisWaybill/waybillRecord.vue +++ b/src/views/emis/emisWaybill/waybillRecord.vue @@ -2014,7 +2014,7 @@ methods: { newItem.cargoQty=1; this.form.cargoList.splice(index+1, 0, newItem); // this.form.cargoList.push(newItem); - handleCargoQtyChange(); + this.handleCargoQtyChange(); }, showLocalTime(){ diff --git a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue index a2a4c1e8..1337d355 100644 --- a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue +++ b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue @@ -32,8 +32,8 @@ - - + + 线路调整 @@ -42,14 +42,14 @@ - + - + 产品类型调整 @@ -81,6 +81,24 @@ + + + + 货值调整 + + + {{billDetail.realValue}} + + + + + (USD) + + + + + + @@ -145,6 +163,64 @@ + + + + 取件方式调整 + + + + + + + + + {{ $t(dict.label) }} + + + + + + + + + + + 取件员调整 + + + {{ billDetail.takePieceEmployeeName }} + + + + + + + + + + + + + + 操作员调整 + + + {{ billDetail.operateEmployeeName }} + + + + + + + + + + @@ -169,19 +245,47 @@ - + - 取件员调整 + 包装类型调整 - {{ billDetail.takePieceEmployeeName }} + - - - + + + + + + + + + + + + 计费方式调整 + + + + + + + + {{dict.label}} + + @@ -236,6 +340,39 @@ + + + + 销售联系人 + + + {{ billDetail.salesmen }} + + + + + + + + + + + + + + 回款联系人 + + + {{ billDetail.payee }} + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -464,10 +729,12 @@ + + 运费相关调整变化 - + 总体积变化(m³) @@ -481,7 +748,7 @@ - + 体积重量变化(kg) @@ -495,7 +762,7 @@ - + 实际重量变化(kg) @@ -509,7 +776,7 @@ - + 结算重量变化(kg) @@ -663,6 +930,9 @@ import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue'; import TransProductCasPicker from '@/views/emis/EmisBaseTools/TransProductCasPicker.vue'; +import { debounce } from 'throttle-debounce' +import { deepClone } from '@/utils/index' + export default { name: "AdjustPanel", @@ -919,6 +1189,17 @@ export default { console.log("====>this.applyTypeArr==>",this.applyTypeArr); this.reset(); this.form=Object.assign({},this.newValue); + + // Object.assign({},this.newValue); + + // if(this.newValue.cargoList){ + // this.form.cargoList=[...this.newValue.cargoList]; + // } + + // if(this.newValue.feeItems){ + // this.form.feeItems=[...this.newValue.feeItems]; + // } + console.log("====>this.oldValue==>",this.oldValue); console.log("====>this.form==>",this.form); this.billDetail=this.oldValue; @@ -1056,6 +1337,153 @@ export default { }, + handleCalcVolumeDebounce(row){ + // 控制触发频率 + debounce(250, this.handleCalcVolume(row)) + }, + + handleInitGenGoods(){ + if(this.form.parcelQty>0){ + + let currentParcelQty = 0; + if(!this.form.cargoList){ + this.form.cargoList=[]; + } + + this.form.cargoList.forEach(item=>{ + currentParcelQty = currentParcelQty+parseInt(item.cargoQty); + }); + + // 新件数大于 + if(this.form.parcelQty>currentParcelQty){ + let len=this.form.parcelQty-currentParcelQty; + if(this.form.parcelQty>10){ + let cargo={ + "goodsCode": "", + "goodsName": "", + "cargoQty": len, + "length": 0, + "width": 0, + "height": 0, + "volume": 0, + } + this.form.cargoList.push(cargo); + } + else{ + for(let i=0;i0){ + if(newList.length>=10 || this.form.parcelQty>=10){ + let newItem=Object.assign({},zeroItem); + newItem.cargoQty=bzLen; + newList.push(newItem); + }else{ + for(let i=0;i { + this.form.cargoList.splice(index,1) + this.handleCalcVolume(row); + }).catch(() => { + }) + }, + copyGoodsItem(row,index){ + let newItem = Object.assign({},row); + newItem.cargoQty=1; + this.form.cargoList.splice(index+1, 0, newItem); + // this.form.cargoList.push(newItem); + this.handleCargoQtyChange(); + }, + + handleCalcVolume(row){ + // 初始化不计算 + + if(row!=null){ + let singleVolume=parseFloat(row.length)*parseFloat(row.width)*parseFloat(row.height); + let singleTotalVolume=singleVolume*parseFloat(row.cargoQty); + row.volume=parseFloat( (singleTotalVolume/1000000).toFixed(5) ); + } + + let totalVolume=0.0; + this.form.cargoList.forEach(item=>{ + totalVolume=totalVolume+item.volume; + }); + + this.form.totalVolume = parseFloat(totalVolume.toFixed(5)); + + this.handleCalcVolumeWeight(); + + }, + // 计算目的站点 handleCalcDestSite(){ this.calcDestSite(); diff --git a/src/views/emis/emisWaybillAjustApply/emisWaybillAjustApplyForm.vue b/src/views/emis/emisWaybillAjustApply/emisWaybillAjustApplyForm.vue index 16c99707..d9b4ad15 100644 --- a/src/views/emis/emisWaybillAjustApply/emisWaybillAjustApplyForm.vue +++ b/src/views/emis/emisWaybillAjustApply/emisWaybillAjustApplyForm.vue @@ -51,7 +51,7 @@ import AdjustPanel from '@/views/emis/emisWaybillAjustApply/adjustPanel.vue'; import AjustApplyTypePicker from '@/views/emis/EmisBaseTools/AjustApplyTypePicker.vue'; import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue'; - +import { deepClone } from '@/utils/index' export default { name: "emisWaybillAjustApplyForm", props:{ @@ -155,8 +155,8 @@ export default { this.form.billCode=this.billDetail.billCode; - this.form.jsonDataObj.oldValue=Object.assign({},this.billDetail); - this.form.jsonDataObj.newValue=Object.assign({},res.data); + this.form.jsonDataObj.oldValue=deepClone(this.billDetail); + this.form.jsonDataObj.newValue=deepClone(this.billDetail); this.isEditDisabled=false;