From 69375dc4c4f31775222520c8d00e59f2c98357fd Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 22 九月 2023 13:56:04 +0800
Subject: [PATCH] #

---
 Monitor-APP/pages/home/home.vue |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 8a6adc9..c344f78 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -244,13 +244,8 @@
 										</swiper-item>
 										<swiper-item class="swiper-item" v-show="infoText.orderNo">
 											<view>
-												<view>璁㈠崟鍙凤細</view>
-												<view class="swiper-margin">{{infoText.orderNo}}</view>
-												
-											</view>
-											<view>
-												<view>宸插嚭鎵樼洏鏁帮細{{infoText.doneOfTray}}</view>
-												<view class="swiper-margin">鎬绘墭鐩樻暟锛歿{infoText.totalOfTray}}</view>
+												<view>璁㈠崟鍙凤細{{infoText.orderNo}}</view>
+												<view class="swiper-margin">绠卞彿锛歿{infoText.barcode}}</view>
 											</view>
 											<view>
 												<view>宸插嚭绠辨暟锛歿{infoText.doneOfTray}}</view>
@@ -496,6 +491,7 @@
 					}
 					that.swiperList = res.data[0].matDtos
 					that.infoText.matnr = res.data[0].matDtos[0].matnr
+					that.infoText.barcode = res.data[0].barcode
 					that.infoText.batch = res.data[0].matDtos[0].batch ? res.data[0].matDtos[0].batch : '--'
 					that.infoText.specs = res.data[0].matDtos[0].specs
 					that.infoText.count = res.data[0].matDtos[0].count
@@ -519,6 +515,7 @@
 				var	res = result.data
 				if (res.data && res.data !== "") {
 					var errorInfo = res.data
+					
 					if (that.infoType == 1) {
 						that.infoType = 3
 						that.infoText.title = "鍏朵粬淇℃伅" 
@@ -577,6 +574,7 @@
 								that.infoText.orderNo = res.data[0].orderNo
 							}
 							that.infoText.matnr = res.data[0].matDtos[0].matnr
+							that.infoText.barcode = res.data[0].barcode
 							that.infoText.batch = res.data[0].matDtos[0].batch ? res.data[0].matDtos[0].batch : '--'
 							that.infoText.specs = res.data[0].matDtos[0].specs
 							that.infoText.count = res.data[0].matDtos[0].count
@@ -1164,5 +1162,6 @@
 	.info-box-text-item {
 		height: 20%;font-size: 8vh;
 		justify-content: center;
+		white-space: pre-line;
 	}
 </style>
\ No newline at end of file

--
Gitblit v1.9.1