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/dialog/computer_dialog.vue

@@ -314,10 +314,10 @@
               this.$set(this_order, key, resp_dialysis_order[key])
             }
             let orgId = parseInt(sessionStorage.getItem("org_id"));
-            axios.get('/api/index/uppatient?org_id='+ orgId + '&admin_user_id='+ this.form.nurse_id + '&patient_id=' + this.patient_id + '&up_time=' + (new Date(this.form.start_time).getTime() / 1000)).then((res) => {
-              console.log('res',res.data)
+            // axios.get('/api/index/uppatient?org_id='+ orgId + '&admin_user_id='+ this.form.nurse_id + '&patient_id=' + this.patient_id + '&up_time=' + (new Date(this.form.start_time).getTime() / 1000)).then((res) => {
+            //   console.log('res',res.data)
 
-            }) 
+            // }) 
             this.hide()
             this.$emit('monitor', resp.data.monitor)
             this.$message.success('上机成功')

src/xt_pages/dialysis/details/dialog/finish_dialog.vue

@@ -213,10 +213,10 @@
               this.$set(this_order, key, dialysis_order[key])
             }
             let orgId = parseInt(sessionStorage.getItem("org_id"));
-            axios.get('/api/index/downpatient?org_id='+ orgId + '&admin_user_id='+ this.form.nurse_id + '&patient_id=' + this.patient_id).then((res) => {
-              console.log('res',res.data)
+            // axios.get('/api/index/downpatient?org_id='+ orgId + '&admin_user_id='+ this.form.nurse_id + '&patient_id=' + this.patient_id).then((res) => {
+            //   console.log('res',res.data)
 
-            }) 
+            // }) 
             this.hide()
             this.$emit('assessmentAfterDislysis', resp.data.assessmentAfterDislysis)
 

src/xt_pages/sign/components/beforeDialysisCalling.vue

@@ -159,8 +159,8 @@ export default {
                                 calledArr.push(item)
                             }
                         })
-                        console.log('waitingCalledArr待叫号',waitingCalledArr)
-                        console.log('waitingCalledArr以较好',calledArr)
+                        // console.log('waitingCalledArr待叫号',waitingCalledArr)
+                        // console.log('waitingCalledArr以较好',calledArr)
                         // this.waitingCalled = waitingCalledArr
                         this.waitingCalledAm = waitingCalledArr
                         this.waitingCalledPm = waitingCalledArr

src/xt_pages/sign/components/computerCalling.vue

@@ -136,8 +136,8 @@ export default {
                                 calledArr.push(item)
                             }
                         })
-                        console.log('waitingCalledArr',waitingCalledArr)
-                        console.log('waitingCalledArr',calledArr)
+                        // console.log('waitingCalledArr',waitingCalledArr)
+                        // console.log('waitingCalledArr',calledArr)
                         // this.waitingCalled = waitingCalledArr
                         this.waitingCalledAm = waitingCalledArr
                         this.waitingCalledPm = waitingCalledArr

src/xt_pages/sign/lineUp.vue

@@ -70,7 +70,7 @@
                                     <span v-if="item.status == 5">已下机</span>
                                 </p>
                                 <p style="width:14%">{{ item.start_time ? getDates(item.start_time) : '--' }}</p>
-                                <p style="width:16%">{{ item.end_time ? getDates(item.end_time) : '--' }}</p>
+                                <p style="width:16%">{{ item.end_time && item.start_time ? getDates(item.end_time) : '--' }}</p>
                             </div>
                         </div>
                     </div> 
@@ -154,7 +154,7 @@
                                     <span v-if="item.status == 5">已下机</span>
                                 </p>
                                 <p style="width:14%">{{ item.start_time ? getDates(item.start_time) : '--' }}</p>
-                                <p style="width:16%">{{ item.end_time ? getDates(item.end_time) : '--' }}</p>
+                                <p style="width:16%">{{ item.end_time && item.start_time ? getDates(item.end_time) : '--' }}</p>
                             </div>
                         </div>
                     </div>