Browse Source

新分支

28169 7 months ago
parent
commit
d5eda73aab

+ 4 - 2
src/xt_pages/dialysis/PatientBox.vue View File

590
             }
590
             }
591
           }
591
           }
592
           var lastMonitorRecord = resp.data.lastMonitorRecord;
592
           var lastMonitorRecord = resp.data.lastMonitorRecord;
593
-          var lastAssessmentAfterDislysis =
594
-            resp.data.lastAssessmentAfterDislysis;
593
+          var lastAssessmentAfterDislysis = resp.data.lastAssessmentAfterDislysis;
594
+          // if(this.$store.getters.xt_user.org.id == 10702 || this.$store.getters.xt_user.org.id == 0){
595
+          //   lastAssessmentAfterDislysis.actual_ultrafiltration = 0
596
+          // }
595
           var lastDialysisPrescribe = resp.data.lastDialysisPrescribe;
597
           var lastDialysisPrescribe = resp.data.lastDialysisPrescribe;
596
           var lastDryWeightDislysis = resp.data.lastDryWeightDislysis;
598
           var lastDryWeightDislysis = resp.data.lastDryWeightDislysis;
597
 
599
 

+ 2 - 1
src/xt_pages/dialysis/details/dialog/AssessmentAfterDislysis.vue View File

1135
       }
1135
       }
1136
     },
1136
     },
1137
     isShow(name) {
1137
     isShow(name) {
1138
+      
1138
       var filedList = store.getters.xt_user.fileds
1139
       var filedList = store.getters.xt_user.fileds
1139
 
1140
 
1140
       for (let i = 0; i < filedList.length; i++) {
1141
       for (let i = 0; i < filedList.length; i++) {
1511
       if(predialysis != null && predialysis.id == 0){
1512
       if(predialysis != null && predialysis.id == 0){
1512
         if (last_after != null) {
1513
         if (last_after != null) {
1513
           for (var key in last_after){
1514
           for (var key in last_after){
1514
-            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' ){
1515
+            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'  ){
1515
               this.$set(
1516
               this.$set(
1516
                 this.form,
1517
                 this.form,
1517
                 key,
1518
                 key,

+ 3 - 3
src/xt_pages/dialysis/details/index.vue View File

2055
           }
2055
           }
2056
           var lastMonitorRecord = resp.data.lastMonitorRecord
2056
           var lastMonitorRecord = resp.data.lastMonitorRecord
2057
           var lastAssessmentAfterDislysis = resp.data.lastAssessmentAfterDislysis
2057
           var lastAssessmentAfterDislysis = resp.data.lastAssessmentAfterDislysis
2058
-          if(this.org_id == 10702){
2059
-            lastAssessmentAfterDislysis.actual_ultrafiltration = 0
2060
-          }
2058
+          // if(this.org_id == 10702){
2059
+          //   lastAssessmentAfterDislysis.actual_ultrafiltration = 0
2060
+          // }
2061
           // if(lastAssessmentAfterDislysis.hypertenison!=""){
2061
           // if(lastAssessmentAfterDislysis.hypertenison!=""){
2062
           //   lastAssessmentAfterDislysis.hypertenison = lastAssessmentAfterDislysis.hypertenison.toString()
2062
           //   lastAssessmentAfterDislysis.hypertenison = lastAssessmentAfterDislysis.hypertenison.toString()
2063
           // }
2063
           // }

+ 13 - 13
src/xt_permission.js View File

12
 
12
 
13
 router.beforeEach((to, from, next) => {
13
 router.beforeEach((to, from, next) => {
14
   // 线上注释
14
   // 线上注释
15
-  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
16
-    store.dispatch('VerifyConfigList', []).then(() => {
17
-      next()
18
-    })
19
-  }
20
-  if (store.getters.permission_routers === undefined) {
21
-    store.dispatch('xt_GenerateRoutes', []).then(() => {
22
-      next()
23
-    })
24
-  } else {
25
-    next()
26
-  }
27
-  return
15
+  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
16
+  //   store.dispatch('VerifyConfigList', []).then(() => {
17
+  //     next()
18
+  //   })
19
+  // }
20
+  // if (store.getters.permission_routers === undefined) {
21
+  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
22
+  //     next()
23
+  //   })
24
+  // } else {
25
+  //   next()
26
+  // }
27
+  // return
28
   // 线上注释
28
   // 线上注释
29
   NProgress.start()
29
   NProgress.start()
30
   // console.log(store.getters.current_role_urls.indexOf(to.path))
30
   // console.log(store.getters.current_role_urls.indexOf(to.path))