This commit is contained in:
aihe 2024-06-19 14:26:41 +08:00
parent 89939a21aa
commit b9e72195af
2 changed files with 220 additions and 212 deletions

View File

@ -161,12 +161,15 @@
}, },
watch: { watch: {
searchParam: { searchParam: {
handler(newVal){ handler(newVal, oldVal){
let vals = Object.values(newVal) let vals = Object.values(newVal)
// 所有关联入参都有值再 执行自动计算 // 所有关联入参都有值再 执行自动计算,数据未变化不做计算
if(vals.length == vals.filter(v => !!v).length) { if(vals.length == vals.filter(v => !!v).length) {
if(JSON.stringify(newVal) != JSON.stringify(oldVal || {})) {
console.log("====watch cost calcWaybillFee===")
this.calcWaybillFee(newVal); this.calcWaybillFee(newVal);
} }
}
}, },
deep: true, deep: true,
} }

View File

@ -1,6 +1,6 @@
<template> <template>
<tpx-page> <tpx-page>
<tpx-layout v-if="!pageLoading"> <tpx-layout>
<template v-slot:body> <template v-slot:body>
<view class="com-jianju pos-rlt pb-30" style="padding-top: 2rpx;"> <view class="com-jianju pos-rlt pb-30" style="padding-top: 2rpx;">
<view class="blcok-white"> <view class="blcok-white">
@ -23,6 +23,7 @@
</u-row> --> </u-row> -->
</view> </view>
<view v-if="!pageLoading">
<view v-if="submitParam.orderSn" class="com-section mt-30" @click="goto(`post/detail?billCode=${submitParam.billCode}&orderSn=${submitParam.orderSn}`)"> <view v-if="submitParam.orderSn" class="com-section mt-30" @click="goto(`post/detail?billCode=${submitParam.billCode}&orderSn=${submitParam.orderSn}`)">
<u-row justify="space-between"> <u-row justify="space-between">
<text>订单号:{{submitParam.orderSn}}</text> <text>订单号:{{submitParam.orderSn}}</text>
@ -245,13 +246,15 @@
maxlength="50" count></u-textarea> maxlength="50" count></u-textarea>
</view> </view>
</view> </view>
</view>
</template> </template>
<template v-slot:footer> <template v-slot:footer>
<view class="pos-rlt blcok-white" style="border-radius: 0;margin-top: 0;"> <view class="pos-rlt blcok-white" style="border-radius: 0;margin-top: 0;">
<view v-if="submitParam.lockFlag == 'T'"> <view v-if="submitParam.lockFlag == 'T'">
<view class="clr-prm font-weight font-30" style="padding: 20rpx 0;">{{submitParam.lockReason}}</view> <view class="clr-prm font-weight font-30" style="padding: 20rpx 0;">{{submitParam.lockReason}}</view>
</view> </view>
<u-row v-else> <view v-else>
<u-row v-if="!pageLoading">
<u-button @click="handleSave()" size="large" shape="circle" <u-button @click="handleSave()" size="large" shape="circle"
custom-style="width: 260rpx;height:80rpx;font-size: 30rpx;" :plain="true" type="primary">保存</u-button> custom-style="width: 260rpx;height:80rpx;font-size: 30rpx;" :plain="true" type="primary">保存</u-button>
@ -259,6 +262,7 @@
custom-style="width: 400rpx;height:80rpx;font-size: 30rpx;" type="primary" >确认并打印</u-button> custom-style="width: 400rpx;height:80rpx;font-size: 30rpx;" type="primary" >确认并打印</u-button>
</u-row> </u-row>
</view> </view>
</view>
</template> </template>
</tpx-layout> </tpx-layout>
@ -403,6 +407,7 @@
} }
} }
if(this.isEdit) { if(this.isEdit) {
this.pageLoading = true
let res = await apiService.getOrderDetail({...this.queryOption, _loading: true}) let res = await apiService.getOrderDetail({...this.queryOption, _loading: true})
let data = res.data || {} let data = res.data || {}
data.goodsPics = (data.goodsPics && data.goodsPics.split(",")) || [] data.goodsPics = (data.goodsPics && data.goodsPics.split(",")) || []