From a8cae0545478ffe25d088de244b8f5e83c96c3e4 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 15 九月 2023 14:03:08 +0800
Subject: [PATCH] #
---
Monitor-APP/pages/home/home.vue | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 447e60d..22bd046 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>
@@ -442,10 +437,10 @@
this.initPieChart()
this.getOther()
this.getDate2()
- // this.getInfo()
- // this.getError()
- this.getInfo2()
- this.getError2()
+ this.getInfo()
+ this.getError()
+ // this.getInfo2()
+ // this.getError2()
this.getUrl()
this.controller()
},1000)
@@ -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
@@ -570,7 +566,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].matDtos[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
@@ -578,7 +581,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;
--
Gitblit v1.9.1