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

---
 common/enum.js                                           | 4 ++--
 components/buns-post-edit-templates/bpe-goodsize-tmp.vue | 2 +-
 pages/post/freightCalculate.vue                          | 2 +-
 pages/post/openorder.vue                                 | 3 ++-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/common/enum.js b/common/enum.js
index 37fb6ee..b2ffae7 100644
--- a/common/enum.js
+++ b/common/enum.js
@@ -194,11 +194,11 @@ const dealBtnMap = {
 	shouHuo: {  title: '收货入库', subTitle: "", icon: getCdnUrl(`home/shhruku.png`), url: 'deliveryDeal/storage' },
 	faJianScan: {  title: '发件扫描', subTitle: "", icon: getCdnUrl(`home/fajiansm.png`), url: 'deliveryDeal/qutgoingScanning', code: authCodeEnum.faJianScan },
 	daoJianScan: {  title: '到件扫描', subTitle: "", icon: getCdnUrl(`home/daojsm.png`), url: 'deliveryDeal/arriveScanning', code: authCodeEnum.daoJianScan },
-	yunDanLuRu: {  title: '运单录入', subTitle: "", icon: getCdnUrl(`home/ydluru.png`), url: 'post/openorder' },
+	yunDanLuRu: {  title: '运单录入', subTitle: "", icon: getCdnUrl(`home/ydluru.png`), url: 'post/openorder?type=create' },
 	qianShouScan: {  title: '签收扫描', subTitle: "", icon: getCdnUrl(`home/qianshsm.png`), url: 'deliveryDeal/signedScanning', code: authCodeEnum.qianShouScan },
 	fenBoScan: {  title: '分拨发件', subTitle: "", icon: getCdnUrl(`home/fajiansm.png`), url: 'deliveryDeal/distributeOutgoing' },
 	paiJianScan: {  title: '派件扫描', subTitle: "", icon: getCdnUrl(`home/paijsm.png`), url: 'deliveryDeal/deliveryScanning', code: authCodeEnum.paiJianScan },
-	yunDanXiuGai: {  title: '运单修改', subTitle: "", icon: getCdnUrl(`home/ydxiugai.png`), url: 'post/openorder' },
+	yunDanXiuGai: {  title: '运单修改', subTitle: "", icon: getCdnUrl(`home/ydxiugai.png`), url: 'post/openorder?type=edit' },
 	baoJiaShiSuan: {  title: '报价试算', subTitle: "", icon: getCdnUrl(`home/baojshs.png`), url: 'post/freightCalculate' },
 	wenTiJian: {  title: '问题件', subTitle: "", icon: getCdnUrl(`home/wentijian.png`), url: 'deliveryDeal/problemsRegisteScanning' },
 	daoPaiScan: {  title: '到派扫描', subTitle: "", icon: getCdnUrl(`home/daohsm.png`), url: 'deliveryDeal/arriveDeliveryScanning' },
diff --git a/components/buns-post-edit-templates/bpe-goodsize-tmp.vue b/components/buns-post-edit-templates/bpe-goodsize-tmp.vue
index 6af4723..40ce447 100644
--- a/components/buns-post-edit-templates/bpe-goodsize-tmp.vue
+++ b/components/buns-post-edit-templates/bpe-goodsize-tmp.vue
@@ -84,7 +84,7 @@
 					totalVolume += (+t.volume) || 0
 				})
 				this.modelInfo.parcelQty = parcelQty
-				this.modelInfo.totalVolume = totalVolume
+				this.modelInfo.totalVolume = totalVolume.toFixed(5)
 			},
 			async calceOther() {
 				let { totalVolume, productType, billWeight } = this.modelInfo
diff --git a/pages/post/freightCalculate.vue b/pages/post/freightCalculate.vue
index 42a0746..18b810f 100644
--- a/pages/post/freightCalculate.vue
+++ b/pages/post/freightCalculate.vue
@@ -269,7 +269,7 @@
 				}
 			},
 			handleGoXiaDan() {
-				this.goto(`post/openorder?defaultSubParams=${encodeURIComponent(JSON.stringify(this.submitParam))}`)
+				this.goto(`post/openorder?defaultSubParams=${encodeURIComponent(JSON.stringify(this.submitParam))}&type=create`)
 			}
 		}
 	}
diff --git a/pages/post/openorder.vue b/pages/post/openorder.vue
index 0e8fad1..43842be 100644
--- a/pages/post/openorder.vue
+++ b/pages/post/openorder.vue
@@ -9,7 +9,7 @@
 							<view style="flex:1;">
 								<tpx-scan-input v-model:value="submitParam.billCode" @scanChange="handleScanChange"></tpx-scan-input>
 							</view>
-							<view class="pl-10">
+							<view class="pl-10" v-if="queryOption.type == 'create' || queryOption.copyBillCode">
 								<u-button  @click="handleCreateOrderNo()"
 									custom-style="font-size: 28rpx;padding:0 10rpx;height: 74rpx;" :plain="true" >系统生成</u-button>
 							</view>
@@ -326,6 +326,7 @@
 					pageLoading: true,
 					isEdit: false,
 					queryOption: {
+						type: '', // edit 修改
 						defaultSubParams: '', // 提交默认参数
 						billCode: '', // 运单id
 						orderSn: '', // 订单id