This commit is contained in:
aihe 2024-07-30 00:28:21 +08:00
parent 8ab3d253eb
commit 15ef4e0283
9 changed files with 57 additions and 65 deletions

View File

@ -1,5 +1,5 @@
<template>
<u-row justify="between">
<u-row justify="between" @click="goto(`user/exclusiveCourier`)">
<text class="clr-sub">您的专属快递员</text>
<u-row>
<text class="">{{modelInfo.salesmen}}</text>

View File

@ -1,8 +1,8 @@
<template>
<view class="shet-cont">
<view v-for="(item, index) in modelInfo.feeItems" class="jsfm-item">
<!-- 手动添加的才能删除 -->
<!-- 手动添加的才能删除 -->
<!-- <view v-for="(item, index) in modelInfo.feeItems" class="jsfm-item">
<view>
<text class="font-weight font-30">{{item.feeName}}</text>
</view>
@ -29,11 +29,10 @@
<view v-if="item.calcExp" class="pt-10">
<text class="clr-sub">描述</text> {{item.remark || '-'}}
</view>
</view>
</view> -->
<view class="">
<u-row justify="between">
<!-- <u-row justify="between">
<view>
<text class="clr-sub pr-10">特殊报价</text>
<text>{{modelInfo.blSpecialQuote ? '是' : '否'}}</text>
@ -48,10 +47,10 @@
<tpx-text-dic :value="modelInfo.calcFeeType" :list="dicData.emis_calc_fee_type"></tpx-text-dic>
</text>
</u-row>
</u-row>
</u-row> -->
</view>
<view class="pt-20">
<view class="">
<u-row>
<text class="clr-sub pr-10">总运费</text>
<text >

View File

