From 33a5b22e2fbe3f6dd790bde62629d0407d135343 Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Tue, 11 Jun 2024 23:15:40 +0800
Subject: [PATCH] uu

---
 .../buns-order-templates/bo-detail-tmp.vue    | 166 +++++++++++++++---
 .../buns-order-templates/bo-operator-tmp.vue  |  12 +-
 .../bpe-addressinfo-tmp.vue                   |   2 +
 .../bpe-coststatic-tmp.vue                    |  92 +++++-----
 .../bpe-goodstatic-tmp.vue                    |  12 ++
 5 files changed, 204 insertions(+), 80 deletions(-)

diff --git a/components/buns-order-templates/bo-detail-tmp.vue b/components/buns-order-templates/bo-detail-tmp.vue
index c768cc7..7eb3a46 100644
--- a/components/buns-order-templates/bo-detail-tmp.vue
+++ b/components/buns-order-templates/bo-detail-tmp.vue
@@ -12,10 +12,17 @@
 				</view>
 			</view> -->
 			<view class="dt-tle">
-				<view class="t1">运单号: {{modelInfo.billCode}}</view>
+				<view class="t1">
+					<u-row @click="setClipboardData(modelInfo.billCode)">
+						运单号: {{modelInfo.billCode}}
+						<view class="pl-10">
+							<u-icon name="file-text" size="32" custom-style=""></u-icon>
+						</view>
+					</u-row>
+				</view>
 				<view class="t2">
 					<text class="clr-prm">
-						<tpx-text-dic :value="modelInfo.billCode" :list="dicData.emis_waybill_status" ></tpx-text-dic>
+						<tpx-text-dic :value="modelInfo.waybillStatus" :list="dicData.emis_waybill_status" ></tpx-text-dic>
 					</text>
 				</view>
 			</view>
@@ -26,15 +33,30 @@
 			
 		</view>
 		
+		<view v-if="modelInfo.blIsQuestion == '1'" class="dt-block">
+			<view class="dt-tle">
+				<view class="t1 clr-prm">问题件</view>
+			</view>
+			<u-line margin="20rpx 0 20rpx"></u-line>
+			<view class="blcok-grey-sm">
+				<view class="dt-item">
+					<u-row>
+						<text class="clr-sub pr-10">问题类型</text>
+						<text class="clr-prm">{{modelInfo.problemTypeName || '-'}}</text>
+					</u-row>
+				</view>
+				<view class="dt-item">
+					<u-row>
+						<text class="clr-sub pr-10">问题原因</text>
+						<text class="clr-prm">{{modelInfo.problemCause || '-'}}</text>
+					</u-row>
+				</view>
+			</view>
+		</view>
 		
 		<view class="dt-block">
 			<view class="dt-tle">
 				<view class="t1">托寄货物描述</view>
-				<view class="t2">
-					<text class="clr-prm">
-						<tpx-text-dic :value="modelInfo.waybillStatus" :list="dicData.emis_waybill_status" ></tpx-text-dic>
-					</text>
-				</view>
 			</view>
 			<u-line margin="20rpx 0 20rpx"></u-line>
 			<view class="">
@@ -45,7 +67,7 @@
 			<u-row justify="end">
 				<view style="display: inline-block;white-space: nowrap;" class="mt-10">
 					<u-row>
-						<u-button @click="goto(`warehousing/detail?id=${211}`)" shape="circle" type="primary"
+						<u-button v-if="modelInfo.pickupMethod == 1" @click="goto(`warehousing/detail?id=${211}`)" shape="circle" type="primary"
 							custom-style="height: 54rpx;margin-left: 20rpx;">入仓单</u-button>
 						<u-button shape="circle" type="primary" :plain="true"
 							custom-style="height: 54rpx;margin-left: 20rpx;">单证</u-button>
@@ -97,23 +119,13 @@
 					</view>
 				</view>
 				<view class="dt-item">
-					<u-row>
-						<text class="clr-sub pr-10">付款方式</text>
-						<text class="">
-							<tpx-text-dic :value="modelInfo.paymentType" :list="dicData.emis_payment_type" ></tpx-text-dic>
-						</text>
-					</u-row>
+					
 					<view>
 						<text class="clr-sub pr-10">时效</text>
 						<text class="">{{modelInfo.timeType}}</text>
 					</view>
 				</view>
-				<view v-if="isShowYueJie" class="dt-item">
-					<u-row>
-						<text class="clr-sub pr-10">月结账号</text>
-						<text class="">{{modelInfo.custNo}}</text>
-					</u-row>
-				</view>
+				
 				<view class="dt-item">
 					<u-row>
 						<text class="clr-sub pr-10">报关方式</text>
