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

src/pages/main/dialog/MonitDialog.vue

@@ -1308,7 +1308,7 @@ export default {
       .typeButton {
         height: 38px;
         line-height: 38px;
-        font-size: 0.45rem;
+        font-size: 0.42rem;
         padding: 0 !important;
         @media only screen and (min-width: 415px) and (max-width: 767px) {
           font-size: 0.4rem;

src/pages/main/dialog/PrescriptionDialog.vue

@@ -1088,6 +1088,7 @@
               this.zhiShow = true
               this.totalShow = true
               this.huShow  = true 
+              console.log("aa")
             }
           }
         }

src/pages/main/today/TodayTab.vue

@@ -125,7 +125,7 @@
     <treatment-of id="treatment_of" ref="treatment_of" title="治疗小结" :record="treatment_summary"></treatment-of>
 </div>
     <van-popup title="透析处方" v-model="menuList[1].showPopup" :overlay="true" :close-on-click-overlay="false">
-      <prescription-dialog :patient_prop="patient" :solution_prop="solution" :machines_prop="devices" :config="config"
+      <prescription-dialog v-if="prescription_dialog_reset == true" :patient_prop="patient" :solution_prop="solution" :machines_prop="devices" :config="config"
                            :prescription_prop="prescription" @finish="closePrescriptionDialog" :operators="operators"
                            :types="goodTypes" :info="goodInfos" :status="status" :targetAdvices="longAdvices"
                            :waitUploadAdvices="waitUploadAdvices" :is_open="is_open"
@@ -254,6 +254,7 @@
       :close-on-click-overlay="false"
     >
       <thoroug-dialog
+        v-if="thoroug_dialog_reset == true"
         :patient_prop="patient"
         :record="assessment_after_dislysis"
         :last_record="last_assessment_after_dislysis"
@@ -368,6 +369,8 @@ import {parseTime} from '@/utils'
         prescription: {}, // 透析处方
         solution: {}, // 透析方案
         last_prescription:{},
+        thoroug_dialog_reset: true,
+        prescription_dialog_reset: true,
         receiver_treatment_access: {}, // 接诊评估
         predialysis_evaluation: {}, // 透前评估
         last_predialysis_evaluation: {}, // 上次透前评估
@@ -761,6 +764,7 @@ 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: ''}
@@ -918,6 +922,10 @@ 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
 
@@ -1000,10 +1008,11 @@ 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.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: ''}
@@ -1324,11 +1333,12 @@ import {parseTime} from '@/utils'
       // this.scrollToView('monitoring')
     },
 
-    closeDialysisOff: function (assessment_after_dislysis) {debugger
+    closeDialysisOff: function (assessment_after_dislysis) {
       this.closeDialog(7)
       if (assessment_after_dislysis != undefined) {
         this.assessment_after_dislysis = assessment_after_dislysis
       }
+      this.requestDialysisRecord()
     },
     closeDialysisOffclose: function () {
       this.closeDialog(7)