From 4e517dc54e1e3e5e5b543383c321161de351272e Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期一, 11 十一月 2024 16:05:06 +0800
Subject: [PATCH] Merge branch 'feature/jlhg/first' of http://39.96.92.240:10000/r/~fyy/unattended-app into feature/jlhg/first

---
 pages/doorkeeper-page/doorkeeper-index/exit-index.vue |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/pages/doorkeeper-page/doorkeeper-index/exit-index.vue b/pages/doorkeeper-page/doorkeeper-index/exit-index.vue
index 60e9f2d..23958f9 100644
--- a/pages/doorkeeper-page/doorkeeper-index/exit-index.vue
+++ b/pages/doorkeeper-page/doorkeeper-index/exit-index.vue
@@ -165,6 +165,13 @@
 					</view>
 					<view class="second-line">
 						<view class="coal-name">
+							<view>鍑�閲嶏細{{item.clean|| 0}}</view>
+							<view class="black-bar"></view>
+							<view>鏁伴噺锛歿{item.productQuantity|| 0}}</view>
+						</view>
+					</view>
+					<view class="second-line">
+						<view class="coal-name">
 							<view class="dispatch-dept">{{ item.carNo || ''  }}</view>
 							<view class="black-bar"></view>
 							<view class="dispatch">{{ item.driver ||'' }}</view>
@@ -262,6 +269,7 @@
 						<text style="color:red">鎷煎崟</text>
 					</view>
 					<view class="second-line">
+						
 						<view class="coal-name">
 							<view class="dispatch-dept">{{ activeObj.carNo || ''  }}</view>
 							<view class="black-bar"></view>
@@ -485,7 +493,7 @@
 			},
 			//鏌ョ湅鎷煎崟
 			checkDetail(item){
-				this.activeObj = item;
+				this.activeObj = item.splicingOrders ? item.splicingOrders : {};
 				this.showModal = true;
 
 			},

--
Gitblit v1.9.1