新分支

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyeight.vue

@@ -727,7 +727,9 @@
                           class="under_line"
                           style="width: 100px; text-align: center"
                         >
-                          /
+                        {{
+                          getDisplaceLiquiPart(record.prescription.displace_liqui_part)
+                        }}
                         </div>
                       </div>
                       <div
@@ -1748,7 +1750,7 @@
                               font-weight: 520;
                               font-size: 16px;
                               padding: 6px 8px;
-                              line-height: 30px;
+                              line-height: 24px;
                             "
                           >
                             医嘱内容
@@ -1785,7 +1787,7 @@
                             </td>
 
                             <td
-                              height="35px"
+                              height="26px"
                               colspan="2"
                               class="advice-name"
                               style="padding-left: 7px"
@@ -3118,9 +3120,11 @@ export default {
         "腹痛",
       ],
       org_id: "",
+      displaceLiquiPartOptions:[]
     };
   },
   created() {
+    this.displaceLiquiPartOptions = this.$store.getters.displace_liqui;
     var bloodAccessParOpera = getDataConfig(
       "hemodialysis",
       "vascular_access_desc"
@@ -3233,11 +3237,8 @@ export default {
             }
 
             var delghTwo = 0;
-            if (
-              this.records[recordIndex].advices &&
-              this.records[recordIndex].advices.length < 14
-            ) {
-              delghTwo = 14 - this.records[recordIndex].advices.length;
+            if (this.records[recordIndex].advices &&this.records[recordIndex].advices.length < 18) {
+              delghTwo =  this.records[recordIndex].advices.length;
             } else {
               delghTwo = 0;
             }
@@ -3348,6 +3349,16 @@ export default {
       });
   },
   methods: {
+    getDisplaceLiquiPart: function (val) {
+      let displace_liqui_part_name = "/";
+      const displace_liqui_part = this.displaceLiquiPartOptions;
+      for (let i = 0; i < displace_liqui_part.length; i++) {
+        if (displace_liqui_part[i].id == val) {
+          displace_liqui_part_name = displace_liqui_part[i].name;
+        }
+      }
+      return displace_liqui_part_name;
+    },
     getUnit: function (val) {
       if (val.assessment_after_dislysis == null) {
         return "";

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