From b152ecbaa0bfd3a744b6a614e1cdc0c3e11e8f18 Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Fri, 9 Aug 2024 15:42:28 +0800
Subject: [PATCH] dj

---
 src/components/doctorCheck/QueueCheckList.vue | 11 ++++++++---
 src/components/occDisease/occReport.vue       | 15 +++++++++++++++
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/components/doctorCheck/QueueCheckList.vue b/src/components/doctorCheck/QueueCheckList.vue
index fe1da3f..2171c14 100644
--- a/src/components/doctorCheck/QueueCheckList.vue
+++ b/src/components/doctorCheck/QueueCheckList.vue
@@ -357,7 +357,8 @@ export default {
           });
         });
 
-        postapi('/api/app/QueueRegister/GetQueueRegisterListByRoomId', { roomId, itemTypeIds })
+        if(roomId){
+          postapi('/api/app/QueueRegister/GetQueueRegisterListByRoomId', { roomId, itemTypeIds })
           .then(res => {
             if (res.code > -1) {
               this.waitDetail = res.data.waitDetail
@@ -372,12 +373,14 @@ export default {
           .catch(err => {
             reject(err)
           })
+        }else{
+          reject('请选择房间')
+        }        
       })
     },
 
     // 获取房间排队信息 ByRoomId
     getQueueRegisterListByRoomId(roomId) {
-
       if (!roomId) {
         this.$message.warning({ showClose: true, message: '请选择房间' })
         return
@@ -387,7 +390,9 @@ export default {
 
     // 获取房间排队信息 ByRoomId
     getQueueRegisterListByItemTypeIds(itemTypeIds) {
-      this.getQueueRegisterList(this.LocalConfig.doctorCheck.queueRoom, itemTypeIds)
+      if(this.LocalConfig.doctorCheck.queueRoom){
+        this.getQueueRegisterList(this.LocalConfig.doctorCheck.queueRoom, itemTypeIds)
+      }      
     },
 
     setQueueParams() {
diff --git a/src/components/occDisease/occReport.vue b/src/components/occDisease/occReport.vue
index 7cb73da..b559288 100644
--- a/src/components/occDisease/occReport.vue
+++ b/src/components/occDisease/occReport.vue
@@ -276,6 +276,7 @@
 <script>
 import moment from "moment";
 import { mapState, mapActions } from "vuex";
+import { Loading } from "element-ui";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
 import {
   dddw,
@@ -399,6 +400,14 @@ export default {
       };
 
       console.log('toOutShell', toOutShell)
+      let loading = Loading.service({
+        lock: true,
+        text: "正在加载中，请稍后",
+        spinner: "el-icon-loading",
+        background: "rgba(0, 0, 0, 0)",
+        customClass: "boxStyle"
+    });
+
       if (isPreview) {
         this.$peisAPI.printPre(JSON.stringify(toOutShell))
           .then(res => {
@@ -409,6 +418,9 @@ export default {
           })
           .catch((err) => {
             this.$message.error({ showClose: true, message: err })
+          })
+          .finally(() => {
+            loading.close()
           });
       } else {
         this.$peisAPI.print(JSON.stringify(toOutShell))
@@ -420,6 +432,9 @@ export default {
           })
           .catch((err) => {
             this.$message.error({ showClose: true, message: err })
+          })
+          .finally(() => {
+            loading.close()
           });
       }
     },