Merge branch 'master' of http://git.shengws.com/csx/Vue_New

src/xt_pages/dialysis/batch_print/batch_print_order.vue

@@ -1201,7 +1201,7 @@
                         压迫后内瘘震颤：
                         <label-box
                           :isChecked="
-                            record.assessment_after_dislysis.internal_fistula.indexOf(
+                            record.assessment_before_dislysis.internal_fistula.indexOf(
                               '震颤-存在'
                             ) > -1
                               ? true
@@ -1211,7 +1211,7 @@
                         ></label-box>
                         <label-box
                           :isChecked="
-                            record.assessment_after_dislysis.internal_fistula.indexOf(
+                            record.assessment_before_dislysis.internal_fistula.indexOf(
                               '震颤-减弱'
                             ) > -1
                               ? true
@@ -1221,7 +1221,7 @@
                         ></label-box>
                         <label-box
                           :isChecked="
-                            record.assessment_after_dislysis.internal_fistula.indexOf(
+                            record.assessment_before_dislysis.internal_fistula.indexOf(
                               '震颤-无'
                             ) > -1
                               ? true

src/xt_pages/dialysis/batch_print/batch_print_order_other.vue

@@ -291,7 +291,7 @@
                           :checked="
                             isValueIndexOfCheck(
                               record.assessment_before_dislysis,
-                              'blood_access_internal_fistula',
+                              'internal_fistula',
                               '正常'
                             )
                           "
@@ -301,7 +301,7 @@
                           :checked="
                             isValueIndexOfCheck(
                               record.assessment_before_dislysis,
-                              'blood_access_internal_fistula',
+                              'internal_fistula',
                               '震颤'
                             )
                           "
@@ -311,7 +311,7 @@
                           :checked="
                             isValueIndexOfCheck(
                               record.assessment_before_dislysis,
-                              'blood_access_internal_fistula',
+                              'internal_fistula',
                               '堵塞'
                             )
                           "
@@ -321,7 +321,7 @@
                           :checked="
                             isValueIndexOfCheck(
                               record.assessment_before_dislysis,
-                              'blood_access_internal_fistula',
+                              'internal_fistula',
                               '血肿'
                             )
                           "
@@ -331,7 +331,7 @@
                           :checked="
                             isValueIndexOfCheck(
                               record.assessment_before_dislysis,
-                              'blood_access_internal_fistula',
+                              'internal_fistula',
                               '淤血'
                             )
                           "
@@ -341,7 +341,7 @@
                           :checked="
                             isValueIndexOfCheck(
                               record.assessment_before_dislysis,
-                              'blood_access_internal_fistula',
+                              'internal_fistula',
                               '感染'
                             )
                           "

src/xt_pages/dialysis/template/dialysisPrintOrderTwo.vue

@@ -222,7 +222,7 @@
                     <check-box
                       text="正常"
                       :checked="
-                        predialysis.internal_fistula.indexOf('震颤-存在') > -1
+                        predialysis.internal_fistula.indexOf('正常') > -1
                           ? true
                           : false
                       "
@@ -230,7 +230,7 @@
                     <check-box
                       text="震颤"
                       :checked="
-                        predialysis.internal_fistula.indexOf('震颤-减弱') > -1
+                        predialysis.internal_fistula.indexOf('震颤') > -1
                           ? true
                           : false
                       "

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()