From e8cb1cee361e52a194afe881cbfa8e471acb27da Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Tue, 6 Aug 2024 00:59:04 +0800
Subject: [PATCH] uu

---
 pages/print/courierNote.vue | 102 ++++++++++++++++++++++++------------
 1 file changed, 68 insertions(+), 34 deletions(-)

diff --git a/pages/print/courierNote.vue b/pages/print/courierNote.vue
index 40d10e2..2fec9bb 100644
--- a/pages/print/courierNote.vue
+++ b/pages/print/courierNote.vue
@@ -68,24 +68,16 @@
 						</view>
 						
 						<view class="blcok-white-noradius">
-							<view class="pb-20 com-section">运单列表</view>
-							<view class="pb-20">
-								<u-row>
-									<u-col span="8">
-										<u-row @click="handleSelAll">
-											<view class="com-chk-icon">
-												<u-checkbox-group>
-													<u-checkbox size="26" labelSize="26" label-color=":#999" activeColor="#B12D29"
-														label=""  :checked="resData.list.length > 0 && submitParam.billCode.length == resData.list.length" 
-													></u-checkbox>
-												</u-checkbox-group>
-											</view>
-											<text class="font-weight pl-10">运单号</text>
-										</u-row>
-									</u-col>
-									<u-col span="4">
-										<text class="font-weight">下单时间</text>
-									</u-col>
+							<view class="pb-20 com-section" @click="handleSelAll">
+								<u-row justify="between">
+									<view>运单列表</view>
+									<view class="com-chk-icon">
+										<u-checkbox-group>
+											<u-checkbox size="26" labelSize="26" label-color=":#999" activeColor="#B12D29"
+												label=""  :checked="resData.list.length > 0 && submitParam.billCode.length == resData.list.length" 
+											></u-checkbox>
+										</u-checkbox-group>
+									</view>
 								</u-row>
 							</view>
 							
@@ -93,23 +85,63 @@
 								vdataType="array"
 							>
 								<view slot class="yditem">
-									<u-row>
-										<u-col span="8">
-											<u-row>
-												<view class="com-chk-icon">
-													<u-checkbox-group>
-														<u-checkbox size="26" labelSize="26" label-color=":#999" activeColor="#B12D29"
-															label="" :checked="dlCurrent.checked"
-														></u-checkbox>
-													</u-checkbox-group>
-												</view>
-												<text class="">{{dlCurrent.item.billCode}}</text>
-											</u-row>
-										</u-col>
-										<u-col span="4">
-											<text class="clr-sub">{{dlCurrent.item.sendDate}}</text>
-										</u-col>
+									<u-row justify="between">
+										<u-row @click="setClipboardData(dlCurrent.item.billCode)">
+											<view>
+												<u-text :text="`运单号：${dlCurrent.item.billCode}` " size="26"></u-text>
+											</view>
+											<view class="pl-10">
+												<u-icon name="file-text" size="32" custom-style=""></u-icon>
+											</view>
+										</u-row>
+										<view class="com-chk-icon">
+											<u-checkbox-group>
+												<u-checkbox size="26" labelSize="26" label-color=":#999" activeColor="#B12D29"
+													label="" :checked="dlCurrent.checked"
+												></u-checkbox>
+											</u-checkbox-group>
+										</view>
 									</u-row>
+									
+									<div class="blcok-grey-sm" style="margin-top: 10rpx;margin-bottom: 0;">
+										<u-row justify="between">
+											<view>
+												<text class="clr-sub pr-10">寄件人</text>
+												<text>{{dlCurrent.item.sendName}}</text>
+											</view>
+											<view>
+												<text class="clr-sub pr-10">寄件电话</text>
+												<text>{{dlCurrent.item.sendMobile}}</text>
+											</view>
+										</u-row>
+										<u-row v-if="dlCurrent.item.sendCompany" custom-style="margin-top:6rpx;">
+											<view>
+												<text class="clr-sub pr-10">寄件公司</text>
+												<text>{{dlCurrent.item.sendCompany}}</text>
+											</view>
+										</u-row>
+										<u-row custom-style="margin-top:6rpx;">
+											<view>
+												<text class="clr-sub pr-10">寄件地址</text>
+												<text>{{dlCurrent.item.sendAddress}}</text>
+											</view>
+										</u-row>
+										<view style="background:rgb(218 212 213);height: 1rpx;margin: 5rpx 0;"></view>
+										<u-row custom-style="margin-top:6rpx;">
+											<view>
+												<text class="clr-sub pr-10">收件地址</text>
+												<text>{{dlCurrent.item.receiveAddress}}</text>
+											</view>
+										</u-row>
+										<u-row custom-style="margin-top:6rpx;">
+											<view>
+												<text class="clr-sub pr-10">目的网点</text>
+												<text>{{dlCurrent.item.dispatchUnderlingSiteName}}</text>
+											</view>
+										</u-row>
+									</div>
+									<u-text :text="`下单时间：${dlCurrent.item.sendDate}`" color="#999" size="24"
+										margin="10rpx 0 0 0"></u-text>
 								</view>
 							</tpx-checkitems>
 							
@@ -136,6 +168,7 @@
 	import dayjs from "dayjs"
 	import * as apiService from "@/common/api"
 	import { checkParams } from "@/common/validate"
+	import { getAddressDetail } from "@/common/util"
 	import TpxBluetoothPrintPreview from "@/components/tpx-bluetooth-print/tpx-bluetooth-print-preview"
 	export default {
 		components: {
@@ -192,6 +225,7 @@
 
 		},
 		methods: {
+			getAddressDetail,
 			async getListFun(param){
 				let cpParam = JSON.parse(JSON.stringify(param))
 				cpParam.params.beginSendDate = cpParam._date[0]