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

src/pages/main/today/TodayTab.vue

@@ -227,7 +227,7 @@
       :overlay="true"
       :close-on-click-overlay="false"
     >
-      <monit-dialog
+      <monit-dialog v-if="monit_dialog_reset"
         :monitor_records="monitor_records"
         :last_monitor_record="last_monitor_record"
         :patient="patient"
@@ -371,6 +371,7 @@ import {parseTime} from '@/utils'
         last_prescription:{},
         thoroug_dialog_reset: true,
         prescription_dialog_reset: true,
+        monit_dialog_reset: true,
         receiver_treatment_access: {}, // 接诊评估
         predialysis_evaluation: {}, // 透前评估
         last_predialysis_evaluation: {}, // 上次透前评估
@@ -847,11 +848,6 @@ import {parseTime} from '@/utils'
           var waitscheduals = waitstoredata.waitscheduals
           var storedata = this.$store.getters.scheduals
           var scheduals = storedata.scheduals
-
-
-
-
-
           var patient = resp.data.patient // 患者信息
           var schedual = resp.data.schedual // 患者排班信息
           var prescription = resp.data.prescription // 透析处方
@@ -882,13 +878,9 @@ import {parseTime} from '@/utils'
           var monitor_records = resp.data.monitor_records // 透析监测
           var dialysis_order = resp.data.dialysis_order // 透析记录
           var operators = resp.data.operators // 操作人
-
           var special_premission = resp.data.special_premission // 特殊权限
-
           var config = resp.data.config // 库存自动扣减配置
-
           var types = resp.data.types // 所有系统库存商品类型
-
           var last_predialysis_evaluation = resp.data.last_predialysis_evaluation // 上一次透前评估
           var last_assessment_after_dislysis = resp.data.last_assessment_after_dislysis // 上一次透前评估
           var last_monitor_record = resp.data.last_monitor_record
@@ -922,32 +914,15 @@ import {parseTime} from '@/utils'
           this.patient = patient
           this.schedual = schedual == null ? {} : schedual
           this.prescription = prescription == null ? {id: ''} : prescription
-          this.prescription_dialog_reset = false
-          this.$nextTick(() => {
-            this.prescription_dialog_reset = true
-          })
           this.solution = solution == null ? {id: ''} : solution
           this.last_prescription = last_prescription == null ? {id: ''} : last_prescription
-
-
-
-          this.receiver_treatment_access =
-              receiver_treatment_access == null
-                ? {id: ''}
-                : receiver_treatment_access
-          this.predialysis_evaluation =
-              predialysis_evaluation == null ? {} : predialysis_evaluation
-          this.last_predialysis_evaluation =
-              last_predialysis_evaluation == null
-                ? {}
-                : last_predialysis_evaluation
-
+          this.receiver_treatment_access = receiver_treatment_access == null ? {id: ''} : receiver_treatment_access
+          this.predialysis_evaluation = predialysis_evaluation == null ? {} : predialysis_evaluation
+          this.last_predialysis_evaluation = last_predialysis_evaluation == null ? {} : last_predialysis_evaluation
           this.doctor_advices = doctor_advices == null ? [] : doctor_advices
           this.special_premission = special_premission
           this.config = config
           this.goodTypes = types