@ -22,27 +22,6 @@
</u-row>
</view>
<view v-for="(item, index) in modelInfo.cargoList" class="yditem">
<view class="ydi-lab mb-10">
<text class="font-weight">
<!-- {{item.goodsName}} -->
</text>
<view>
<u-icon @click="handleDelGood(index)" name="trash" size="32"></u-icon>
</view>
</view>
<bpe-gooditem-filed-edit-tmp :value="item" :showMode="showMode" :submitVal="modelInfo"></bpe-gooditem-filed-edit-tmp>
</view>
<u-button @click="handleAddGood" custom-style="border-radius: 16rpx;height: 66rpx;" type="primary" plain="true">
<u-row justify="center">
<view>
<u-icon name="plus" size="30" color="#B12D29"></u-icon>
</view>
<text class="pl-10">增加货物</text>
</u-row>
</u-button>
<view class="edm-input-item mt-20">
<u-row justify="between">
<text class="font-28 font-weight">包裹重量</text>
@ -70,6 +49,27 @@
</u-row>
</view>
<view v-for="(item, index) in modelInfo.cargoList" class="yditem">
<view class="ydi-lab mb-10">
<text class="font-weight">
<!-- {{item.goodsName}} -->
</text>
<view>
<u-icon @click="handleDelGood(index)" name="trash" size="32"></u-icon>
</view>
</view>
<bpe-gooditem-filed-edit-tmp :value="item" :showMode="showMode" :submitVal="modelInfo"></bpe-gooditem-filed-edit-tmp>
</view>
<u-button @click="handleAddGood" custom-style="border-radius: 16rpx;height: 66rpx;" type="primary" plain="true">
<u-row justify="center">
<view>
<u-icon name="plus" size="30" color="#B12D29"></u-icon>
</view>
<text class="pl-10">增加货物</text>
</u-row>
</u-button>
</template>
<script>
@ -167,7 +167,8 @@
list.map(t=> {
totalVolume += (+t.volume) || 0
})
this.modelInfo.totalVolume = totalVolume.toFixed(5)
// 去除体积自动计算
// this.modelInfo.totalVolume = totalVolume.toFixed(5)
},
async calceOther() {

View File

@ -1,7 +1,7 @@
<template>
<view v-if="showMode!=1" class="dt-block" style="margin-bottom: 50rpx;">
<view v-if="showMode!=1" class="dt-block" >
<view class="dt-tle">
<view class="com-section">热门物品</view>
<view class="com-section">物品信息</view>
</view>
<view class="dt-cont">
<view class="dt-block mt-10">
@ -11,12 +11,6 @@
</view>
<view class="dt-block" >
<view v-if="showMode!=1" class="dt-tle">
<view class="com-section">物品信息</view>
<view>
<!-- <u-button custom-style="font-size: 28rpx;height: 56rpx;border-radius: 16rpx;" plain="true" type="primary">选择历史</u-button> -->
</view>
</view>
<view class="dt-cont">
<view v-if="showMode!=1" class="edm-input-item">
<tpx-select v-model:value="checkedGoodId" v-model:resObject="goodsRes" :getListFun="getGoodsList" :transKeyVal="{valKey: 'goodsName',titleKey: 'goodsName'}"
@ -188,8 +182,8 @@
this.checkedGoodId = ''
let res = await apiService.getHotGoodsList({ customerCode: this.modelInfo.customerCode, pageSize: 5 })
let list = res.rows || []
// 截取前5个热门商品
list.splice(5, list.length - 5)
// 截取前3个热门商品
list.splice(3, list.length - 3)
this.hotGoods = transListKeyTitle({ valKey: 'goodsCode',titleKey: 'goodsName', list })
},
handleCloseModal() {

View File

@ -23,16 +23,15 @@
<u-row justify="between">
<u-row>
<text class="font-28 font-weight pr-10">件数</text>
<view style="width: 200rpx;">
<tpx-input placeholder="请填写" v-model:value="modelInfo.cargoQty" inputAlign="right" type="number" suffix="件" :_maxNum="cargoQtyMaxNum"></tpx-input>
</view>
</u-row>
<u-row>
<text class="font-28 font-weight pr-10">体积</text>
<tpx-input placeholder="请填写" v-model:value="modelInfo.cargoQty" inputAlign="right" type="number" suffix="件" :_maxNum="cargoQtyMaxNum"></tpx-input>
<!-- <text class="font-28 font-weight pr-10">体积</text>
<view style="">
{{modelInfo.volume || '0'}}
<text class="clr-sub">m³</text>
</view>
</view> -->
</u-row>
</u-row>
</view>

View File

@ -167,7 +167,7 @@
},
async handleDefaultSwitch(item) {
try{
await apiService.setDefaultAddressById({ id: item.id, _loading: true })
await apiService.setDefaultAddressById({ id: item.id, defaultFlag: Number(!!item.blDefaultFlag), _loading: true })
this.showToast('操作成功')
this.$refs.listRef.getDataList(true) // 重置到第一页数据
}catch(e){

View File

@ -43,7 +43,7 @@ export const getOrderModels = () => {
customsClear: undefined, // 清关方式
customsEclaration: undefined, // 报关方式
packType: 2, // 包装类型
dispatchMethod: undefined, // 派送方式
dispatchMethod: 1, // 派送方式
pickupMethod: undefined, // 取件方式
pickStartDate: undefined, // 上门取货-开始时间
pickFinishDate: undefined,// 上门取货-结束时间
@ -105,9 +105,9 @@ export const getOrderModels = () => {
],
freight: undefined, // 计费总计
cargoList: [ // 货物列表
{
cargoQty: 1,
}
// {
// cargoQty: 1,
// }
// {
// goodsCode: 货物代码:eg 123,
// goodsName: 货物名称,

View File

@ -22,15 +22,7 @@
<view class="com-section mt-30">路线信息</view>
<view class="blcok-white">
<view class="yunf-input-item">
<tpx-select v-model:value="submitParam.pickupMethod" :list="dicData.emis_qujian_fangshi"
mode="drop"
>
<tpx-text-item label="取件方式" :value="submitParam.pickupMethod" :list="dicData.emis_qujian_fangshi"></tpx-text-item>
</tpx-select>
</view>
<template v-if="submitParam.reciever.country && submitParam.sender.country">
<view>
<view class="yunf-input-item">
<tpx-select v-model:value="submitParam.transLine" v-model:text="submitParam.transLineTypeName" v-model:resObject="wayRes"
:getListFun="getTransLineList" :transKeyVal="{valKey: 'lineCode',titleKey: 'lineName'}"
@ -39,11 +31,18 @@
<tpx-text-item label="路线" :value="submitParam.transLineTypeName"></tpx-text-item>
</tpx-select>
</view>
</template>
</view>
<view class="yunf-input-item">
<tpx-select v-model:value="submitParam.pickupMethod" :list="dicData.emis_qujian_fangshi"
mode="drop"
>
<tpx-text-item label="取件方式" :value="submitParam.pickupMethod" :list="dicData.emis_qujian_fangshi"></tpx-text-item>
</tpx-select>
</view>
<view>
<view v-if="submitParam.pickupMethod == 1 || submitParam.pickupMethod == 3" class="yunf-input-item">
<view v-if="submitParam.pickupMethod == 1" class="yunf-input-item">
<tpx-select v-model:value="submitParam.intoWarehouseCode" v-model:text="submitParam.intoWarehouseName" v-model:resObject="wareRes"
:getListFun="getLisWarehouse" :transKeyVal="{valKey: 'code',titleKey: 'name'}"
:searchParam="wareSearchParam" placeholder="请选择仓库"
@ -52,11 +51,11 @@
</tpx-select>
</view>
<view @click="handleDialogClick(revtimeModal)" class="yunf-input-item">
<view @click="handleDialogClick(revtimeModal)" v-if="submitParam.pickupMethod == 1 || submitParam.pickupMethod == 2" class="yunf-input-item">
<u-row justify="between">
<view class="font-weight">
<view v-if="submitParam.pickupMethod == 1">预计入仓时间</view>
<view v-if="submitParam.pickupMethod == 2">期望上门时间</view>
<view v-else>预计入仓时间</view>
</view>
<u-row custom-style="flex: 1;" justify="end" align="center">
<view v-if="submitParam.pickStartDate && submitParam.pickFinishDate">

View File

@ -18,7 +18,7 @@
mode="info" v-slot="curOrdTab"
>
<text slot>
(<text>{{curOrdTab.item.val}}</text>)
<!-- (<text>{{curOrdTab.item.val}}</text>) -->
</text>
</tpx-tabs>
</u-col>