From 7af2d33d8fda6af451b0873a8f642c3cf7686136 Mon Sep 17 00:00:00 2001
From: 邱宇豪 <qyh123230312>
Date: 星期三, 29 十一月 2023 16:21:49 +0800
Subject: [PATCH] 20231129_qiuyh_解决钢筋笼生产查询问题、新加钢筋笼材料标示牌、调整区域打卡

---
 web/src/views/MixingInfo/messageInfo.vue |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/web/src/views/MixingInfo/messageInfo.vue b/web/src/views/MixingInfo/messageInfo.vue
index 1316de0..922db19 100644
--- a/web/src/views/MixingInfo/messageInfo.vue
+++ b/web/src/views/MixingInfo/messageInfo.vue
@@ -20,12 +20,12 @@
                         <div class="mixing_rows_datas">{{mixingList&&mixingList.inTime}}</div>
                     </div>
                     <div class="mixing_rows">
-                        <div class="mixing_rows_titles">检验状态:</div>
-                        <div class="mixing_rows_datas"  :class="{'standardStyle':mixingList.status===1,'notStandardStyle':mixingList.status!==1}">{{mixingList&&mixingList.status===1?'合格':'待检'}}</div>
-                    </div>
-                    <div class="mixing_rows">
                         <div class="mixing_rows_titles">检验日期:</div>
                         <div class="mixing_rows_datas">{{mixingList&&mixingList.inspectionDate}}</div>
+                    </div>
+                    <div class="mixing_rows">
+                        <div class="mixing_rows_titles">检验状态:</div>
+                        <div class="mixing_rows_datas"  :class="{'standardStyle':mixingList.status===1,'notStandardStyle':mixingList.status!==1}">{{mixingList&&mixingList.status===1?'合格':mixingList&&mixingList.status===2?'待检':''}}</div>
                     </div>
                     <div class="mixing_rows">
                         <div class="mixing_rows_titles">报告编号:</div>
@@ -65,7 +65,7 @@
             }
             this.$api.Infos.showHmixings(params).then(res=>{
                 if(res.statusMsg==='ok'){
-                    this.mixingList = res.data
+                    this.mixingList = res.data===null?[]:res.data
                 }else{
                     this.$message.warning('请检查网络或联系管理员!!!')
                 }

--
Gitblit v1.9.3