Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1769,7 +1769,7 @@
                     </table>
                   </td>
                 </tr>
-                <tr v-if="org_id != 10206 && org_id!=0 && org_id!=10744">
+                <tr v-if="org_id != 10206 && org_id!=0">
                   <td style="padding: 0; position: relative" colspan="2">
                     <table class="inside_table">
                       <tbody>
@@ -1955,7 +1955,7 @@
                   </td>
                 </tr>
 
-                <tr v-if="org_id == 10206 || org_id == 0 || org_id == 10744">
+                <tr v-if="org_id == 10206 || org_id == 0">
                   <td style="padding: 0; position: relative" colspan="2">
                     <table class="inside_table">
                       <tbody>
@@ -4451,7 +4451,7 @@ export default {
       
 
         //针对内蒙古阿拉善
-        if (this.org_id == 10206 || this.org_id == 0 || this.org_id == 10744) {
+        if (this.org_id == 10206 || this.org_id == 9671) {
 
           if (this.doctor_advices != null && this.doctor_advices.length > 0) {
 
@@ -4518,7 +4518,7 @@ export default {
         console.log("ma新时间我哦我哦", this.new_doctor_advice_list)
 
           //过滤口服药
-          if (this.org_id == 0 || this.org_id ==10744) {
+          if (this.org_id == 0) {
           var docArr = []
           if (this.new_doctor_advice_list != null && this.new_doctor_advice_list.length > 0) {
             for (let i = 0; i < this.new_doctor_advice_list.length; i++) {

src/xt_pages/outpatientTool/labelPrint.vue

@@ -139,7 +139,7 @@
                       <div style="margin-bottom:0px;">{{current_number}}</div>
                       <div style="display:flex;">
                           <div style="font-size:18px;padding-left:20px;font-weight: bold">{{current_project_name}}</div>
-                          <div style="font-size:14px;margin-left:20px;font-weight: bold">{{current_name}}</div>
+                          <div style="font-size:28px;margin-left:20px;font-weight: bold">{{current_name}}</div>
                       </div>
                   </div>
             </div>

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