aike/emis-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

uu

Browse Source
This commit is contained in:
aihe 2024-05-02 00:46:30 +08:00
parent 4a82957ea0
commit 92e11321c1
7 changed files with 55 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/api/order.js
View File

@ -5,6 +5,7 @@ export const createOrderNo = (data = {})=> {
return coreRequest(url.createOrderNo, data, {}) return coreRequest(url.createOrderNo, data, {})
} }
// 下单-- 新增
export const submitOrder = (data = {})=> { export const submitOrder = (data = {})=> {
return coreRequest(url.submitOrder, data, {}) return coreRequest(url.submitOrder, data, {})
} }
@ -53,6 +54,12 @@ export const calcWaybillFee = (data = {})=> {
return coreRequest(url.calcWaybillFee, data, {}) return coreRequest(url.calcWaybillFee, data, {})
} }
// 计算结算重量、体积重量
export const calcSetteldWeight = (data = {})=> {
return coreRequest(url.calcSetteldWeight, data, {})
}
// 下单-进仓列表 // 下单-进仓列表
export const warehouseInList = (data = {})=> { export const warehouseInList = (data = {})=> {
return coreRequest(url.warehouseInList, data, {}, "GET") return coreRequest(url.warehouseInList, data, {}, "GET")

1
common/api/url.js
View File

@ -28,6 +28,7 @@ export default {
getDestPositionList: `/emis/emisDestination/listSimple`, // 目的地 列表 getDestPositionList: `/emis/emisDestination/listSimple`, // 目的地 列表
getCaculteDestSite: `/emis/emisDestination/getDestSite`, // 自动计算目的地 getCaculteDestSite: `/emis/emisDestination/getDestSite`, // 自动计算目的地
calcWaybillFee: `/emis/emisQuotePrice/calcWaybillFee`, // 计算运费 calcWaybillFee: `/emis/emisQuotePrice/calcWaybillFee`, // 计算运费
calcSetteldWeight: `/emis/emisWaybill/calcSetteldWeight`, // 计算结算重量、结算体积
warehouseInList: `/emis/emisWarehouseIn/listSimple`, // 下单-进仓单列表 warehouseInList: `/emis/emisWarehouseIn/listSimple`, // 下单-进仓单列表
} }

2
components/buns-goodinfo-sheet/buns-goodinfo-sheet.vue
View File

@ -136,7 +136,7 @@
<view class="edm-input-item" style="padding-top: 24rpx;padding-bottom: 24rpx;"> <view class="edm-input-item" style="padding-top: 24rpx;padding-bottom: 24rpx;">
<tpx-text-item label="保存物品信息"> <tpx-text-item label="保存物品信息">
<template v-slot:right> <template v-slot:right>
<u-switch v-model="modelInfo.isSave" active-color="#B12D29" size="34"></u-switch> <u-switch v-model="modelInfo.isSave" activeValue="1" inactiveValue="0" active-color="#B12D29" size="34"></u-switch>
</template> </template>
</tpx-text-item> </tpx-text-item>

2
components/buns-post-edit-templates/bpe-good-kuaidi-tmp.vue
View File

@ -36,7 +36,7 @@
<view class="edm-input-item"> <view class="edm-input-item">
<tpx-text-item label="是否需要代垫运费"> <tpx-text-item label="是否需要代垫运费">
<template v-slot:right> <template v-slot:right>
<u-switch v-model="modelInfo.blPrepareInFreight" active-color="#B12D29" size="34"></u-switch> <u-switch v-model="modelInfo.blPrepareInFreight" activeValue="1" inactiveValue="0" active-color="#B12D29" size="34"></u-switch>
</template> </template>
</tpx-text-item> </tpx-text-item>
</view> </view>

17
components/buns-post-edit-templates/bpe-goodsize-tmp.vue
View File

@ -41,6 +41,7 @@
</template> </template>
<script> <script>
import * as apiService from "@/common/api"
export default { export default {
computed: { computed: {
modelInfo: { modelInfo: {
@ -56,7 +57,7 @@
} }
if(totalVolume && totalVolume.toFixed) { if(totalVolume && totalVolume.toFixed) {
totalVolume = totalVolume.toFixed(2) totalVolume = totalVolume.toFixed(2)
this.calcuOther({ totalVolume }) this.modelInfo.totalVolume = totalVolume
} }
return totalVolume return totalVolume
} }
@ -82,11 +83,15 @@
}, },
methods: { methods: {
calcuOther({ totalVolume }) { async calceOther() {
this.modelInfo.totalVolume = totalVolume let { totalVolume, productType, billWeight } = this.modelInfo
this.modelInfo.volumeWeight = (this.modelInfo.totalVolume ) * (1000000 / this.modelInfo.meterRate) let res = await apiService.calcSetteldWeight({ totalVolume, productType, billWeight })
let maxVal = Math.max(this.modelInfo.volumeWeight, this.modelInfo.billWeight) const { settlementWeight, volumeWeight } = res.data
this.modelInfo.settlementWeight = this.modelInfo.totalWeight = maxVal this.modelInfo.volumeWeight = volumeWeight
this.modelInfo.settlementWeight = this.modelInfo.totalWeight = settlementWeight
},
async validData() {
await this.calceOther()
} }
} }
} }

