Parcourir la source

Merge branch 'new_pad_branch' of http://git.shengws.com/zhangbj/xt_pad into new_pad_branch

csx il y a 4 ans
Parent
révision
67618688a5
2 fichiers modifiés avec 481 ajouts et 513 suppressions
  1. 445 441
      src/pages/main/dialog/MonitDialog.vue
  2. 36 72
      src/pages/main/today/TodayTab.vue

Fichier diff supprimé car celui-ci est trop grand
+ 445 - 441
src/pages/main/dialog/MonitDialog.vue


+ 36 - 72
src/pages/main/today/TodayTab.vue Voir le fichier

227
       :overlay="true"
227
       :overlay="true"
228
       :close-on-click-overlay="false"
228
       :close-on-click-overlay="false"
229
     >
229
     >
230
-      <monit-dialog
230
+      <monit-dialog v-if="monit_dialog_reset"
231
         :monitor_records="monitor_records"
231
         :monitor_records="monitor_records"
232
         :last_monitor_record="last_monitor_record"
232
         :last_monitor_record="last_monitor_record"
233
         :patient="patient"
233
         :patient="patient"
371
         last_prescription:{},
371
         last_prescription:{},
372
         thoroug_dialog_reset: true,
372
         thoroug_dialog_reset: true,
373
         prescription_dialog_reset: true,
373
         prescription_dialog_reset: true,
374
+        monit_dialog_reset: true,
374
         receiver_treatment_access: {}, // 接诊评估
375
         receiver_treatment_access: {}, // 接诊评估
375
         predialysis_evaluation: {}, // 透前评估
376
         predialysis_evaluation: {}, // 透前评估
376
         last_predialysis_evaluation: {}, // 上次透前评估
377
         last_predialysis_evaluation: {}, // 上次透前评估
847
           var waitscheduals = waitstoredata.waitscheduals
848
           var waitscheduals = waitstoredata.waitscheduals
848
           var storedata = this.$store.getters.scheduals
849
           var storedata = this.$store.getters.scheduals
849
           var scheduals = storedata.scheduals
850
           var scheduals = storedata.scheduals
850
-
851
-
852
-
853
-
854
-
855
           var patient = resp.data.patient // 患者信息
851
           var patient = resp.data.patient // 患者信息
856
           var schedual = resp.data.schedual // 患者排班信息
852
           var schedual = resp.data.schedual // 患者排班信息
857
           var prescription = resp.data.prescription // 透析处方
853
           var prescription = resp.data.prescription // 透析处方
882
           var monitor_records = resp.data.monitor_records // 透析监测
878
           var monitor_records = resp.data.monitor_records // 透析监测
883
           var dialysis_order = resp.data.dialysis_order // 透析记录
879
           var dialysis_order = resp.data.dialysis_order // 透析记录
884
           var operators = resp.data.operators // 操作人
880
           var operators = resp.data.operators // 操作人
885
-
886
           var special_premission = resp.data.special_premission // 特殊权限
881
           var special_premission = resp.data.special_premission // 特殊权限
887
-
888
           var config = resp.data.config // 库存自动扣减配置
882
           var config = resp.data.config // 库存自动扣减配置
889
-
890
           var types = resp.data.types // 所有系统库存商品类型
883
           var types = resp.data.types // 所有系统库存商品类型
891
-
892
           var last_predialysis_evaluation = resp.data.last_predialysis_evaluation // 上一次透前评估
884
           var last_predialysis_evaluation = resp.data.last_predialysis_evaluation // 上一次透前评估
893
           var last_assessment_after_dislysis = resp.data.last_assessment_after_dislysis // 上一次透前评估
885
           var last_assessment_after_dislysis = resp.data.last_assessment_after_dislysis // 上一次透前评估
894
           var last_monitor_record = resp.data.last_monitor_record
886
           var last_monitor_record = resp.data.last_monitor_record
922
           this.patient = patient
914
           this.patient = patient
923
           this.schedual = schedual == null ? {} : schedual
915
           this.schedual = schedual == null ? {} : schedual
924
           this.prescription = prescription == null ? {id: ''} : prescription
916
           this.prescription = prescription == null ? {id: ''} : prescription
925
-          this.prescription_dialog_reset = false
926
-          this.$nextTick(() => {
927
-            this.prescription_dialog_reset = true
928
-          })
929
           this.solution = solution == null ? {id: ''} : solution
917
           this.solution = solution == null ? {id: ''} : solution
