From 7e603bde766e5f4fc7f95c785b1083c42f61955e Mon Sep 17 00:00:00 2001
From: 李旭东 <woaiguo66@sina.com>
Date: 星期五, 24 十一月 2023 13:42:57 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe

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

diff --git a/web/src/views/MixingInfo/messageInfo.vue b/web/src/views/MixingInfo/messageInfo.vue
index cf87556..922db19 100644
--- a/web/src/views/MixingInfo/messageInfo.vue
+++ b/web/src/views/MixingInfo/messageInfo.vue
@@ -25,7 +25,7 @@
                     </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 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