@@ -128,6 +140,18 @@
 						</text>
 					</u-row>
 				</view>
+				<view class="dt-item">
+					<u-row>
+						<text class="clr-sub pr-10">寄件时间</text>
+						<text>{{modelInfo.sendDate || '-'}}</text>
+					</u-row>
+				</view>
+				<view class="dt-item">
+					<u-row>
+						<text class="clr-sub pr-10">预计到达时间</text>
+						<text>{{modelInfo.estimateDate || '-'}}</text>
+					</u-row>
+				</view>
 			</view>
 		</view>
 		
@@ -138,21 +162,45 @@
 			</view>
 			<u-line margin="20rpx 0 20rpx"></u-line>
 			<view class="">
+				<view class="dt-item">
+					<u-row>
+						<text class="clr-sub pr-10">付款方式</text>
+						<text class="">
+							<tpx-text-dic :value="modelInfo.paymentType" :list="dicData.emis_payment_type" ></tpx-text-dic>
+						</text>
+					</u-row>
+				</view>
+				<view v-if="isShowYueJie">
+					<view class="dt-item">
+						<u-row>
+							<text class="clr-sub pr-10">月结客户</text>
+							<text class="">{{modelInfo.customerName}}</text>
+						</u-row>
+					</view>
+				</view>
+				<view class="dt-item">
+					<u-row>
+						<text class="clr-sub pr-10">回款联系人</text>
+						<text class="">{{modelInfo.payee || '-'}}</text>
+					</u-row>
+					<u-row>
+						<text class="clr-sub pr-10">销售联系人</text>
+						<text class="">{{modelInfo.salesmen || '-'}}</text>
+					</u-row>
+				</view>
+				
 				<bpe-coststatic-tmp v-model:value="modelInfo"></bpe-coststatic-tmp>
 			</view>
 		</view>
 		
+		
 		<view class="dt-block">
 			<view class="dt-tle">
-				<view class="t1">取件信息</view>
-				<view class="t2">
-					<text class="clr-prm">
-						
-					</text>
-				</view>
+				<view class="t1">取件、派件信息</view>
 			</view>
 			<u-line margin="20rpx 0 20rpx"></u-line>
 			<view class="blcok-grey-sm">
+				<view class="mb-10 font-weight">取件信息</view>
 				<view class="dt-item">
 					<u-row>
 						<text class="clr-sub pr-10">取货方式</text>
@@ -178,7 +226,57 @@
 				</view>
 			</view>
 			
-			<u-line margin="20rpx 0 10rpx 0"></u-line>
+			<view class="blcok-grey-sm">
+				<view class="mb-10 font-weight">派件信息</view>
+				<view class="dt-item">
+					<u-row>
+						<text class="clr-sub pr-10">派送方式</text>
+						<text class="">
+							<tpx-text-dic :value="modelInfo.dispatchMethod" :list="dicData.emis_tab_dispatch_mode" ></tpx-text-dic>
+						</text>
+					</u-row>
+					<u-row>
+						<text class="clr-sub pr-10">派件员</text>
+						<text>{{modelInfo.dispatchManName || '-'}}</text>
+					</u-row>
+				</view>
+				<view class="dt-item">
+					<u-row>
+						<text class="clr-sub pr-10">派送网点</text>
+						<text>{{modelInfo.dispatchSiteName || '-'}}</text>
+					</u-row>
+				</view>
+				<view class="dt-item">
+					<u-row>
+						<text class="clr-sub pr-10">派送时间</text>
+						<text>{{modelInfo.dispatchDate || '-'}}</text>
+					</u-row>
+				</view>
+			</view>
+			
+			<view class="blcok-grey-sm">
+				<view class="mb-10 font-weight">签收信息</view>
+				<view class="dt-item">
+					<u-row>
+						<text class="clr-sub pr-10">签收人</text>
+						<text>{{modelInfo.signMan || '-'}}</text>
+					</u-row>
+				</view>
+				<view class="dt-item">
+					<u-row>
+						<text class="clr-sub pr-10">签收站点</text>
+						<text>{{modelInfo.signSiteName || '-'}}</text>
+					</u-row>
+				</view>
+				<view class="dt-item">
+					<u-row>
+						<text class="clr-sub pr-10">签收时间</text>
+						<text>{{modelInfo.signDate || '-'}}</text>
+					</u-row>
+				</view>
+			</view>
+			
+			<!-- <u-line margin="20rpx 0 10rpx 0"></u-line>
 			<u-row justify="between">
 				<u-text text="快递员" size="28" :bold="true"></u-text>
 				<u-row>
@@ -187,7 +285,17 @@
 						<u-avatar size="50" :src="''"></u-avatar>
 					</view>
 				</u-row>