930
           this.last_prescription = last_prescription == null ? {id: ''} : last_prescription
918
           this.last_prescription = last_prescription == null ? {id: ''} : last_prescription
931
-
932
-
933
-
934
-          this.receiver_treatment_access =
935
-              receiver_treatment_access == null
936
-                ? {id: ''}
937
-                : receiver_treatment_access
938
-          this.predialysis_evaluation =
939
-              predialysis_evaluation == null ? {} : predialysis_evaluation
940
-          this.last_predialysis_evaluation =
941
-              last_predialysis_evaluation == null
942
-                ? {}
943
-                : last_predialysis_evaluation
944
-
919
+          this.receiver_treatment_access = receiver_treatment_access == null ? {id: ''} : receiver_treatment_access
920
+          this.predialysis_evaluation = predialysis_evaluation == null ? {} : predialysis_evaluation
921
+          this.last_predialysis_evaluation = last_predialysis_evaluation == null ? {} : last_predialysis_evaluation
945
           this.doctor_advices = doctor_advices == null ? [] : doctor_advices
922
           this.doctor_advices = doctor_advices == null ? [] : doctor_advices
946
           this.special_premission = special_premission
923
           this.special_premission = special_premission
947
           this.config = config
924
           this.config = config
948
           this.goodTypes = types
925
           this.goodTypes = types