11
pages/post/model.js
View File

@ -53,7 +53,7 @@ export const getOrderModels = () => {
"customerDeliveryBeginTime": undefined, "customerDeliveryBeginTime": undefined,
"goodsType": undefined, "goodsType": undefined,
"goodsInfo": undefined, "goodsInfo": undefined,
"totalWeight": undefined, // 总重量 "totalWeight": undefined, // 总重量 = 结算重量
"totalVolume": undefined, // 总体积 "totalVolume": undefined, // 总体积
"parcelQty": undefined, // 总件数 "parcelQty": undefined, // 总件数
"billWeight": undefined, // 实际重量 "billWeight": undefined, // 实际重量
@ -84,8 +84,8 @@ export const getOrderModels = () => {
"payee": undefined, // 回款联系人 "payee": undefined, // 回款联系人
"salesmen": undefined, // 销售员 "salesmen": undefined, // 销售员
"operateEmployeeCode": undefined, // 操作员 "operateEmployeeCode": undefined, // 操作员
"blMessage": undefined, // 寄件 短信开关 "blMessage": 0, // 寄件 短信开关
"blAcceptMessage": undefined, // 签收 短信开关 "blAcceptMessage": 0, // 签收 短信开关
"remark": undefined, // 备注 "remark": undefined, // 备注
"customerCode": undefined, // 客户code "customerCode": undefined, // 客户code
"feeItems": [ // 计费信息 "feeItems": [ // 计费信息
@ -124,14 +124,15 @@ export const getOrderModels = () => {
// "isSave": "是否保存 1-保存" // "isSave": "是否保存 1-保存"
// } // }
], ],
"blPrepareInFreight": undefined, // 是否入仓代垫运费 1-是 0-否 "blPrepareInFreight": 0, // 是否入仓代垫运费 1-是 0-否
"prepareInEstFee": undefined, // 入仓代垫运费 "prepareInEstFee": undefined, // 入仓代垫运费
"prepareInRealFee": undefined, // 代垫实际运费 "prepareInRealFee": undefined, // 代垫实际运费
"prepareInExpress": undefined, // 快递公司 "prepareInExpress": undefined, // 快递公司
"prepareInBillCode": undefined, // 快递单号 "prepareInBillCode": undefined, // 快递单号
"prepareInRemark": undefined, // 预入仓自定义标识 "prepareInRemark": undefined, // 预入仓自定义标识
"prepareInSupplier": undefined, // 预入仓供应商 "prepareInSupplier": undefined, // 预入仓供应商
"warehouseInNo": undefined, // 进仓单号 "warehouseInNo": "", // 进仓单号
"meterRate": undefined, // 泡重比 "meterRate": undefined, // 泡重比
"goodsPics": "", // 货物图片
} }
} }

47
pages/post/openorder.vue
View File