-			</u-row>
+			</u-row> -->
+		</view>
+		
+		<view class="dt-block">
+			<view class="dt-tle">
+				<view class="t1">运单备注</view>
+			</view>
+			<u-line margin="20rpx 0 20rpx"></u-line>
+			<view class="blcok-grey-sm">
+				<view class="dt-item">{{modelInfo.remark || '-'}}</view>
+			</view>
 		</view>
 		
 		<view class="dt-block">
@@ -314,7 +422,7 @@
 		justify-content: space-between;
 		.t1 {
 			font-size: 30rpx;
-			font-weight: 600;
+			font-weight: 700;
 		}
 		.t2{
 			font-size: 30rpx;
diff --git a/components/buns-order-templates/bo-operator-tmp.vue b/components/buns-order-templates/bo-operator-tmp.vue
index ac6a664..e55b88d 100644
--- a/components/buns-order-templates/bo-operator-tmp.vue
+++ b/components/buns-order-templates/bo-operator-tmp.vue
@@ -3,13 +3,19 @@
 		<u-row justify="between">
 			<view>
 				<text class="clr-sub pr-10">操作员</text>
-				<text>{{userInfo.empName}}({{userInfo.ownerSiteName}})</text>
+				<text>{{userInfo.empName}}
+				<!-- ({{userInfo.ownerSiteName}}) -->
+				</text>
 			</view>
 			<view>
 				<slot name="titleRight"></slot>
 			</view>
 		</u-row>
 		<u-row justify="between" custom-style="flex-wrap:wrap;">
+			<u-col span="6" align="center">
+				<view class="mt-20 clr-prm font-34 font-weight">{{staticInfo.piaoNum}}</view>
+				<view class="mt-10 clr-sub font-28">总票数</view>
+			</u-col>
 			<u-col span="6" align="center">
 				<view class="mt-20 clr-prm font-34 font-weight">{{staticInfo.parcelQty}}</view>
 				<view class="mt-10 clr-sub font-28">总件数</view>
@@ -22,10 +28,6 @@
 				<view class="mt-20 clr-prm font-34 font-weight">{{staticInfo.totalVolume}}</view>
 				<view class="mt-10 clr-sub font-28">总体积(m³)</view>
 			</u-col>
-			<u-col span="6" align="center">
-				<view class="mt-20 clr-prm font-34 font-weight">{{staticInfo.piaoNum}}</view>
-				<view class="mt-10 clr-sub font-28">总票数</view>
-			</u-col>
 		</u-row>
 	</view>
 </template>
diff --git a/components/buns-post-edit-templates/bpe-addressinfo-tmp.vue b/components/buns-post-edit-templates/bpe-addressinfo-tmp.vue
index 1462897..3ce5d5b 100644
--- a/components/buns-post-edit-templates/bpe-addressinfo-tmp.vue
+++ b/components/buns-post-edit-templates/bpe-addressinfo-tmp.vue
@@ -17,6 +17,7 @@
 				</view>
 				<view style="margin: 8rpx 0 0 0;">
 					<u-text :text="sendDetail" size="26" color="#999"></u-text>
+					<view class="font-weight mt-10 font-24">{{modelInfo.sender.company}}</view>
 				</view>
 			</view>
 			<view v-if="!disabled" class="flex-column-center" style="flex-shrink:0;">
@@ -55,6 +56,7 @@
 				</view>
 				<view style="margin: 8rpx 0 0 0;">
 					<u-text :text="recieverDetail" size="26" color="#999"></u-text>
+					<view class="font-weight mt-10 font-24">{{modelInfo.reciever.company}}</view>
 				</view>
 			</view>
 			<view v-if="!disabled" class="flex-column-center" style="flex-shrink:0;">
diff --git a/components/buns-post-edit-templates/bpe-coststatic-tmp.vue b/components/buns-post-edit-templates/bpe-coststatic-tmp.vue
index 1024fb8..e3a1e2f 100644
--- a/components/buns-post-edit-templates/bpe-coststatic-tmp.vue
+++ b/components/buns-post-edit-templates/bpe-coststatic-tmp.vue
@@ -1,13 +1,46 @@
 <template>
 	<view class="shet-cont">
 		
-		<view>
+		<view v-for="(item, index) in modelInfo.feeItems" class="jsfm-item">
+			<!-- 手动添加的才能删除 -->
+			<view>
+				<text class="font-weight font-30">{{item.feeName}}</text>
+			</view>
+			<view>
+				<u-row justify="between">
+					<view>
+						<text class="clr-sub">实收</text> {{item.realFee || 0}}<text class="clr-sub pl-10">CNY</text>
+					</view>
+					<view >
+						<text class="clr-sub">应收</text> {{item.fee || 0}}<text class="clr-sub pl-10">CNY</text>
+					</view>
+				</u-row>
+			</view>
+			<view class="pt-10">
+				<u-row justify="between">
+					<view >
+						<text class="clr-sub">首重费</text> {{item.initialWeightFee || 0}}<text class="clr-sub pl-10">CNY</text>
+					</view>
+					<view>
+						<text class="clr-sub">续重单价</text> {{item.addWeightPrice || 0}}<text class="clr-sub pl-10">CNY</text>
+					</view>
+				</u-row>
+			</view>
+			<view v-if="item.calcExp" class="pt-10">
+				<text class="clr-sub">描述</text> {{item.remark}}
+			</view>
+		</view>
+		
+		
+		<view class="">
 			<u-row justify="between">
 				<view>
-					<text class="clr-sub pr-10">总费用</text>
-					<text >
-						{{modelInfo.freight || 0}}<text class="clr-sub pl-10">CNY</text>
-					</text>
+					<text class="clr-sub pr-10">特殊报价</text>
+					<text>{{modelInfo.blSpecialQuote ? '是' : '否'}}</text>
+				</view>
+				<view>
+					<text class="clr-sub pr-10">敏感物</text>
+					<text>{{modelInfo.blSpecialGoods ? '是' : '否'}}</text>
 				</view>
 				<u-row>
 					<text class="clr-sub pr-10">计费方式</text>
@@ -18,49 +51,16 @@
 			</u-row>
 		</view>
 		
-		<view class="pt-20 pb-20">
-			<u-row justify="between">
-				<view>
-					<text class="clr-sub pr-10">特殊报价</text>
-					<text>{{modelInfo.blSpecialQuote ? '是' : '否'}}</text>
-				</view>
-				<view>
-					<text class="clr-sub pr-10">敏感物</text>
-					<text>{{modelInfo.blSpecialGoods ? '是' : '否'}}</text>
-				</view>
+		<view class="pt-20">
+			<u-row>
+				<text class="clr-sub pr-10">总运费</text>
+				<text >
+					<text class="font-weight clr-prm">{{modelInfo.freight || 0}}</text>
+					<text class="clr-sub pl-10">CNY</text>
+				</text>
 			</u-row>
 		</view>
-		
-		
-
-		<view v-for="(item, index) in modelInfo.feeItems" class="jsfm-item">
-			<!-- 手动添加的才能删除 -->
-			<view>
-				<u-row justify="between">
-					<view>
-						<text class="clr-sub">{{item.feeName}}</text> {{item.realFee || 0}}<text class="clr-sub pl-10">CNY</text>
-					</view>
-					<view >
-						<text class="clr-sub">应收</text> {{item.fee || 0}}<text class="clr-sub pl-10">CNY</text>
-					</view>
-				</u-row>
-			</view>
-			<view class="pt-10">
-				<u-row justify="between">
-					<view>
-						<text class="clr-sub">续重单价</text> {{item.addWeightPrice || 0}}<text class="clr-sub pl-10">CNY</text>
-					</view>
-					<view >
-						<text class="clr-sub">首重费</text> {{item.initialWeightFee || 0}}<text class="clr-sub pl-10">CNY</text>
-					</view>
-				</u-row>
-			</view>
-			<view v-if="item.calcExp" class="pt-10">
-				<text class="clr-sub">计算公式</text> {{item.calcExp}}
-			</view>
-		</view>
-		
-		<view class="">
+		<view class="pt-20">
 			<u-row justify="between">
 				<u-row>
 					<text class="clr-sub pr-10">费用备注</text>
diff --git a/components/buns-post-edit-templates/bpe-goodstatic-tmp.vue b/components/buns-post-edit-templates/bpe-goodstatic-tmp.vue
index b78cfb4..856748e 100644
--- a/components/buns-post-edit-templates/bpe-goodstatic-tmp.vue
+++ b/components/buns-post-edit-templates/bpe-goodstatic-tmp.vue
@@ -108,6 +108,18 @@
 				<tpx-text-dic :value="modelInfo.packType" :list="dicData.emis_tab_packing_type"></tpx-text-dic>
 			</u-row>
 		</view>
+		<view class="pt-30">
+			<u-row justify="">
+				<text class="clr-sub pr-10">是否子单</text> 
+				<text class="">{{modelInfo.blGenSubbill=='1'?'是':'否'}}</text> 		
+			</u-row>
+		</view>
+		<view class="pt-30">
+			<u-row justify="">
+				<text class="clr-sub pr-10">合同号</text> 
+				<text class="">{{modelInfo.custOrderId || '-'}}</text> 		
+			</u-row>
+		</view>
 	</view>
 	
 </template>