This commit is contained in:
aihe 2024-09-01 10:16:40 +08:00
parent 155911063c
commit 3f35a8bba4
5 changed files with 32 additions and 140 deletions

View File

@ -1,18 +1,21 @@
<template> <template>
<view class="edm-input-item"> <view v-if="showGoodSummary">
<tpx-select v-model:value="modelInfo.goodsType" v-model:resObject="goodsRes" :getListFun="getGoodsList" :transKeyVal="{valKey: 'goodsName',titleKey: 'goodsName'}" <view class="edm-input-item">
mode="drop" @onChange="handleChooseGood" type="multiple" <tpx-select v-model:value="modelInfo.goodsType" v-model:resObject="goodsRes" :getListFun="getGoodsList" :transKeyVal="{valKey: 'goodsName',titleKey: 'goodsName'}"
> mode="drop" @onChange="handleChooseGood" type="multiple"
<tpx-text-item label="货物大类" :value="modelInfo.goodsType"></tpx-text-item> >
</tpx-select> <tpx-text-item label="货物大类" :value="modelInfo.goodsType"></tpx-text-item>
</view> </tpx-select>
<view class="edm-input-item "> </view>
<u-row align="top"> <view class="edm-input-item ">
<text class="font-weight pr-30">货物名称</text> <u-row align="top">
<u-textarea v-model="modelInfo.goodsInfo" border="surround" height="100" placeholder="" <text class="font-weight pr-30">货物名称</text>
count></u-textarea> <u-textarea v-model="modelInfo.goodsInfo" border="surround" height="100" placeholder=""
</u-row> count></u-textarea>
</u-row>
</view>
</view> </view>
<view class="edm-input-item mb-10"> <view class="edm-input-item mb-10">
<u-row justify="between"> <u-row justify="between">
<text class="font-28 font-weight">总件数</text> <text class="font-28 font-weight">总件数</text>
@ -133,7 +136,12 @@
default () { default () {
return '1' // 1 只显示商品名称、体积; 2:显示全部商品信息 return '1' // 1 只显示商品名称、体积; 2:显示全部商品信息
} }
} },
showGoodSummary: {
default () {
return true // 显示商品汇总信息
}
},
}, },
data() { data() {
return { return {

View File

@ -1,5 +1,5 @@
<template> <template>
<view v-if="showMode!=1" class="dt-block" style="margin-bottom: 50rpx;"> <view v-if="false" class="dt-block" style="margin-bottom: 50rpx;">
<view class="dt-tle"> <view class="dt-tle">
<view class="com-section">热门物品</view> <view class="com-section">热门物品</view>
</view> </view>
@ -26,15 +26,15 @@
</tpx-select> </tpx-select>
</view> </view>
<!-- <view class="edm-input-item"> <bpe-gooditemsize-tmp v-model:value="modelInfo" :submitVal="submitVal"></bpe-gooditemsize-tmp>
<tpx-text-item label="件数">
<view class="edm-input-item">
<tpx-text-item label="异常件数">
<template v-slot:right> <template v-slot:right>
<tpx-input placeholder="请填写" v-model:value="modelInfo.cargoQty" inputAlign="right" type="number" suffix="件" :_maxNum="cargoQtyMaxNum"></tpx-input> <tpx-input placeholder="请填写" v-model:value="modelInfo.abnormalQty" inputAlign="right" type="number" suffix="件" :_maxNum="cargoQtyMaxNum"></tpx-input>
</template> </template>
</tpx-text-item> </tpx-text-item>
</view> --> </view>
<bpe-gooditemsize-tmp v-model:value="modelInfo" :submitVal="submitVal"></bpe-gooditemsize-tmp>
<view v-if="showMode!=1"> <view v-if="showMode!=1">
<view class="edm-input-item"> <view class="edm-input-item">

View File

@ -1,113 +0,0 @@
<template>
<view class="shet-cont">
<view class="jsfm-item" style="margin-top: 0;">
<u-row justify="between">
<text class="font-28 font-weight">总件数</text>
<view>
<u-number-box v-model="modelInfo.parcelQty" :min="1" :max="100000" buttonSize="50" inputWidth="100" iconStyle="font-size: 18rpx;"></u-number-box>
</view>
</u-row>
</view>
<view class="jsfm-item">
<u-row justify="between">
<text class="font-28 font-weight">包裹重量</text>
<view>
<tpx-input v-model:value="modelInfo.billWeight" placeholder="" inputAlign="right" suffix="kg" _digit="4"></tpx-input>
</view>
</u-row>
</view>
<view class="jsfm-item">
<u-row justify="between" align="top">
<text class="font-28 pt-20 font-weight">总体积</text>
<view v-if="totalVolume || true">
<tpx-input v-model:value="modelInfo.totalVolume" placeholder="" inputAlign="right" suffix="m³" _digit="4"></tpx-input>
</view>
</u-row>
</view>
</view>
</template>
<script>
import * as apiService from "@/common/api"
export default {
computed: {
modelInfo: {
get(){
return this.value
}
},
totalVolume() {
let totalVolume = this.modelInfo.totalVolume
return totalVolume
},
isCargoListOnchange() {
return this.modelInfo.cargoList
}
},
watch: {
isCargoListOnchange: {
handler(newVal){
console.log("===bpe-goodsize-tmp isCargoListOnchange===")
this.handleCargoChange(newVal)
},
deep: true,
}
},
props: {
value: {
default () {
return { }
}
}
},
data() {
return {
}
},
created() {
},
onHide() {
},
unmounted() {
},
methods: {
handleCargoChange(list){
let parcelQty = 0, totalVolume = 0
list.map(t=> {
totalVolume += (+t.volume) || 0
})
this.modelInfo.totalVolume = totalVolume.toFixed(5)
},
async calceOther() {
let { totalVolume, productType, billWeight } = this.modelInfo
let voRes = await apiService.calcVolumeWeight({ productType, totalVolume })
let { volumeWeight } = voRes.data
let stRes = await apiService.calcSetteldWeight({ volumeWeight, productType, billWeight })
const { settlementWeight } = stRes.data
this.modelInfo.volumeWeight = volumeWeight
this.modelInfo.settlementWeight = this.modelInfo.totalWeight = settlementWeight
//
},
async validData() {
await this.calceOther()
}
}
}
</script>
<style scoped lang="scss">
.shet-cont{
padding: 0;
}
.jsfm-item{
margin-top: 30rpx;
}
</style>

View File

@ -46,7 +46,7 @@
<view class="blcok-white"> <view class="blcok-white">
<tpx-input placeholder="进仓后缀" v-model:value="submitParam.inBatchNo" :isWhite="true"></tpx-input> <tpx-input placeholder="进仓后缀" v-model:value="submitParam.inBatchNo" :isWhite="true"></tpx-input>
<view class="mt-30"> <view class="mt-30">
<bpe-gooditem-edit-tmp showMode="2" :value="submitParam"></bpe-gooditem-edit-tmp> <bpe-gooditem-edit-tmp showMode="2" :showGoodSummary="false" :value="submitParam"></bpe-gooditem-edit-tmp>
</view> </view>
</view> </view>
@ -59,7 +59,6 @@
</view> </view>
<view class="blcok-white"> <view class="blcok-white">
<!-- <bpe-goodsize-tmp :value="submitParam"></bpe-goodsize-tmp> -->
<u-row justify="space-between" align="top" custom-style="margin-top:20rpx;"> <u-row justify="space-between" align="top" custom-style="margin-top:20rpx;">
<view >备注</view> <view >备注</view>
<view style="width: 70%;"> <view style="width: 70%;">
@ -95,11 +94,10 @@
import BpeGoodphotoTmp from "@/components/buns-post-edit-templates/bpe-goodphoto-tmp" import BpeGoodphotoTmp from "@/components/buns-post-edit-templates/bpe-goodphoto-tmp"
import BoDetailTmp from "@/components/buns-order-templates/bo-detail-tmp" import BoDetailTmp from "@/components/buns-order-templates/bo-detail-tmp"
import BpeGoodKuaidiTmp from "@/components/buns-post-edit-templates/bpe-good-kuaidi-tmp" import BpeGoodKuaidiTmp from "@/components/buns-post-edit-templates/bpe-good-kuaidi-tmp"
import BpeGoodsizeTmp from "@/components/buns-post-edit-templates/bpe-goodsize-tmp"
import * as apiService from "@/common/api" import * as apiService from "@/common/api"
export default { export default {
components: { BpeGooditemEditTmp, BpeGoodphotoTmp, BoDetailTmp, BpeGoodKuaidiTmp, BpeGoodsizeTmp }, components: { BpeGooditemEditTmp, BpeGoodphotoTmp, BoDetailTmp, BpeGoodKuaidiTmp },
props: { props: {
}, },

View File

@ -298,7 +298,6 @@
import BpeGooditemEditTmp from "@/components/buns-post-edit-templates/bpe-gooditem-edit-tmp" import BpeGooditemEditTmp from "@/components/buns-post-edit-templates/bpe-gooditem-edit-tmp"
import BpeGoodphotoTmp from "@/components/buns-post-edit-templates/bpe-goodphoto-tmp" import BpeGoodphotoTmp from "@/components/buns-post-edit-templates/bpe-goodphoto-tmp"
import BpeGoodKuaidiTmp from "@/components/buns-post-edit-templates/bpe-good-kuaidi-tmp" import BpeGoodKuaidiTmp from "@/components/buns-post-edit-templates/bpe-good-kuaidi-tmp"
import BpeGoodsizeTmp from "@/components/buns-post-edit-templates/bpe-goodsize-tmp"
import TpxBluetoothPrintPreview from "@/components/tpx-bluetooth-print/tpx-bluetooth-print-preview" import TpxBluetoothPrintPreview from "@/components/tpx-bluetooth-print/tpx-bluetooth-print-preview"
import { debounce } from "@/common/util" import { debounce } from "@/common/util"
import * as apiService from "@/common/api" import * as apiService from "@/common/api"
@ -310,7 +309,7 @@
} }
export default { export default {
components: { BpeAddressinfoTmp, BpeGoodstaticTmp, BpeCostTmp, BpeGooditemEditTmp, BpeGoodphotoTmp, BpeGoodKuaidiTmp, BpeGoodsizeTmp, TpxBluetoothPrintPreview }, components: { BpeAddressinfoTmp, BpeGoodstaticTmp, BpeCostTmp, BpeGooditemEditTmp, BpeGoodphotoTmp, BpeGoodKuaidiTmp, TpxBluetoothPrintPreview },
props: { props: {
// hasLeftWin: { // hasLeftWin: {
// type: Boolean // type: Boolean