Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/dialysis/details/index.vue

@@ -1764,6 +1764,7 @@ export default {
           }
           let fisrtQueueInfo = []
           this.newFisrtQueueInfo = res.data.fisrtQueueInfo
+          this.queueConfig = res.data.queueConfig
           if(res.data.fisrtQueueInfo != null){
               if(timeType == 1){
                   fisrtQueueInfo = res.data.fisrtQueueInfo.morning
@@ -1778,7 +1779,7 @@ export default {
               }
           }
           this.fisrtQueueInfo = fisrtQueueInfo
-          this.queueConfig = res.data.queueConfig
+          
           // this.fisrtQueueInfo = res.data.fisrtQueueInfo
           let arr = res.data.patientQueueList.data
           let waitingCalledArr = []

src/xt_pages/dialysis/schedualPatient.vue

@@ -405,6 +405,7 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
             }
             let fisrtQueueInfo = []
             this.newFisrtQueueInfo = res.data.fisrtQueueInfo
+            this.queueConfig = res.data.queueConfig
             if(res.data.fisrtQueueInfo != null){
                 if(timeType == 1){
                     fisrtQueueInfo = res.data.fisrtQueueInfo.morning
@@ -419,7 +420,7 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
                 }
             }
             this.fisrtQueueInfo = fisrtQueueInfo
-            this.queueConfig = res.data.queueConfig
+            
             // this.fisrtQueueInfo = res.data.fisrtQueueInfo
             let arr = res.data.patientQueueList.data
             let waitingCalledArr = []

src/xt_pages/user/templateSummary.vue

@@ -1013,7 +1013,7 @@
     },
     methods: {
       getTime(val) {
-         console.log("val2322332322323223",val)
+         // console.log("val2322332322323223",val)
          if(val == "" || val == undefined){
           return ""
          }else {