-
-
           if (this.doctor_advices.length > 0) {
             var group = this.newAdviceGroupObject()
             var initGroupBlock = function (group, advice) {
@@ -1009,27 +984,23 @@ import {parseTime} from '@/utils'
 
           this.double_check = double_check == null ? {id: ''} : double_check
           this.assessment_after_dislysis = assessment_after_dislysis == null ? {id: ''} : assessment_after_dislysis
-          this.thoroug_dialog_reset = false
-          this.$nextTick(() => {
-            this.thoroug_dialog_reset = true
-          })
-          this.last_assessment_after_dislysis =
-              last_assessment_after_dislysis == null
-                ? {id: ''}
-                : last_assessment_after_dislysis
-          this.treatment_summary =
-              treatment_summary == null ? {id: ''} : treatment_summary
+          this.last_assessment_after_dislysis = last_assessment_after_dislysis == null ? {id: ''} : last_assessment_after_dislysis
+          this.treatment_summary = treatment_summary == null ? {id: ''} : treatment_summary
           this.monitor_records = monitor_records == null ? [] : monitor_records
-          this.last_monitor_record =
-              last_monitor_record == null
-                ? this.last_monitor_record
-                : last_monitor_record
-          this.dialysis_order =
-              dialysis_order == null ? {id: ''} : dialysis_order
+          this.last_monitor_record = last_monitor_record == null ? this.last_monitor_record : last_monitor_record
+          this.dialysis_order =  dialysis_order == null ? {id: ''} : dialysis_order
           this.operators = operators
           this.$refs.stat_order.setAdvices(this.doctor_advices)
           this.$refs.monitoring.setRecords(this.monitor_records)
 
+          // 强制刷新子组件
+          this.thoroug_dialog_reset = false
+          this.$nextTick(() => { this.thoroug_dialog_reset = true })
+          this.prescription_dialog_reset = false
+          this.$nextTick(() => { this.prescription_dialog_reset = true })
+          this.monit_dialog_reset = false;
+          this.$nextTick(() => { this.monit_dialog_reset = true })
+
           this.title = patient.name
 
           dialysisGlobalConfig().then(rs => {
@@ -1534,21 +1505,16 @@ import {parseTime} from '@/utils'
           this.patient = patient
           this.schedual = schedual == null ? {} : schedual
           this.prescription = prescription == null ? {id: ''} : prescription
+
+
           this.solution = solution == null ? {id: ''} : solution
           this.last_prescription = last_prescription == null ? {id: ''} : last_prescription
 
 
 
-          this.receiver_treatment_access =
-            receiver_treatment_access == null
-              ? {id: ''}
-              : receiver_treatment_access
-          this.predialysis_evaluation =
-            predialysis_evaluation == null ? {} : predialysis_evaluation
-          this.last_predialysis_evaluation =
-            last_predialysis_evaluation == null
-              ? {}
-              : last_predialysis_evaluation
+          this.receiver_treatment_access = receiver_treatment_access == null ? {id: ''} : receiver_treatment_access
+          this.predialysis_evaluation = predialysis_evaluation == null ? {} : predialysis_evaluation
+          this.last_predialysis_evaluation = last_predialysis_evaluation == null ? {} : last_predialysis_evaluation
 
           this.doctor_advices = doctor_advices == null ? [] : doctor_advices
           this.special_premission = special_premission
@@ -1616,28 +1582,26 @@ import {parseTime} from '@/utils'
           }
 
           this.double_check = double_check == null ? {id: ''} : double_check
-          this.assessment_after_dislysis =
-            assessment_after_dislysis == null
-              ? {id: ''}
-              : assessment_after_dislysis
-          this.last_assessment_after_dislysis =
-            last_assessment_after_dislysis == null
-              ? {id: ''}
-              : last_assessment_after_dislysis
-          this.treatment_summary =
-            treatment_summary == null ? {id: ''} : treatment_summary
+          this.assessment_after_dislysis = assessment_after_dislysis == null ? {id: ''} : assessment_after_dislysis
+          this.last_assessment_after_dislysis = last_assessment_after_dislysis == null ? {id: ''} : last_assessment_after_dislysis
+          this.treatment_summary =  treatment_summary == null ? {id: ''} : treatment_summary
           this.monitor_records = monitor_records == null ? [] : monitor_records
-          this.last_monitor_record =
-            last_monitor_record == null
-              ? this.last_monitor_record
-              : last_monitor_record
-          this.dialysis_order =
-            dialysis_order == null ? {id: ''} : dialysis_order
+          this.last_monitor_record = last_monitor_record == null  ? this.last_monitor_record : last_monitor_record
+          this.dialysis_order = dialysis_order == null ? {id: ''} : dialysis_order
           this.operators = operators
           this.$refs.stat_order.setAdvices(this.doctor_advices)
           this.$refs.monitoring.setRecords(this.monitor_records)
 
           this.title = patient.name
+          // 强制刷新子组件
+
+          this.thoroug_dialog_reset = false
+          this.$nextTick(() => { this.thoroug_dialog_reset = true })
+          this.prescription_dialog_reset = false
+          this.$nextTick(() => { this.prescription_dialog_reset = true })
+          this.monit_dialog_reset = false;
+          this.$nextTick(() => { this.monit_dialog_reset = true })
+
         } else {
           this.$toast({
             message: resp.msg