From d18a571aa4dacab6928dbc8c6c45d5aa3f291afb Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期三, 31 七月 2024 23:34:01 +0800
Subject: [PATCH] update

---
 pages/order/order-delivery-detail.vue |   50 +++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/pages/order/order-delivery-detail.vue b/pages/order/order-delivery-detail.vue
index 55591f4..ab2e6d1 100644
--- a/pages/order/order-delivery-detail.vue
+++ b/pages/order/order-delivery-detail.vue
@@ -78,6 +78,13 @@
 					uni.navigateBack()
 				}
 			},
+			printDeliveryOrder(item) {
+				// this.$message.showToast('敬请期待')
+				this.$storage.setItem('cache_delivery_order_print',JSON.stringify(item))
+				uni.navigateTo({
+					url:'/sub_pages/supplier/print/print-list'
+				})
+			}
 
 		}
 	}
@@ -87,7 +94,7 @@
 	<view class="list-container order-delivery supplier">
 		<view class="p15">
 			<no-data v-if="!list||list.length==0" style="width: 100%;"></no-data>
-			<view v-for="(item,index) in list" :key="index" @click="toDetail(item)"
+			<view v-for="(item,index) in list" :key="index" 
 				class="m-b-24 order-sale-list list-container">
 				<view class="order-sale-item list-item">
 					<view class="title flex">
@@ -103,41 +110,49 @@
 								<view class="title">{{item.flowerName }}
 								</view>
 							</view>
-							<view class="each-list flex">
-								<view class="each-item">
+							<view class="each-list ">
+								<view class="each-item flex1 flex">
 									<view class="label">颜色</view>
 									<view class="value">{{ item.flowerColor || '-' }}</view>
 
 								</view>
-								<view class="each-item">
+								<view class="each-item flex1 flex">
 									<view class="label">规格</view>
 									<view class="value">{{ item.flowerUnit || '-' }}</view>
 								</view>
 							</view>
 						</view>
 						<view class="each-list price">
-							<view class="each-item">
+							<view class="each-item flex1">
 								<view class="value">¥{{ item.price || '-' }}</view>
 							</view>
-							<view class="each-item">
+							<view class="each-item flex1">
 								<view class="value">x {{ item.num || 0 }}</view>
 							</view>
 						</view>
 
 					</view>
-
 					<view class="line"></view>
 					<view class="delivery-form">
-						<view class="form-item">
+						<view class="form-item flex1">
 							<view class="label">仓库名称</view>
 							<view class="value red">{{item.warehouseName}}</view>
 						</view>
-						<view class="form-item">
+						<view class="form-item flex1">
 							<view class="label">库位名称</view>
 							<view class="value red">{{item.warehouseLocationCode}}</view>
 						</view>
 
 					</view>
+					<!-- #ifdef PUB_SUPPLIER -->
+					<view class="line"></view>
+					<view class="buttons">
+						<view class="button button-1 m-r-0" @click="printDeliveryOrder(item)">打印</view>
+					</view>
+					<!-- #endif -->
+					
+
+
 
 				</view>
 			</view>
@@ -192,11 +207,22 @@
 			border-radius: 4rpx;
 			border: 2rpx dashed #CECECE;
 		}
+
 		.order-sale-list {
 			.order-sale-item {
 				background-color: #fff;
 				margin-bottom: 20rpx;
 				padding: 22rpx;
+				.each-item{
+					.label{
+						min-width: 120rpx;
+						
+					}
+					.label:after{
+						content: ":";
+						margin-right: 10rpx;
+					}
+				}
 
 				.buttons {
 					display: flex;
@@ -270,12 +296,14 @@
 						color: #CF0000;
 					}
 				}
-				.form{
-					.form-item{
+
+				.form {
+					.form-item {
 						height: unset;
 						// min-height: ;
 					}
 				}
+
 				.delivery-form {
 					display: flex;
 					flex-wrap: wrap;

--
Gitblit v1.9.3