Browse Source

修改功能

张保健 5 years ago
parent
commit
cf92ff9b1b

+ 3 - 3
src/pages/main/DialysisArea.vue View File

239
     this.requestDialysisScheduals();
239
     this.requestDialysisScheduals();
240
   },
240
   },
241
   mounted() {
241
   mounted() {
242
-    // this.timer = window.setInterval(() => {
243
-    //   setTimeout(this.requestDialysisScheduals(), 0);
244
-    // }, 30000);
242
+    this.timer = window.setInterval(() => {
243
+      setTimeout(this.requestDialysisScheduals(), 0);
244
+    }, 30000);
245
   },
245
   },
246
   beforeDestroy() {
246
   beforeDestroy() {
247
     clearInterval(this.timer);
247
     clearInterval(this.timer);

+ 13 - 13
src/pages/main/WaitingArea.vue View File

254
           var scheduals = [];
254
           var scheduals = [];
255
           for (let index = 0; index < this.scheduals.length; index++) {
255
           for (let index = 0; index < this.scheduals.length; index++) {
256
             const schedual = this.scheduals[index];
256
             const schedual = this.scheduals[index];
257
-            if (schedual.assessment_before_dislysis == null) {
257
+            if (schedual.assessment_before_dislysis == null || schedual.assessment_before_dislysis.weighing_before == 0) {
258
               if(this.cur_zone_selected > 0 && schedual.device_number.zone.id != this.cur_zone_selected) {
258
               if(this.cur_zone_selected > 0 && schedual.device_number.zone.id != this.cur_zone_selected) {
259
                 continue
259
                 continue
260
               }
260
               }
270
           var scheduals = [];
270
           var scheduals = [];
271
           for (let index = 0; index < this.scheduals.length; index++) {
271
           for (let index = 0; index < this.scheduals.length; index++) {
272
             const schedual = this.scheduals[index];
272
             const schedual = this.scheduals[index];
273
-            if (schedual.assessment_before_dislysis == null && schedual.prescription == null) {
273
+            if (schedual.prescription == null || schedual.prescription.creater == 0) {
274
               if(this.cur_zone_selected > 0 && schedual.device_number.zone.id != this.cur_zone_selected) {
274
               if(this.cur_zone_selected > 0 && schedual.device_number.zone.id != this.cur_zone_selected) {
275
                 continue
275
                 continue
276
               }
276
               }
306
         var scheduals = [];
306
         var scheduals = [];
307
         for (let index = 0; index < this.scheduals.length; index++) {
307
         for (let index = 0; index < this.scheduals.length; index++) {
308
           const schedual = this.scheduals[index];
308
           const schedual = this.scheduals[index];
309
-          if (schedual.assessment_before_dislysis == null) {
309
+          if (schedual.assessment_before_dislysis == null || schedual.assessment_before_dislysis.weighing_before == 0) {
310
             scheduals.push(schedual);
310
             scheduals.push(schedual);
311
           }
311
           }
312
         }
312
         }
316
         var scheduals = [];
316
         var scheduals = [];
317
         for (let index = 0; index < this.scheduals.length; index++) {
317
         for (let index = 0; index < this.scheduals.length; index++) {
318
           const schedual = this.scheduals[index];
318
           const schedual = this.scheduals[index];
319
-          if (schedual.assessment_before_dislysis == null && schedual.prescription == null) {
319
+          if (schedual.prescription == null || schedual.prescription.creater == 0) {
320
             scheduals.push(schedual);
320
             scheduals.push(schedual);
321
           }
321
           }
322
         }
322
         }
358
     this.requestScheduals();
358
     this.requestScheduals();
359
   },
359
   },
360
   mounted() {
360
   mounted() {
361
-    // this.timer = window.setInterval(() => {
362
-    //   setTimeout(this.requestScheduals(), 0);
363
-    // }, 30000);
361
+    this.timer = window.setInterval(() => {
362
+      setTimeout(this.requestScheduals(), 0);
363
+    }, 30000);
364
   },
364
   },
365
   beforeDestroy() {
365
   beforeDestroy() {
366
     clearInterval(this.timer);
366
     clearInterval(this.timer);
367
     this.timer = null;
367
     this.timer = null;
368
-    // this.$once('hook:beforeDestroy', () => {
369
-    //   clearInterval(this.timer);
370
-    // })
368
+    this.$once('hook:beforeDestroy', () => {
369
+      clearInterval(this.timer);
370
+    })
371
   },
371
   },
372
   methods: {
372
   methods: {
373
     processScheduals: function(scheduals) {
373
     processScheduals: function(scheduals) {
381
           schedualMap[schedual.device_number.zone.id] = [];
381
           schedualMap[schedual.device_number.zone.id] = [];
382
         }
382
         }
383
         if (this.select_index == 1) {
383
         if (this.select_index == 1) {
384
-            if(schedual.assessment_before_dislysis == null && schedual.prescription == null){
384
+            if(schedual.prescription == null || schedual.prescription.creater == 0){
385
             schedualMap[schedual.device_number.zone.id].push(schedual);
385
             schedualMap[schedual.device_number.zone.id].push(schedual);
386
             prescription_count++
386
             prescription_count++
387
           }
387
           }
388
         } else if (this.select_index == 2){
388
         } else if (this.select_index == 2){
389
-            if(schedual.assessment_before_dislysis == null ){
389
+            if(schedual.assessment_before_dislysis == null || schedual.assessment_before_dislysis.weighing_before == 0){
390
             schedualMap[schedual.device_number.zone.id].push(schedual);
390
             schedualMap[schedual.device_number.zone.id].push(schedual);
391
             assessment_before_dislysis_count++
391
             assessment_before_dislysis_count++
392
           }
392
           }
464
     },
464
     },
465
 
465
 
466
     requestScheduals() {
466
     requestScheduals() {
467
-      this.loading = true;
467
+      // this.loading = true;
468
       var date = parseTime(Date.parse(new Date()), "{y}-{m}-{d}");
468
       var date = parseTime(Date.parse(new Date()), "{y}-{m}-{d}");
469
       getWaitingScheduals({ date: date })
469
       getWaitingScheduals({ date: date })
470
         .then(rs => {
470
         .then(rs => {

+ 7 - 0
src/pages/main/dialog/PrescriptionDialog.vue View File

5
       <div class="DialogTit">
5
       <div class="DialogTit">
6
         <span @click="close()" class="iconfont">&#xe6e9;</span>
6
         <span @click="close()" class="iconfont">&#xe6e9;</span>
7
         <h1 class="name">透析处方</h1>
7
         <h1 class="name">透析处方</h1>
8
+        <botton>{{patient.name}}  [透析号 {{patient.dialysis_no}} ]</botton>
8
         <span @click="commitInfo" class="success" v-if="isPermission()">完成</span>
9
         <span @click="commitInfo" class="success" v-if="isPermission()">完成</span>
9
         <span @click="commitInfo" class="success" v-if="!isPermission()"></span>
10
         <span @click="commitInfo" class="success" v-if="!isPermission()"></span>
10
 
11
 
309
     <long-advice-sub-menu :visibility="advice_visibility" v-on:menu-cancle-three="menuCancleThree"
310
     <long-advice-sub-menu :visibility="advice_visibility" v-on:menu-cancle-three="menuCancleThree"
310
                           v-on:menu-comfirm-three="menuComfirmThree" :propsForm="advicePropForm"></long-advice-sub-menu>
311
                           v-on:menu-comfirm-three="menuComfirmThree" :propsForm="advicePropForm"></long-advice-sub-menu>
311
 
312
 
313
+    <computer-dialog  ref="computer_dialog"></computer-dialog>
314
+
312
   </div>
315
   </div>
313
 </template>
316
 </template>
314
 
317
 
323
 import {parseTime} from '@/utils'
326
 import {parseTime} from '@/utils'
324
 import LongAdviceSubMenu from './subMenu/LongAdviceSubMenu'
327
 import LongAdviceSubMenu from './subMenu/LongAdviceSubMenu'
325
 
328
 
329
+import OrdersDialog from './OrdersDialog'
330
+
326
 export default {
331
 export default {
327
   name: 'PrescriptionDialog',
332
   name: 'PrescriptionDialog',
328
   props: {
333
   props: {
1334
     }
1339
     }
1335
   },
1340
   },
1336
   created () {
1341
   created () {
1342
+    // this.$refs.computer_dialog.open()
1337
     if (this.$store.getters.user.user.user_type == 2) {
1343
     if (this.$store.getters.user.user.user_type == 2) {
1338
       this.isShowSign = true
1344
       this.isShowSign = true
1339
     }
1345
     }
1414
   components: {
1420
   components: {
1415
     LongAdviceSubMenu,
1421
     LongAdviceSubMenu,
1416
     MultipleSubMenu,
1422
     MultipleSubMenu,
1423
+    OrdersDialog,
1417
     // MultipleSubMenu,
1424
     // MultipleSubMenu,
1418
     CheckBoxSubMenu
1425
     CheckBoxSubMenu
1419
   },
1426
   },

+ 11 - 11
src/pages/main/today/TodayTab.vue View File

63
                   :step_data="stepData"></details-info>
63
                   :step_data="stepData"></details-info>
64
 
64
 
65
     <div class="blueBorder"></div>
65
     <div class="blueBorder"></div>
66
-    <dialysis-prescription id="prescription" :prescription="prescription" :solution="solution" title="透析处方"
66
+    <dialysis-prescription id="prescription"  :prescription="prescription" :solution="solution" title="透析处方"
67
                            :device_number_map="device_map"></dialysis-prescription>
67
                            :device_number_map="device_map"></dialysis-prescription>
68
 
68
 
69
     <div class="blueBorder"></div>
69
     <div class="blueBorder"></div>
1049
       ,
1049
       ,
1050
       closePrescriptionDialog: function () {
1050
       closePrescriptionDialog: function () {
1051
         this.closeDialog(1)
1051
         this.closeDialog(1)
1052
-        this.scrollToView('prescription')
1052
+        // this.scrollToView('prescription')
1053
       }
1053
       }
1054
       ,
1054
       ,
1055
       closeAcceptsAssessment: function () {
1055
       closeAcceptsAssessment: function () {
1056
         this.closeDialog(2)
1056
         this.closeDialog(2)
1057
-        this.scrollToView('accepts_assessment')
1057
+        // this.scrollToView('accepts_assessment')
1058
       }
1058
       }
1059
       ,
1059
       ,
1060
       closeAssessmentBefore: function () {
1060
       closeAssessmentBefore: function () {
1061
         this.closeDialog(3)
1061
         this.closeDialog(3)
1062
-        this.scrollToView('assessment_before')
1062
+        // this.scrollToView('assessment_before')
1063
       }
1063
       }
1064
       ,
1064
       ,
1065
       update_evaluation: function (evaluation) {
1065
       update_evaluation: function (evaluation) {
1070
       closeStatOrder: function () {
1070
       closeStatOrder: function () {
1071
         this.closeDialog(4)
1071
         this.closeDialog(4)
1072
         this.doctor_advices.push([])
1072
         this.doctor_advices.push([])
1073
-        this.scrollToView('stat_order')
1073
+        // this.scrollToView('stat_order')
1074
       }
1074
       }
1075
       ,
1075
       ,
1076
       closeDialysisComputer: function (dialysis_order) {
1076
       closeDialysisComputer: function (dialysis_order) {
1077
         this.closeDialog(0)
1077
         this.closeDialog(0)
1078
-        this.scrollToView('dialysis_computer')
1078
+        // this.scrollToView('dialysis_computer')
1079
       }
1079
       }
1080
       ,
1080
       ,
1081
       closeDoubleCheck: function () {
1081
       closeDoubleCheck: function () {
1082
         this.closeDialog(5)
1082
         this.closeDialog(5)
1083
-        this.scrollToView('double_check')
1083
+        // this.scrollToView('double_check')
1084
       }
1084
       }
1085
       ,
1085
       ,
1086
       closeMonitoring: function () {
1086
       closeMonitoring: function () {
1087
         this.closeDialog(6)
1087
         this.closeDialog(6)
1088
-        this.scrollToView('monitoring')
1088
+        // this.scrollToView('monitoring')
1089
       }
1089
       }
1090
       ,
1090
       ,
1091
       closeDialysisOff: function () {
1091
       closeDialysisOff: function () {
1092
         this.closeDialog(7)
1092
         this.closeDialog(7)
1093
-        this.scrollToView('dialysis_off')
1093
+        // this.scrollToView('dialysis_off')
1094
       }
1094
       }
1095
       ,
1095
       ,
1096
       closeAssessmentAfter: function (assessment_after_dislysis) {
1096
       closeAssessmentAfter: function (assessment_after_dislysis) {
1097
         this.closeDialog(8)
1097
         this.closeDialog(8)
1098
-        this.scrollToView('assessment_after')
1098
+        // this.scrollToView('assessment_after')
1099
         if (assessment_after_dislysis != undefined) {
1099
         if (assessment_after_dislysis != undefined) {
1100
           this.assessment_after_dislysis = assessment_after_dislysis
1100
           this.assessment_after_dislysis = assessment_after_dislysis
1101
         }
1101
         }
1103
       ,
1103
       ,
1104
       closeTreatmentOf: function () {
1104
       closeTreatmentOf: function () {
1105
         this.closeDialog(9)
1105
         this.closeDialog(9)
1106
-        this.scrollToView('treatment_of')
1106
+        // this.scrollToView('treatment_of')
1107
       }
1107
       }
1108
       ,
1108
       ,
1109
       scrollToView: function (id) {
1109
       scrollToView: function (id) {