From 8d61dc60466e243414d2a05106bf8cf173fb47f0 Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期六, 31 八月 2024 13:48:55 +0800
Subject: [PATCH] feat:PVC增加分配数

---
 pages/customer-page/customer-index/customer-index.vue |   38 +++++++++++++++++++++++++-------------
 1 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/pages/customer-page/customer-index/customer-index.vue b/pages/customer-page/customer-index/customer-index.vue
index ad259f5..01fa8bb 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">
@@ -34,8 +34,8 @@
 						@click="cardBodyClick(item)">
 						<view class="first-line">
 							<view class="dispatch-receive">
-								<view class="dispatch-dept">{{ item.deptName }}</view>
-								<view class="black-bar"></view>
+								<!-- <view class="dispatch-dept">{{ item.deptName }}</view>
+								<view class="black-bar"></view> -->
 								<view class="dispatch">{{ item.filedName }}</view>
 							</view>
 							<view class="point-number">
@@ -50,7 +50,7 @@
 						</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 }}</view>
 								<view class="black-bar"></view>
 								<view class="coal-type"
 									v-if="item.orderType">{{ item.orderType }}</view>
@@ -62,14 +62,16 @@
 						<view class="third-line">
 							<view class="time-icon">
 								<view
-									style="width: 12rpx;height: 12rpx;line-height: 24rpx;background: url('https://mx.jzeg.cn:9096/appimg/image/banner/clock.png') no-repeat;background-size: cover">
+									style="width: 12rpx;height: 12rpx;line-height: 24rpx;background: url('https://wrzs.czjlchem.com:9090/appimg/image/banner/clock.png') no-repeat;background-size: cover">
 								</view>
 							</view>
 							<view class="send-date">{{ item.sendDate }}</view>
 						</view>
 						<view class="fourth-line">
 							<view class="receive"
-								@click.stop="receiveClick(item)">
+								@click.stop="receiveClick(item)"
+								v-if="Number(item.cars2)  <  Number(item.carNum)"
+								>
 								<view class="button-image">棰嗗彇</view>
 							</view>
 							<view class="forward"
@@ -98,7 +100,7 @@
 							:key="index"
 							@click="faYundetail(item)">
 							<view class="first">
-								<view class="">{{ item.deptName || '' }}</view>
+								<view class="">{{ item.filedName || '' }}</view>
 								<view class=""><u-icon name="arrow-right"
 										color="#999999"
 										size="40"></u-icon></view>
@@ -127,7 +129,7 @@
 							<view class="fourth">
 								<view class="fourth-icon">
 									<view
-										style="width: 24rpx;height: 24rpx;line-height: 24rpx;background: url('https://mx.jzeg.cn:9096/appimg/image/banner/clock.png') no-repeat;background-size: cover">
+										style="width: 24rpx;height: 24rpx;line-height: 24rpx;background: url('https://wrzs.czjlchem.com:9090/appimg/image/banner/clock.png') no-repeat;background-size: cover">
 									</view>
 								</view>
 								<view class="senddate">{{ item.sendDate }}</view>
@@ -135,7 +137,7 @@
 							<view class="fourth">
 								<view class="fourth-icon">
 									<view
-										style="width: 26rpx;height: 26rpx;line-height: 26rpx;background: url('https://mx.jzeg.cn:9096/appimg/image/banner/carnNUm.png') no-repeat;background-size: cover;">
+										style="width: 26rpx;height: 26rpx;line-height: 26rpx;background: url('https://wrzs.czjlchem.com:9090/appimg/image/banner/carnNUm.png') no-repeat;background-size: cover;">
 									</view>
 								</view>
 								<view class="senddate">{{ item.orderCode }}</view>
@@ -355,7 +357,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}`});
 			},
 			// 鑷富閰嶉��
 			selfDeliver() {
@@ -477,9 +479,12 @@
 				justify-content: flex-start;
 
 				.coal-name {
-					min-width: vww(30);
+					width: 70%;
 					height: vww(50);
 					margin-right: vww(21);
+				    white-space: nowrap; /* 涓嶆崲琛� */  
+				   overflow: hidden; /* 瓒呭嚭闅愯棌 */  
+				   text-overflow: ellipsis; 
 				}
 
 				.order-type {
@@ -587,7 +592,7 @@
 							}
 
 							.dispatch {
-								margin-left: vww(12);
+								// margin-left: vww(12);
 								min-width: vww(50);
 							}
 
@@ -612,7 +617,7 @@
 
 					.second-line {
 						width: 100%;
-						height: vww(90);
+						height: vww(50);
 						margin-left: vww(16);
 						display: flex;
 						align-items: center;
@@ -620,6 +625,7 @@
 						    margin-bottom: 15rpx;
 
 						.coal-name {
+							width: 80%;
 							flex-grow: 1;
 							height: 30rpx;
 							font-size: 30rpx;
@@ -629,6 +635,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