From fc83822df8fffc62f726d3811dd72e43d7b62a90 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期四, 28 十一月 2024 13:54:07 +0800
Subject: [PATCH] feat:大厅检查对应提示

---
 pages/customer-page/customer-index/customer-index.vue |   28 ++++++++++++++++++++++------
 1 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/pages/customer-page/customer-index/customer-index.vue b/pages/customer-page/customer-index/customer-index.vue
index 953c7f0..dd52a70 100644
--- a/pages/customer-page/customer-index/customer-index.vue
+++ b/pages/customer-page/customer-index/customer-index.vue
@@ -5,7 +5,7 @@
 				
 				<!-- 寰呴鍙栧拰杞彂鏀跺彂鍗� -->
 				<view class="wait-collection"
-					style="background: url('https://mx.jzeg.cn:9096/appimg/image/banner/customerbanner.png') no-repeat;background-size:contain">
+					style="background: url('https://wrzs.czjlchem.com:9090/appimg/image/banner/customerbanner.png') no-repeat;background-size:contain">
 				</view>
 					<!-- 鑷富閰嶉�佺晫闈� -->
 				<view class="self-deliver" v-if="personnelType === 1">
@@ -50,14 +50,18 @@
 						</view>
 						<view class="second-line">
 							<view class="coal-name">
-								<view class="">{{ item.productNames || item.productName }}</view>
+								<view class="coal-name-tag">{{ item.productNames || item.productName }}	<text style="margin-left: 20rpx;">{{ proType[item.packingType]}}</text> </view>
+							
 								<view class="black-bar"></view>
 								<view class="coal-type"
 									v-if="item.orderType">{{ item.orderType }}</view>
 							</view>
 						</view>
 						<view class="second-line">
-							{{item.orderCode}}
+							<text>璁㈠崟缂栧彿锛�</text>{{item.orderCode}}
+						</view>
+							<view class="second-line">
+							<text>鏃ヨ鍒掔紪鍙凤細</text>{{item.code}}
 						</view>
 						<view class="third-line">
 							<view class="time-icon">
@@ -106,7 +110,7 @@
 										size="40"></u-icon></view>
 							</view>
 							<view class="second">
-								<view class="coal-name">{{  item.productNames || item.productName }}</view>
+								<view class="coal-name">{{  item.productNames || item.productName }} 	<text style="margin-left: 20rpx;">{{ proType[item.packingType]}}</text></view>
 								<view class="order-type">{{ item.orderType || '' }}</view>
 							</view>
 							<view class="third">
@@ -202,6 +206,7 @@
 		data() {
 			return {
 				orderPlanData: [],
+			    proType:['鏁h','娑叉隘鐡惰','缃愯','PVC25','PVC80','PVC1150','PVc1200'],
 				personnelType:'', // 鐢ㄦ埛绫诲瀷
 				show: false, // 棰嗗彇鏀跺彂鍗曞脊鍑烘
 				receiveNum: null,
@@ -324,7 +329,9 @@
 			 * 棰嗗彇寮规
 			 */
 			receiveClick(item) {
+				console.log(item,'213')
 				this.show = true;
+				this.receiveNum = item.carNum;
 				this.getOrderNum.id = item.id; // 鑾峰彇棰嗗彇鏀跺彂鍗曠殑id
 				this.cars2 = item.cars2
 				this.carNum = item.carNum
@@ -357,7 +364,7 @@
 				console.log(111,obj)
 				if (obj.cars2 == 0) return this.$u.toast('璇峰厛棰嗗彇鍚庡啀杞彂');
 				uni
-					.navigateTo({ url: `/pages/public-page/forward/forward?orderPlanId=${obj.id}&orderType=${obj.orderType}&carNumSurplus1=${obj.carNumSurplus1}&carNum=${obj.carNum}&cars2=${obj.cars2}` });
+					.navigateTo({ url: `/pages/public-page/forward/forward?orderPlanId=${obj.id}&orderType=${obj.orderType}&carNumSurplus1=${obj.carNumSurplus1}&carNum=${obj.carNum}&cars2=${obj.cars2}&productName=${obj.productName}&customerId=${obj.customerId}&pvcPlanMeasure=${obj.pvcPlanMeasure}&packingType=${obj.packingType}`});
 			},
 			// 鑷富閰嶉��
 			selfDeliver() {
@@ -482,6 +489,9 @@
 					width: 70%;
 					height: vww(50);
 					margin-right: vww(21);
+				    white-space: nowrap; /* 涓嶆崲琛� */  
+				   overflow: hidden; /* 瓒呭嚭闅愯棌 */  
+				   text-overflow: ellipsis; 
 				}
 
 				.order-type {
@@ -614,7 +624,7 @@
 
 					.second-line {
 						width: 100%;
-						height: vww(90);
+						height: vww(50);
 						margin-left: vww(16);
 						display: flex;
 						align-items: center;
@@ -632,6 +642,12 @@
 							display: flex;
 							margin-top: 20rpx;
 							align-items: center;
+							.coal-name-tag{
+								width: 70%;
+							white-space: nowrap; /* 涓嶆崲琛� */  
+							overflow: hidden; /* 瓒呭嚭闅愯棌 */  
+					   		 text-overflow: ellipsis; 
+							}
 
 							.black-bar {
 								width: 2rpx;

--
Gitblit v1.9.1