This commit is contained in:
aihe 2024-07-14 22:20:44 +08:00
parent ff9af2adeb
commit c86f4244df
5 changed files with 50 additions and 26 deletions

View File

@ -29,12 +29,12 @@ export const getRSDStaffList = (data = {})=> {
// 报价试算
export const preCalcWaybillFee = (data = {})=> {
return coreRequest(url.preCalcWaybillFee, { ...data, postCode: 'RSD' }, {})
return coreRequest(url.preCalcWaybillFee, { ...data }, {})
}
// 物流轨迹
export const queryWaybillTraceInfo = (data = {})=> {
return coreRequest(url.queryWaybillTraceInfo, { ...data, postCode: 'RSD' }, {}, "GET")
return coreRequest(url.queryWaybillTraceInfo, { ...data }, {}, "GET")
}

View File

@ -39,7 +39,7 @@ export default {
queryPrintListSimple: `/oms2c/emisWaybill/queryPrintListSimple`, // 运单 打印数据-列表
getNextStationList: `/oms2c/emisTmsScanRecord/getNextStationList`, // 获取-扫描下一网点
getPreStationList: `/oms2c/emisTmsScanRecord/getPreStationList`, // 获取-扫描上一网点
preCalcWaybillFee: `/oms2c/emisWaybill/preCalcWaybillFee`, // 报价试算
preCalcWaybillFee: `/oms2c/emisWaybill/preCalcWaybillFee`, // 报价试算 -- DONE
queryWaybillTraceInfo: `/oms2c/emisTmsScanRecord/queryWaybillTraceInfo`, // 物流轨迹
queryProblemTypeList: `/oms2c/emisProblemType/listSimple`, // 问题件类型列表
registerProblemInfo: `/oms2c/emisWaybillProblemInfo/registerProblemInfo`, // 问题件登记

View File

@ -1,14 +1,16 @@
<template>
<tpx-checkitems :list="[{}]" v-model:value="modelInfo.productType" v-slot="curPro" min-checked="1" type="single">
<tpx-checkitems :list="proTypeList" v-model:value="modelInfo.productType" v-model:text="modelInfo.productTypeName" v-slot="curPro" min-checked="1" type="single"
:transKeyVal="{valKey: 'productType', titleKey: 'productTypeName'}"
>
<view slot :class="`yunf-item ${curPro.checked?'active':''}`">
<u-row justify="between">
<u-col span="8">
<u-text :text="`柬埔寨-国际特快`" size="28" :bold="true"></u-text>
<u-text margin="6rpx" text="1-2工作日 ¥80元起" size="26" color="#999"></u-text>
<u-text :text="curPro.item.productTypeName" size="28" :bold="true"></u-text>
<u-text margin="6rpx" :text="curPro.item.agingDesc" size="26" color="#999"></u-text>
</u-col>
<u-col span="4">
<u-text align="right" text="运费预估" size="26" color="#999"></u-text>
<u-text align="right" margin="6rpx" text="32" size="26" :bold="true" mode="price"
<u-text align="right" margin="6rpx" :text="curPro.item.estFee" size="26" :bold="true" mode="price"
color="#B12D29"></u-text>
</u-col>
</u-row>
@ -26,10 +28,44 @@
return this.value
}
},
searchParam() {
let info = this.modelInfo
let param = {
transLine: info.transLine,
customsClear: info.customsClear,
customsEclaration: info.customsEclaration,
calcFeeType: 1,
billWeight: info.billWeight,
totalVolume: info.totalVolume,
sendSiteCode: info.sendSiteCode,
dispatchUnderlingSiteCode: info.dispatchUnderlingSiteCode,
}
return param
}
},
watch: {
searchParam: {
handler(newVal, oldVal){
let vals = Object.values(newVal)
if(this.autoCalc) {
// 所有关联入参都有值再 执行自动计算,数据未变化不做计算
if(vals.length == vals.filter(v => !!v).length) {
if(JSON.stringify(newVal) != JSON.stringify(oldVal || {})) {
console.log("====watch cost calcWaybillFee===")
this.calcTypeFee(newVal);
}
}
}
},
deep: true,
}
},
props: {
autoCalc: {
default () {
return true
}
},
value: {
default () {
return { }
@ -38,6 +74,7 @@
},
data() {
return {
proTypeList: []
}
},
created() {
@ -48,9 +85,12 @@
unmounted() {
},
methods: {
async calcTypeFee(params = {}){
let res = await apiService.preCalcWaybillFee({ custNo: this.modelInfo.custNo, ...params })
this.proTypeList = res.data || []
}
}
}
</script>

View File

@ -75,24 +75,12 @@
</view>
</u-row>
</view>
<view class="pt-30">
<!-- <view class="pt-30">
<u-row justify="">
<text class="clr-sub pr-10">包装类型</text>
<tpx-text-dic :value="modelInfo.packType" :list="dicData.emis_tab_packing_type"></tpx-text-dic>
</u-row>
</view>
<view class="pt-30">
<u-row justify="">
<text class="clr-sub pr-10">是否子单</text>
<text class="">{{modelInfo.blGenSubbill=='1'?'是':'否'}}</text>
</u-row>
</view>
<view class="pt-30">
<u-row justify="">
<text class="clr-sub pr-10">合同号</text>
<text class="">{{modelInfo.custOrderId || '-'}}</text>
</u-row>
</view>
</view> -->
</view>
</template>

View File

@ -179,10 +179,6 @@
waySearchParam() {
return { country: this.submitParam.reciever.country, fromCountry: this.submitParam.sender.country }
},
destPostParam(){
const { country } = this.submitParam.reciever
return { lineCode: this.submitParam.transLine, countryCode: country }
},
dicData() {
return this.$store.getters.dicData
},