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 | 36 ++++++++++++++++++++++++------------
1 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index e9ea281..c344f78 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -220,6 +220,7 @@
<view>宸ヤ綔鍙�: {{infoText.workNo}}</view>
<view>婧愬簱浣�: {{infoText.sourceLocNo}}</view>
<view>鐩爣绔�: {{infoText.staNo}}</view>
+ <view v-show="infoText.ctnNo" style="color: red;">閿佺爜鐗╂枡</view>
<!-- <view style="width: 10%;">鏁伴噺</view> -->
</view>
<!-- body -->
@@ -243,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>
@@ -405,7 +401,8 @@
doneOfTray: '',
totalOfTray: '',
doneOfUnit: '',
- totalOfUnit: ''
+ totalOfUnit: '',
+ ctnNo: '1'
},
swiperList: [],
timeOut: false,
@@ -449,7 +446,7 @@
},1000)
},
methods: {
- timeOut() {
+ timeOuts() {
console.log(this.times);
},
getUrl() {
@@ -486,8 +483,15 @@
that.infoText.workNo = res.data[0].workNo
that.infoText.sourceLocNo = res.data[0].sourceLocNo
that.infoText.staNo = res.data[0].staNo
+ that.infoText.ctnNo = res.data[0].ctnNo
+ if (res.data[0].ctnNo) {
+ that.infoText.orderNo = ''
+ } else {
+ that.infoText.orderNo = res.data[0].orderNo
+ }
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
@@ -495,7 +499,7 @@
that.infoText.totalOfTray = res.data[0].totalOfTray
that.infoText.doneOfUnit = res.data[0].doneOfUnit
that.infoText.totalOfUnit = res.data[0].totalOfUnit
- that.infoText.orderNo = res.data[0].orderNo
+
} else {
@@ -511,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 = "鍏朵粬淇℃伅"
@@ -562,7 +567,14 @@
that.infoText.sourceLocNo = res.data[0].sourceLocNo
that.infoText.staNo = res.data[0].staNo
that.swiperList = res.data[0].matDtos
+ that.infoText.ctnNo = res.data[0].ctnNo
+ if (res.data[0].ctnNo) {
+ that.infoText.orderNo = ''
+ } else {
+ 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
@@ -570,7 +582,6 @@
that.infoText.totalOfTray = res.data[0].totalOfTray
that.infoText.doneOfUnit = res.data[0].doneOfUnit
that.infoText.totalOfUnit = res.data[0].totalOfUnit
- that.infoText.orderNo = res.data[0].orderNo
} else {
if (that.infoType == 2 || that.infoType == 3) {
return;
@@ -580,7 +591,7 @@
},
fail(err) {
that.timeOut = true
- that.times = that.times+3
+ that.times = that.times+1
that.infoType = 0
}
})
@@ -1151,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