diff --git a/common/api/order.js b/common/api/order.js index 34d09b1..ac154f2 100644 --- a/common/api/order.js +++ b/common/api/order.js @@ -48,4 +48,15 @@ export const getCaculteDestSite = (data = {})=> { return coreRequest(url.getCaculteDestSite, data, {}, "GET") } +// 计算运费 +export const calcWaybillFee = (data = {})=> { + return coreRequest(url.calcWaybillFee, data, {}, "GET") +} + +// 下单-进仓列表 +export const warehouseInList = (data = {})=> { + return coreRequest(url.warehouseInList, data, {}, "GET") +} + + diff --git a/common/api/url.js b/common/api/url.js index 6c2bd3f..95fb479 100644 --- a/common/api/url.js +++ b/common/api/url.js @@ -19,6 +19,8 @@ export default { getMonthpayAccountList: `/emis/emisMonthpayAccount/listSimple`, // 月结账号列表 getDestPositionList: `/emis/emisDestination/listSimple`, // 目的地 列表 getCaculteDestSite: `/emis/emisDestination/getDestSite`, // 自动计算目的地 + calcWaybillFee: `/emis/emisQuotePrice/calcWaybillFee`, // 计算运费 + warehouseInList: `/emis/emisWarehouseIn/listSimple`, // 下单-进仓单列表 } diff --git a/components/buns-post-edit-templates/bpe-goodsize-tmp.vue b/components/buns-post-edit-templates/bpe-goodsize-tmp.vue index 516a23b..efd91f5 100644 --- a/components/buns-post-edit-templates/bpe-goodsize-tmp.vue +++ b/components/buns-post-edit-templates/bpe-goodsize-tmp.vue @@ -56,7 +56,7 @@ } if(totalVolume && totalVolume.toFixed) { totalVolume = totalVolume.toFixed(2) - this.modelInfo.totalVolume = totalVolume + this.calcuOther({ totalVolume }) } return totalVolume } @@ -82,7 +82,9 @@ }, methods: { - + calcuOther({ totalVolume }) { + this.modelInfo.totalVolume = totalVolume + } } } diff --git a/pages/post/openorder.vue b/pages/post/openorder.vue index db623ef..cd8c148 100644 --- a/pages/post/openorder.vue +++ b/pages/post/openorder.vue @@ -105,7 +105,7 @@ - + @@ -140,16 +140,10 @@ - - - 进仓单 - - - - - + @@ -285,6 +279,7 @@ shoupaiRes: { list: [] }, yuejieRes: { list: [] }, destPostRes: { list: [] }, + wareRes: { list: [] }, goodChooseModal: { show: false, }, @@ -315,6 +310,8 @@ getMonthpayAccountList: apiService.getMonthpayAccountList, getDestPositionList: apiService.getDestPositionList, getCaculteDestSite: apiService.getCaculteDestSite, + getWarehouseInList: apiService.warehouseInList, + async initData() { // uni.showLoading({ // title: '加载中'