Bladeren bron

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

陈少旭 2 weken geleden
bovenliggende
commit
ccf08548b1

+ 4 - 4
src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue Bestand weergeven

1769
                     </table>
1769
                     </table>
1770
                   </td>
1770
                   </td>
1771
                 </tr>
1771
                 </tr>
1772
-                <tr v-if="org_id != 10206 && org_id!=0 && org_id!=10744">
1772
+                <tr v-if="org_id != 10206 && org_id!=0">
1773
                   <td style="padding: 0; position: relative" colspan="2">
1773
                   <td style="padding: 0; position: relative" colspan="2">
1774
                     <table class="inside_table">
1774
                     <table class="inside_table">
1775
                       <tbody>
1775
                       <tbody>
1955
                   </td>
1955
                   </td>
1956
                 </tr>
1956
                 </tr>
1957
 
1957
 
1958
-                <tr v-if="org_id == 10206 || org_id == 0 || org_id == 10744">
1958
+                <tr v-if="org_id == 10206 || org_id == 0">
1959
                   <td style="padding: 0; position: relative" colspan="2">
1959
                   <td style="padding: 0; position: relative" colspan="2">
1960
                     <table class="inside_table">
1960
                     <table class="inside_table">
1961
                       <tbody>
1961
                       <tbody>
4451
       
4451
       
4452
 
4452
 
4453
         //针对内蒙古阿拉善
4453
         //针对内蒙古阿拉善
4454
-        if (this.org_id == 10206 || this.org_id == 0 || this.org_id == 10744) {
4454
+        if (this.org_id == 10206 || this.org_id == 9671) {
4455
 
4455
 
4456
           if (this.doctor_advices != null && this.doctor_advices.length > 0) {
4456
           if (this.doctor_advices != null && this.doctor_advices.length > 0) {
4457
 
4457
 
4518
         console.log("ma新时间我哦我哦", this.new_doctor_advice_list)
4518
         console.log("ma新时间我哦我哦", this.new_doctor_advice_list)
4519
 
4519
 
4520
           //过滤口服药
4520
           //过滤口服药
4521
-          if (this.org_id == 0 || this.org_id ==10744) {
4521
+          if (this.org_id == 0) {
4522
           var docArr = []
4522
           var docArr = []
4523
           if (this.new_doctor_advice_list != null && this.new_doctor_advice_list.length > 0) {
4523
           if (this.new_doctor_advice_list != null && this.new_doctor_advice_list.length > 0) {
4524
             for (let i = 0; i < this.new_doctor_advice_list.length; i++) {
4524
             for (let i = 0; i < this.new_doctor_advice_list.length; i++) {

+ 1 - 1
src/xt_pages/outpatientTool/labelPrint.vue Bestand weergeven

139
                       <div style="margin-bottom:0px;">{{current_number}}</div>
139
                       <div style="margin-bottom:0px;">{{current_number}}</div>
140
                       <div style="display:flex;">
140
                       <div style="display:flex;">
141
                           <div style="font-size:18px;padding-left:20px;font-weight: bold">{{current_project_name}}</div>
141
                           <div style="font-size:18px;padding-left:20px;font-weight: bold">{{current_project_name}}</div>
142
-                          <div style="font-size:14px;margin-left:20px;font-weight: bold">{{current_name}}</div>
142
+                          <div style="font-size:28px;margin-left:20px;font-weight: bold">{{current_name}}</div>
143
                       </div>
143
                       </div>
144
                   </div>
144
                   </div>
145
             </div>
145
             </div>

+ 13 - 13
src/xt_permission.js Bestand weergeven

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