This commit is contained in:
aihe 2024-06-13 16:08:39 +08:00
parent c8fcc1aadb
commit 6791877c76
3 changed files with 23 additions and 9 deletions

View File

@ -56,8 +56,13 @@
return {
}
}
},
okCloseModal: {
default () {
return true
}
},
},
data() {
return {
submitVals: {}
@ -80,7 +85,7 @@
const val = this.submitVals
this.$emit('onSure', val)
this.$emit('update:value', val)
this.handleCloseModal()
this.okCloseModal && this.handleCloseModal()
}
}
}

View File

@ -11,7 +11,7 @@
<slot name="titleRight"></slot>
</view>
</u-row>
<u-row justify="between" custom-style="flex-wrap:wrap;">
<u-row v-if="false" justify="between" custom-style="flex-wrap:wrap;">
<u-col span="6" align="center">
<view class="mt-20 clr-prm font-34 font-weight">{{staticInfo.piaoNum}}</view>
<view class="mt-10 clr-sub font-28">总票数</view>

View File

@ -94,27 +94,27 @@
</view>
</view>
<buns-edit-sheet percentHeight="40" :title="costModal.item.feeName" v-model:show="costModal.show" v-model:value="costModal.item" v-slot="tempObject" @onSure="handleCostItemSure">
<buns-edit-sheet percentHeight="40" :title="costModal.item.feeName" v-model:show="costModal.show" v-model:value="costModal.item" v-slot="tempObject" @onSure="handleCostItemSure" :okCloseModal="false">
<u-row custom-style="gap: 20rpx;margin-top:10rpx;">
<u-row custom-style="flex: 1">
<text class="font-26 pr-10">首重费</text>
<text class="font-26 label-text">首重费</text>
<tpx-input v-model:value="tempObject.value.initialWeightFee" _digit="5" :isWhite="true"
custom-style="width: 120rpx;height: 46rpx;" suffix="CNY"></tpx-input>
</u-row>
<u-row custom-style="flex: 1">
<text class="font-26 pr-10">续重单价</text>
<text class="font-26 label-text">续重单价</text>
<tpx-input v-model:value="tempObject.value.addWeightPrice" _digit="5" :isWhite="true"
custom-style="width: 120rpx;height: 46rpx;" suffix="CNY"></tpx-input>
</u-row>
</u-row>
<u-row style="margin-top:30rpx;" justify="between">
<u-row custom-style="width:300rpx;">
<text class="pr-20">应收</text>
<text class="label-text">应收</text>
<tpx-input v-model:value="tempObject.value.fee" _digit="5" :isWhite="true" custom-style="width: 120rpx;height: 46rpx;"
suffix="CNY"></tpx-input>
</u-row>
<u-row custom-style="width:300rpx;">
<text class="font-26 pr-20">实收</text>
<text :class="`font-26 label-text ${tempObject.value.feeCode == '9999'?'label-text-required':''} `">实收</text>
<tpx-input v-model:value="tempObject.value.realFee" _digit="5" :isWhite="true" custom-style="width: 120rpx;height: 46rpx;"
suffix="CNY"></tpx-input>
</u-row>
@ -206,6 +206,8 @@
}
},
async calcWaybillFee(params = {}) {
// calcFeeType计算入参特殊处理
params.calcFeeType == 3 && (params.calcFeeType = 1);
let res = await apiService.calcWaybillFee({ custNo: this.modelInfo.custNo, ...params })
this.modelInfo.feeItems = res.data.feeList
this.modelInfo.freight = res.data.totalFee
@ -246,8 +248,15 @@
})
this.modelInfo.freight = total
},
handleCostItemSure(data){
async handleCostItemSure(data){
if(data.feeCode == '9999') {
if(!data.realFee) {
this.showToast("实收不能为空")
return false
}
}
this.modelInfo.feeItems.push({ ...data })
this.costModal.show = false
setTimeout(()=>{
this.calteFreight()
}, 500)