@ -18,7 +18,7 @@
<u-row justify="between" custom-style="margin-top:20rpx;"> <u-row justify="between" custom-style="margin-top:20rpx;">
<view style="width: 130rpx;">客户</view> <view style="width: 130rpx;">客户</view>
<view style="flex:1;"> <view style="flex:1;">
<tpx-select v-model:resObject="kehuRes" :getListFun="getCustomerUserList" :transKeyVal="{valKey: 'customerCode',titleKey: 'customerFullName'}" v-model:value="submitParam.customerCode" :isWhite="true"></tpx-select> <tpx-select v-model:resObject="kehuRes" :getListFun="getCustomerUserList" :transKeyVal="{valKey: 'customerCode',titleKey: 'customerName'}" v-model:value="submitParam.customerCode" :isWhite="true"></tpx-select>
</view> </view>
</u-row> </u-row>
</view> </view>
@ -160,7 +160,7 @@
<tpx-text-item label="寄件短信"> <tpx-text-item label="寄件短信">
<template v-slot:right> <template v-slot:right>
<text class="pr-20 clr-sub">是否短信</text> <text class="pr-20 clr-sub">是否短信</text>
<u-switch v-model="submitParam.blMessage" active-color="#B12D29" size="34"></u-switch> <u-switch v-model="submitParam.blMessage" activeValue="1" inactiveValue="0" active-color="#B12D29" size="34"></u-switch>
</template> </template>
</tpx-text-item> </tpx-text-item>
</view> </view>
@ -169,7 +169,7 @@
<tpx-text-item label="收件短信"> <tpx-text-item label="收件短信">
<template v-slot:right> <template v-slot:right>
<text class="pr-20 clr-sub">是否短信</text> <text class="pr-20 clr-sub">是否短信</text>
<u-switch v-model="submitParam.blAcceptMessage" active-color="#B12D29" size="34"></u-switch> <u-switch v-model="submitParam.blAcceptMessage" activeValue="1" inactiveValue="0" active-color="#B12D29" size="34"></u-switch>
</template> </template>
</tpx-text-item> </tpx-text-item>
</view> </view>
@ -212,17 +212,17 @@
<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;">
<u-row> <u-row>
<u-button 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>
<u-button size="large" shape="circle" <u-button @click="handleSave('print')" size="large" shape="circle"
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>
</template> </template>
</tpx-layout> </tpx-layout>
<buns-edit-sheet percentHeight="70" title="商品信息" v-model:show="goodChooseModal.show" v-model:value="submitParam" v-slot="tempObject"> <buns-edit-sheet percentHeight="70" title="商品信息" v-model:show="goodChooseModal.show" v-model:value="submitParam" v-slot="tempObject" @onSure="handleGoodInfoSure">
<view class="mb-20">托寄货物描述</view> <view class="mb-20">托寄货物描述</view>
<bpe-gooditem-edit-tmp :value="tempObject.value"></bpe-gooditem-edit-tmp> <bpe-gooditem-edit-tmp :value="tempObject.value"></bpe-gooditem-edit-tmp>
<view class="mt-30"> <view class="mt-30">
@ -232,7 +232,7 @@
<bpe-good-kuaidi-tmp :value="tempObject.value"></bpe-good-kuaidi-tmp> <bpe-good-kuaidi-tmp :value="tempObject.value"></bpe-good-kuaidi-tmp>
</view> </view>
<view class="mt-30"> <view class="mt-30">
<bpe-goodsize-tmp :value="tempObject.value"></bpe-goodsize-tmp> <bpe-goodsize-tmp ref="goodSize" :value="tempObject.value"></bpe-goodsize-tmp>
</view> </view>
</buns-edit-sheet> </buns-edit-sheet>
</tpx-page> </tpx-page>
@ -285,17 +285,6 @@
sendSiteCode: this.$store.getters.userInfo.ownerSiteCode, sendSiteCode: this.$store.getters.userInfo.ownerSiteCode,
dispatchUnderlingSiteCode: info.dispatchUnderlingSiteCode, dispatchUnderlingSiteCode: info.dispatchUnderlingSiteCode,
} }
// TODO
param = {
"productType": "24202",
"customerCode": "1",
"custNo": "1",
"calcFeeType": "1",
"settlementWeight": "2.3",
"totalVolume": "0.03",
"sendSiteCode": "25001",
"dispatchUnderlingSiteCode": "95001"
}
return param return param
}, },
isShowJifei(){ isShowJifei(){
@ -305,6 +294,9 @@
}, },
data() { data() {
return { return {
queryOption: {
id: '', // 运单id
},
kehuRes: { list: [] }, kehuRes: { list: [] },
wayRes: { list: [] }, wayRes: { list: [] },
productRes: { list: [] }, productRes: { list: [] },
@ -328,7 +320,8 @@
// path: 'TODO' // path: 'TODO'
} }
}, },
onLoad() { onLoad(option) {
this.queryOption = queryOption
this.initData(); this.initData();
this.initEvent() this.initEvent()
}, },
@ -381,7 +374,23 @@
// 更新路线推荐的默认目的地 // 更新路线推荐的默认目的地
this.submitParam.destinationCode = res.data.destCode this.submitParam.destinationCode = res.data.destCode
this.handleDestPostChange(this.submitParam.destinationCode) this.handleDestPostChange(this.submitParam.destinationCode)
},
async handleGoodInfoSure() {
// 校验各个组件的参数
let res = await this.$refs.goodSize.validData()
},
async handleSave(type) {
let saveServerHand = apiService.submitOrder
if(this.queryOption.id) {
// 编辑订单 TODO
} }
let params = JSON.parse(JSON.stringify(this.submitParam));
params.warehouseInNo = params.warehouseInNo.join(",")
params.goodsPics = params.goodsPics.join(",")
await saveServerHand(params)
this.showToast('操作成功')
}
} }
} }
</script> </script>