949
-
950
-
951
           if (this.doctor_advices.length > 0) {
926
           if (this.doctor_advices.length > 0) {
952
             var group = this.newAdviceGroupObject()
927
             var group = this.newAdviceGroupObject()
953
             var initGroupBlock = function (group, advice) {
928
             var initGroupBlock = function (group, advice) {
1009
 
984
 
1010
           this.double_check = double_check == null ? {id: ''} : double_check
985
           this.double_check = double_check == null ? {id: ''} : double_check
1011
           this.assessment_after_dislysis = assessment_after_dislysis == null ? {id: ''} : assessment_after_dislysis
986
           this.assessment_after_dislysis = assessment_after_dislysis == null ? {id: ''} : assessment_after_dislysis
1012
-          this.thoroug_dialog_reset = false
1013
-          this.$nextTick(() => {
1014
-            this.thoroug_dialog_reset = true
1015
-          })
1016
-          this.last_assessment_after_dislysis =
1017
-              last_assessment_after_dislysis == null
1018
-                ? {id: ''}
1019
-                : last_assessment_after_dislysis
1020
-          this.treatment_summary =
1021
-              treatment_summary == null ? {id: ''} : treatment_summary
987
+          this.last_assessment_after_dislysis = last_assessment_after_dislysis == null ? {id: ''} : last_assessment_after_dislysis
988
+          this.treatment_summary = treatment_summary == null ? {id: ''} : treatment_summary
1022
           this.monitor_records = monitor_records == null ? [] : monitor_records
989
           this.monitor_records = monitor_records == null ? [] : monitor_records
1023
-          this.last_monitor_record =
1024
-              last_monitor_record == null
1025
-                ? this.last_monitor_record
1026
-                : last_monitor_record
1027
-          this.dialysis_order =
1028
-              dialysis_order == null ? {id: ''} : dialysis_order
990
+          this.last_monitor_record = last_monitor_record == null ? this.last_monitor_record : last_monitor_record
991
+          this.dialysis_order =  dialysis_order == null ? {id: ''} : dialysis_order
1029
           this.operators = operators
992
           this.operators = operators
1030
           this.$refs.stat_order.setAdvices(this.doctor_advices)
993
           this.$refs.stat_order.setAdvices(this.doctor_advices)
1031
           this.$refs.monitoring.setRecords(this.monitor_records)
994
           this.$refs.monitoring.setRecords(this.monitor_records)
1032
 
995
 
996
+          // 强制刷新子组件
997
+          this.thoroug_dialog_reset = false
998
+          this.$nextTick(() => { this.thoroug_dialog_reset = true })
999
+          this.prescription_dialog_reset = false
1000
+          this.$nextTick(() => { this.prescription_dialog_reset = true })
1001
+          this.monit_dialog_reset = false;
1002
+          this.$nextTick(() => { this.monit_dialog_reset = true })
1003
+
1033
           this.title = patient.name
1004
           this.title = patient.name
1034
 
1005
 
1035
           dialysisGlobalConfig().then(rs => {
1006
           dialysisGlobalConfig().then(rs => {
1534
           this.patient = patient
1505
           this.patient = patient
1535
           this.schedual = schedual == null ? {} : schedual
1506
           this.schedual = schedual == null ? {} : schedual
1536
           this.prescription = prescription == null ? {id: ''} : prescription
1507
           this.prescription = prescription == null ? {id: ''} : prescription
1508
+
1509
+
1537
           this.solution = solution == null ? {id: ''} : solution
1510
           this.solution = solution == null ? {id: ''} : solution
1538
           this.last_prescription = last_prescription == null ? {id: ''} : last_prescription
1511
           this.last_prescription = last_prescription == null ? {id: ''} : last_prescription
1539
 
1512
 
1540
 
1513
 
1541
 
1514
 
1542
-          this.receiver_treatment_access =
1543
-            receiver_treatment_access == null
1544
-              ? {id: ''}
1545
-              : receiver_treatment_access
1546
-          this.predialysis_evaluation =
1547
-            predialysis_evaluation == null ? {} : predialysis_evaluation
1548
-          this.last_predialysis_evaluation =
1549
-            last_predialysis_evaluation == null
1550
-              ? {}
1551
-              : last_predialysis_evaluation
1515
+          this.receiver_treatment_access = receiver_treatment_access == null ? {id: ''} : receiver_treatment_access
1516
+          this.predialysis_evaluation = predialysis_evaluation == null ? {} : predialysis_evaluation
1517
+          this.last_predialysis_evaluation = last_predialysis_evaluation == null ? {} : last_predialysis_evaluation
1552
 
1518
 
1553
           this.doctor_advices = doctor_advices == null ? [] : doctor_advices
1519
           this.doctor_advices = doctor_advices == null ? [] : doctor_advices
1554
           this.special_premission = special_premission
1520
           this.special_premission = special_premission
1616
           }
1582
           }
1617
 
1583
 
1618
           this.double_check = double_check == null ? {id: ''} : double_check
1584
           this.double_check = double_check == null ? {id: ''} : double_check
1619
-          this.assessment_after_dislysis =
1620
-            assessment_after_dislysis == null
1621
-              ? {id: ''}
1622
-              : assessment_after_dislysis
1623
-          this.last_assessment_after_dislysis =
1624
-            last_assessment_after_dislysis == null
1625
-              ? {id: ''}
1626
-              : last_assessment_after_dislysis
1627
-          this.treatment_summary =
1628
-            treatment_summary == null ? {id: ''} : treatment_summary
1585
+          this.assessment_after_dislysis = assessment_after_dislysis == null ? {id: ''} : assessment_after_dislysis
1586
+          this.last_assessment_after_dislysis = last_assessment_after_dislysis == null ? {id: ''} : last_assessment_after_dislysis
1587
+          this.treatment_summary =  treatment_summary == null ? {id: ''} : treatment_summary
1629
           this.monitor_records = monitor_records == null ? [] : monitor_records
1588
           this.monitor_records = monitor_records == null ? [] : monitor_records
1630
-          this.last_monitor_record =
1631
-            last_monitor_record == null
1632
-              ? this.last_monitor_record
1633
-              : last_monitor_record
1634
-          this.dialysis_order =
1635
-            dialysis_order == null ? {id: ''} : dialysis_order
1589
+          this.last_monitor_record = last_monitor_record == null  ? this.last_monitor_record : last_monitor_record
1590
+          this.dialysis_order = dialysis_order == null ? {id: ''} : dialysis_order
1636
           this.operators = operators
1591
           this.operators = operators
1637
           this.$refs.stat_order.setAdvices(this.doctor_advices)
1592
           this.$refs.stat_order.setAdvices(this.doctor_advices)
1638
           this.$refs.monitoring.setRecords(this.monitor_records)
1593
           this.$refs.monitoring.setRecords(this.monitor_records)
1639
 
1594
 
1640
           this.title = patient.name
1595
           this.title = patient.name
1596
+          // 强制刷新子组件
1597
+
1598
+          this.thoroug_dialog_reset = false
1599
+          this.$nextTick(() => { this.thoroug_dialog_reset = true })
1600
+          this.prescription_dialog_reset = false
1601
+          this.$nextTick(() => { this.prescription_dialog_reset = true })
1602
+          this.monit_dialog_reset = false;
1603
+          this.$nextTick(() => { this.monit_dialog_reset = true })
1604
+
1641
         } else {
1605
         } else {
1642
           this.$toast({
1606
           this.$toast({
1643
             message: resp.msg
1607
             message: resp.msg