From bedd4a5c180a1065f6ce3fc03c6ee64d23927830 Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Sun, 12 May 2024 13:25:11 +0800
Subject: [PATCH] uu

---
 common/api/order.js                                      | 7 ++++++-
 common/api/url.js                                        | 3 ++-
 components/buns-post-edit-templates/bpe-goodsize-tmp.vue | 8 ++++++--
 pages/user/exclusiveQrcode.vue                           | 5 ++++-
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/common/api/order.js b/common/api/order.js
index 1ddf3a1..52b417d 100644
--- a/common/api/order.js
+++ b/common/api/order.js
@@ -59,11 +59,16 @@ export const calcWaybillFee = (data = {})=> {
 	return coreRequest(url.calcWaybillFee, data, {})
 }
 
-// 计算结算重量、体积重量
+// 计算结算重量
 export const calcSetteldWeight = (data = {})=> {
 	return coreRequest(url.calcSetteldWeight, data, {})
 }
 
+// 体积重量
+export const calcVolumeWeight = (data = {})=> {
+	return coreRequest(url.calcVolumeWeight, data, {})
+}
+
 
 // 下单-进仓列表
 export const warehouseInList = (data = {})=> {
diff --git a/common/api/url.js b/common/api/url.js
index 3867573..d3b5b44 100644
--- a/common/api/url.js
+++ b/common/api/url.js
@@ -34,7 +34,8 @@ export default {
   getDestPositionList: `/emis/emisDestination/listSimple`, // 目的地 列表
   getCaculteDestSite: `/emis/emisDestination/getDestSite`, // 自动计算目的地
   calcWaybillFee: `/emis/emisWaybill/calcWaybillFee`, // 计算运费
-  calcSetteldWeight: `/emis/emisWaybill/calcSetteldWeight`, // 计算结算重量、结算体积
+  calcSetteldWeight: `/emis/emisWaybill/calcSetteldWeight`, // 计算结算重量
+  calcVolumeWeight: `/emis/emisWaybill/calcVolumeWeight`, // 体积重量计算 
   warehouseInList: `/emis/emisWarehouseIn/listSimple`, // 下单-进仓单列表
   
   getOrderList: `/emis/emisWaybill/listSimple`, // 订单列表
diff --git a/components/buns-post-edit-templates/bpe-goodsize-tmp.vue b/components/buns-post-edit-templates/bpe-goodsize-tmp.vue
index 50b0e59..a8d8736 100644
--- a/components/buns-post-edit-templates/bpe-goodsize-tmp.vue
+++ b/components/buns-post-edit-templates/bpe-goodsize-tmp.vue
@@ -85,10 +85,14 @@
 		methods: {
 			async calceOther() {
 				let { totalVolume, productType, billWeight } = this.modelInfo
-				let res = await apiService.calcSetteldWeight({ totalVolume, productType, billWeight })
-				const  { settlementWeight, volumeWeight } = res.data
+				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()
diff --git a/pages/user/exclusiveQrcode.vue b/pages/user/exclusiveQrcode.vue
index 75f967f..c30c1ba 100644
--- a/pages/user/exclusiveQrcode.vue
+++ b/pages/user/exclusiveQrcode.vue
@@ -26,7 +26,7 @@
 								<view style="width: 200rpx;" @click="handleSave">
 									<u-button type="primary" custom-style="border-radius: 10rpx;">保存到本地</u-button>
 								</view>
-								<view style="width: 200rpx;">
+								<view style="width: 200rpx;" @click="handlePrint">
 									<u-button type="primary" plain="true" custom-style="border-radius: 10rpx;">打印</u-button>
 								</view>
 							</u-row>
@@ -68,6 +68,9 @@
 			async handleSave(){
 				this.saveNetFile(this.qrCodeImgUrl)
 			},
+			handlePrint() {
+				this.goto(`print/bluetoothPrinter?imageUrl=${this.qrCodeImgUrl}&paperWidth=${480}`)
+			}
 		}
 	}
 </script>