新分支

src/xt_pages/dialysis/PatientBox.vue

@@ -590,8 +590,10 @@ export default {
             }
           }
           var lastMonitorRecord = resp.data.lastMonitorRecord;
-          var lastAssessmentAfterDislysis =
-            resp.data.lastAssessmentAfterDislysis;
+          var lastAssessmentAfterDislysis = resp.data.lastAssessmentAfterDislysis;
+          // if(this.$store.getters.xt_user.org.id == 10702 || this.$store.getters.xt_user.org.id == 0){
+          //   lastAssessmentAfterDislysis.actual_ultrafiltration = 0
+          // }
           var lastDialysisPrescribe = resp.data.lastDialysisPrescribe;
           var lastDryWeightDislysis = resp.data.lastDryWeightDislysis;
 

src/xt_pages/dialysis/details/dialog/AssessmentAfterDislysis.vue

@@ -1135,6 +1135,7 @@ export default {
       }
     },
     isShow(name) {
+      
       var filedList = store.getters.xt_user.fileds
 
       for (let i = 0; i < filedList.length; i++) {
@@ -1511,7 +1512,7 @@ export default {
       if(predialysis != null && predialysis.id == 0){
         if (last_after != null) {
           for (var key in last_after){
-            if (key != 'actual_treatment_hour' && key != 'actual_treatment_minute' && key != 'weight_loss' && key != 'weight_after'  && key != 'systolic_blood_pressure' && key != 'diastolic_blood_pressure' && key != 'pulse_frequency' ){
+            if (key != 'actual_treatment_hour' && key != 'actual_treatment_minute' && key != 'weight_loss' && key != 'weight_after'  && key != 'systolic_blood_pressure' && key != 'diastolic_blood_pressure' && key != 'pulse_frequency'  && key != 'actual_ultrafiltration'  ){
               this.$set(
                 this.form,
                 key,

src/xt_pages/dialysis/details/index.vue

@@ -2055,9 +2055,9 @@ export default {
           }
           var lastMonitorRecord = resp.data.lastMonitorRecord
           var lastAssessmentAfterDislysis = resp.data.lastAssessmentAfterDislysis
-          if(this.org_id == 10702){
-            lastAssessmentAfterDislysis.actual_ultrafiltration = 0
-          }
+          // if(this.org_id == 10702){
+          //   lastAssessmentAfterDislysis.actual_ultrafiltration = 0
+          // }
           // if(lastAssessmentAfterDislysis.hypertenison!=""){
           //   lastAssessmentAfterDislysis.hypertenison = lastAssessmentAfterDislysis.hypertenison.toString()
           // }

src/xt_permission.js

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-    store.dispatch('VerifyConfigList', []).then(() => {
-      next()
-    })
-  }
-  if (store.getters.permission_routers === undefined) {
-    store.dispatch('xt_GenerateRoutes', []).then(() => {
-      next()
-    })
-  } else {
-    next()
-  }
-  return
+  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+  //   store.dispatch('VerifyConfigList', []).then(() => {
+  //     next()
+  //   })
+  // }
+  // if (store.getters.permission_routers === undefined) {
+  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
+  //     next()
+  //   })
+  // } else {
+  //   next()
+  // }
+  // return
   // 线上注释
   NProgress.start()
   // console.log(store.getters.current_role_urls.indexOf(to.path))