修改功能

src/pages/main/DialysisArea.vue

@@ -239,9 +239,9 @@ export default {
     this.requestDialysisScheduals();
   },
   mounted() {
-    // this.timer = window.setInterval(() => {
-    //   setTimeout(this.requestDialysisScheduals(), 0);
-    // }, 30000);
+    this.timer = window.setInterval(() => {
+      setTimeout(this.requestDialysisScheduals(), 0);
+    }, 30000);
   },
   beforeDestroy() {
     clearInterval(this.timer);

src/pages/main/WaitingArea.vue

@@ -254,7 +254,7 @@ export default {
           var scheduals = [];
           for (let index = 0; index < this.scheduals.length; index++) {
             const schedual = this.scheduals[index];
-            if (schedual.assessment_before_dislysis == null) {
+            if (schedual.assessment_before_dislysis == null || schedual.assessment_before_dislysis.weighing_before == 0) {
               if(this.cur_zone_selected > 0 && schedual.device_number.zone.id != this.cur_zone_selected) {
                 continue
               }
@@ -270,7 +270,7 @@ export default {
           var scheduals = [];
           for (let index = 0; index < this.scheduals.length; index++) {
             const schedual = this.scheduals[index];
-            if (schedual.assessment_before_dislysis == null && schedual.prescription == null) {
+            if (schedual.prescription == null || schedual.prescription.creater == 0) {
               if(this.cur_zone_selected > 0 && schedual.device_number.zone.id != this.cur_zone_selected) {
                 continue
               }
@@ -306,7 +306,7 @@ export default {
         var scheduals = [];
         for (let index = 0; index < this.scheduals.length; index++) {
           const schedual = this.scheduals[index];
-          if (schedual.assessment_before_dislysis == null) {
+          if (schedual.assessment_before_dislysis == null || schedual.assessment_before_dislysis.weighing_before == 0) {
             scheduals.push(schedual);
           }
         }
@@ -316,7 +316,7 @@ export default {
         var scheduals = [];
         for (let index = 0; index < this.scheduals.length; index++) {
           const schedual = this.scheduals[index];
-          if (schedual.assessment_before_dislysis == null && schedual.prescription == null) {
+          if (schedual.prescription == null || schedual.prescription.creater == 0) {
             scheduals.push(schedual);
           }
         }
@@ -358,16 +358,16 @@ export default {
     this.requestScheduals();
   },
   mounted() {
-    // this.timer = window.setInterval(() => {
-    //   setTimeout(this.requestScheduals(), 0);
-    // }, 30000);
+    this.timer = window.setInterval(() => {
+      setTimeout(this.requestScheduals(), 0);
+    }, 30000);
   },
   beforeDestroy() {
     clearInterval(this.timer);
     this.timer = null;
-    // this.$once('hook:beforeDestroy', () => {
-    //   clearInterval(this.timer);
-    // })
+    this.$once('hook:beforeDestroy', () => {
+      clearInterval(this.timer);
+    })
   },
   methods: {
     processScheduals: function(scheduals) {
@@ -381,12 +381,12 @@ export default {
           schedualMap[schedual.device_number.zone.id] = [];
         }
         if (this.select_index == 1) {
-            if(schedual.assessment_before_dislysis == null && schedual.prescription == null){
+            if(schedual.prescription == null || schedual.prescription.creater == 0){
             schedualMap[schedual.device_number.zone.id].push(schedual);
             prescription_count++
           }
         } else if (this.select_index == 2){
-            if(schedual.assessment_before_dislysis == null ){
+            if(schedual.assessment_before_dislysis == null || schedual.assessment_before_dislysis.weighing_before == 0){
             schedualMap[schedual.device_number.zone.id].push(schedual);
             assessment_before_dislysis_count++
           }
@@ -464,7 +464,7 @@ export default {
     },
 
     requestScheduals() {
-      this.loading = true;
+      // this.loading = true;
       var date = parseTime(Date.parse(new Date()), "{y}-{m}-{d}");
       getWaitingScheduals({ date: date })
         .then(rs => {

src/pages/main/dialog/PrescriptionDialog.vue

@@ -5,6 +5,7 @@
       <div class="DialogTit">
         <span @click="close()" class="iconfont">&#xe6e9;</span>
         <h1 class="name">透析处方</h1>
+        <botton>{{patient.name}}  [透析号 {{patient.dialysis_no}} ]</botton>
         <span @click="commitInfo" class="success" v-if="isPermission()">完成</span>
         <span @click="commitInfo" class="success" v-if="!isPermission()"></span>
 
@@ -309,6 +310,8 @@
     <long-advice-sub-menu :visibility="advice_visibility" v-on:menu-cancle-three="menuCancleThree"
                           v-on:menu-comfirm-three="menuComfirmThree" :propsForm="advicePropForm"></long-advice-sub-menu>
 
+    <computer-dialog  ref="computer_dialog"></computer-dialog>
+
   </div>
 </template>
 
@@ -323,6 +326,8 @@ import {getDataConfig} from '@/utils/data'
 import {parseTime} from '@/utils'
 import LongAdviceSubMenu from './subMenu/LongAdviceSubMenu'
 
+import OrdersDialog from './OrdersDialog'
+
 export default {
   name: 'PrescriptionDialog',
   props: {
@@ -1334,6 +1339,7 @@ menuComfirmTwo: function (dialysisPrescription) {
     }
   },
   created () {
+    // this.$refs.computer_dialog.open()
     if (this.$store.getters.user.user.user_type == 2) {
       this.isShowSign = true
     }
@@ -1414,6 +1420,7 @@ menuComfirmTwo: function (dialysisPrescription) {
   components: {
     LongAdviceSubMenu,
     MultipleSubMenu,
+    OrdersDialog,
     // MultipleSubMenu,
     CheckBoxSubMenu
   },

src/pages/main/today/TodayTab.vue

@@ -63,7 +63,7 @@
                   :step_data="stepData"></details-info>
 
     <div class="blueBorder"></div>
-    <dialysis-prescription id="prescription" :prescription="prescription" :solution="solution" title="透析处方"
+    <dialysis-prescription id="prescription"  :prescription="prescription" :solution="solution" title="透析处方"
                            :device_number_map="device_map"></dialysis-prescription>
 
     <div class="blueBorder"></div>
@@ -1049,17 +1049,17 @@
       ,
       closePrescriptionDialog: function () {
         this.closeDialog(1)
-        this.scrollToView('prescription')
+        // this.scrollToView('prescription')
       }
       ,
       closeAcceptsAssessment: function () {
         this.closeDialog(2)
-        this.scrollToView('accepts_assessment')
+        // this.scrollToView('accepts_assessment')
       }
       ,
       closeAssessmentBefore: function () {
         this.closeDialog(3)
-        this.scrollToView('assessment_before')
+        // this.scrollToView('assessment_before')
       }
       ,
       update_evaluation: function (evaluation) {
@@ -1070,32 +1070,32 @@
       closeStatOrder: function () {
         this.closeDialog(4)
         this.doctor_advices.push([])
-        this.scrollToView('stat_order')
+        // this.scrollToView('stat_order')
       }
       ,
       closeDialysisComputer: function (dialysis_order) {
         this.closeDialog(0)
-        this.scrollToView('dialysis_computer')
+        // this.scrollToView('dialysis_computer')
       }
       ,
       closeDoubleCheck: function () {
         this.closeDialog(5)
-        this.scrollToView('double_check')
+        // this.scrollToView('double_check')
       }
       ,
       closeMonitoring: function () {
         this.closeDialog(6)
-        this.scrollToView('monitoring')
+        // this.scrollToView('monitoring')
       }
       ,
       closeDialysisOff: function () {
         this.closeDialog(7)
-        this.scrollToView('dialysis_off')
+        // this.scrollToView('dialysis_off')
       }
       ,
       closeAssessmentAfter: function (assessment_after_dislysis) {
         this.closeDialog(8)
-        this.scrollToView('assessment_after')
+        // this.scrollToView('assessment_after')
         if (assessment_after_dislysis != undefined) {
           this.assessment_after_dislysis = assessment_after_dislysis
         }
@@ -1103,7 +1103,7 @@
       ,
       closeTreatmentOf: function () {
         this.closeDialog(9)
-        this.scrollToView('treatment_of')
+        // this.scrollToView('treatment_of')
       }
       ,
       scrollToView: function (id) {