28169 1 week ago
parent
commit
dd40838a9d

+ 6 - 5
src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue View File

@@ -3,7 +3,7 @@
3 3
         <el-dialog
4 4
                 title="透析处方"
5 5
                 :visible.sync="isVisibility"
6
-                width="78%"
6
+                width="72%"
7 7
                 :modal = 'false'
8 8
                 :modal-append-to-body="false"
9 9
                 :close-on-click-modal="false"
@@ -27,16 +27,17 @@
27 27
                 <span v-if="this.$store.getters.xt_user.template_info.org_id!=0 && this.$store.getters.xt_user.template_info.org_id!=10702">{{last_record&&last_record.weight_after?last_record.weight_after:""}}kg</span>
28 28
                 <span v-if="this.$store.getters.xt_user.template_info.org_id==0 || this.$store.getters.xt_user.template_info.org_id==10702">{{last_record&&(last_record.weight_after-last_record.additional_weight).toFixed(2)?(last_record.weight_after-last_record.additional_weight).toFixed(2):""}}kg</span>
29 29
               </span>&nbsp;&nbsp;
30
+              体重增长:
31
+                <span v-if="predialysis!=null && last_record!=null">
32
+                  {{predialysis&&last_record&&((predialysis.weight_before - predialysis.additional_weight)-(last_record.weight_after-last_record.additional_weight)).toFixed(2)?((predialysis.weight_before - predialysis.additional_weight)-(last_record.weight_after-last_record.additional_weight)).toFixed(2):"" }} kg
33
+                </span>&nbsp;&nbsp;
30 34
             </div>
31 35
             <div style="position: absolute;left: 20%;top: 10%;width: 80%;">
32 36
               <span style="display: inline-block;" v-if="this.$store.getters.xt_user.template_info.org_id==0||this.$store.getters.xt_user.template_info.org_id==10702 || this.$store.getters.xt_user.template_info.org_id ==10721">
33 37
                 衣物重:{{predialysis&&predialysis.additional_weight?predialysis.additional_weight:"" }} kg
34 38
               </span>&nbsp;&nbsp;
35 39
               <div v-if="org_id == 0 ||org_id ==10702 || org_id ==10598 || org_id ==10721" style="display: inline-block;">
36
-                体重增长:
37
-                <span v-if="predialysis!=null && last_record!=null">
38
-                  {{predialysis&&last_record&&((predialysis.weight_before - predialysis.additional_weight)-(last_record.weight_after-last_record.additional_weight)).toFixed(2)?((predialysis.weight_before - predialysis.additional_weight)-(last_record.weight_after-last_record.additional_weight)).toFixed(2):"" }} kg
39
-                </span>&nbsp;&nbsp;
40
+              
40 41
                 <span style="">
41 42
                   4小时超滤量上限(5%):
42 43
                   <span v-if="predialysis!=null && ((predialysis.dry_weight)*0.05) >0 "></span> {{(predialysis.dry_weight*0.05).toFixed(2)}}

+ 13 - 13
src/xt_permission.js View File

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
12 12
 
13 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 29
   NProgress.start()
30 30
   // console.log(store.getters.current_role_urls.indexOf(to.path))