From 01f3801b895fa50387ba6ac7c28130053bf5e19a Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期二, 19 九月 2023 14:14:40 +0800
Subject: [PATCH] 修改合卡显示,修改司机首页

---
 pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue |   35 +++++++++--------
 pages/customer-page/customer-index/customer-index.vue                                   |   23 +++++++++++
 pages/loadUnload-page/loadUnload-detail/loadUnload-detail.vue                           |   24 +++++++++---
 3 files changed, 58 insertions(+), 24 deletions(-)

diff --git a/pages/customer-page/customer-index/customer-index.vue b/pages/customer-page/customer-index/customer-index.vue
index ccfc926..36f1c8e 100644
--- a/pages/customer-page/customer-index/customer-index.vue
+++ b/pages/customer-page/customer-index/customer-index.vue
@@ -21,6 +21,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">{{ item.filedName }}</view>
 							</view>
 							<view class="point-number">
@@ -495,8 +497,27 @@
 						.dispatch-receive {
 							width: 70%;
 							display: flex;
-							justify-content: space-between;
+							justify-content: flex-start;
 							align-items: center;
+
+							.dispatch-dept {
+
+								display: flex;
+								align-items: center;
+							}
+
+							.black-bar {
+								width: 2rpx;
+								height: 30rpx;
+								background: #515151;
+								margin-left: vww(12);
+							}
+
+							.dispatch {
+								margin-left: vww(12);
+								min-width: vww(50);
+							}
+
 						}
 
 						.point-number {
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue b/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
index d1fad8a..7b2e230 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
@@ -211,22 +211,23 @@
 				</view>
 			</view>
 		</view>
-		<view class="mergeState"
-			v-show="mergeStateShow">
-			<view class="merge-wrap">
-				<view>鏄惁纭鍚堝苟</view>
-				<view class="merge-checkbox">
-					<u-checkbox-group v-model="checkboxValue1"
-						placement="column"
-						@change="mergeStateChange">
-						<u-checkbox :customStyle="{marginBottom: '8px'}"
-							:label="mergeState?'纭':'鍙栨秷'"
-							name="confirm"
-							label-size="30"
-							size="30"
-							activeColor="#48a2ff">
-						</u-checkbox>
-					</u-checkbox-group>
+		<view v-show="mergeStateShow">
+			<view class="mergeState">
+				<view class="merge-wrap">
+					<view>鏄惁纭鍚堝苟</view>
+					<view class="merge-checkbox">
+						<u-checkbox-group v-model="checkboxValue1"
+							placement="column"
+							@change="mergeStateChange">
+							<u-checkbox :customStyle="{marginBottom: '8px'}"
+								:label="mergeState?'纭':'鍙栨秷'"
+								name="confirm"
+								label-size="30"
+								size="30"
+								activeColor="#48a2ff">
+							</u-checkbox>
+						</u-checkbox-group>
+					</view>
 				</view>
 			</view>
 		</view>
@@ -248,7 +249,7 @@
 				@click="confirmWeigh"
 				throttleTime="800"></u-button>
 			<u-button type="primary"
-				text="杩斿洖鍔犲噺鍚�"
+				text="杩斿洖瑁呭嵏"
 				:disabled="addAndSubtractCoalDisabled"
 				@click="addAndSubtractCoal"
 				class="jiajian"
diff --git a/pages/loadUnload-page/loadUnload-detail/loadUnload-detail.vue b/pages/loadUnload-page/loadUnload-detail/loadUnload-detail.vue
index 91fbae6..8c89119 100644
--- a/pages/loadUnload-page/loadUnload-detail/loadUnload-detail.vue
+++ b/pages/loadUnload-page/loadUnload-detail/loadUnload-detail.vue
@@ -30,17 +30,18 @@
 				</view>
 				<view class="info-container">
 					<view class="info-block">
+						<view class="car-num info">
+							<text class="label-text">杞︾墝鍙�:</text>{{item.carNo}}
+						</view>
+						<view class="order-margin info">
+							<text class="label-text">鐓ょ鍚嶇О:</text>
+							{{item.coalName}}
+						</view>
 						<view class="order-type info">
 							璁㈠崟绫诲瀷:{{item.orderType}}
 						</view>
-						<view class="car-num info">
-							杞︾墝鍙�:{{item.carNo}}
-						</view>
 						<view class="file-name info">
 							鐘舵��:{{coalStatus[item.status]}}
-						</view>
-						<view class="order-margin info">
-							鐓ょ鍚嶇О:{{item.coalName}}
 						</view>
 					</view>
 				</view>
@@ -186,6 +187,17 @@
 					display: flex;
 					justify-content: center;
 					flex-wrap: wrap;
+
+					.car-num,
+					.order-margin {
+						color: #FF0000;
+						font-weight: 600;
+
+						.label-text {
+							color: #409eff;
+						}
+					}
+
 				}
 
 				.info {

--
Gitblit v1.9.1