Browse Source

hah阿凡达

28169 21 hours ago
parent
commit
a4be7bde65

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

815
                         </el-form-item>
815
                         </el-form-item>
816
                     </el-col>
816
                     </el-col>
817
 
817
 
818
-                    <el-col :span="8" v-if="isShows('透析器') && this.$store.getters.xt_user.template_info.org_id != 10164">
818
+                    <el-col :span="8" v-if="isShows('透析器') && this.$store.getters.xt_user.template_info.org_id != 10164 && this.$store.getters.xt_user.template_info.org_id != 10727">
819
                         <el-form-item label="透析器:" prop="dialysis_dialyszers" :rules="isCheckmust('透析器')">
819
                         <el-form-item label="透析器:" prop="dialysis_dialyszers" :rules="isCheckmust('透析器')">
820
                             <el-input v-model="dialysisPrescription.dialysis_dialyszers"
820
                             <el-input v-model="dialysisPrescription.dialysis_dialyszers"
821
                                       @focus="showInnerDialog('7')"></el-input>
821
                                       @focus="showInnerDialog('7')"></el-input>
823
                     </el-col>
823
                     </el-col>
824
 
824
 
825
 
825
 
826
-                    <el-col :span="8" v-if="isShows('透析器') && this.$store.getters.xt_user.template_info.org_id == 10164"  >
826
+                    <el-col :span="8" v-if="isShows('透析器') && (this.$store.getters.xt_user.template_info.org_id == 10164 || this.$store.getters.xt_user.template_info.org_id == 10727)"  >
827
                         <el-form-item label="透析器:" prop="dialysis_dialyszers" :rules="isCheckmust('透析器')">
827
                         <el-form-item label="透析器:" prop="dialysis_dialyszers" :rules="isCheckmust('透析器')">
828
                             <el-input v-model="dialysisPrescription.dialysis_dialyszers"
828
                             <el-input v-model="dialysisPrescription.dialysis_dialyszers"
829
                                       @focus="showInnerDialog('20')"></el-input>
829
                                       @focus="showInnerDialog('20')"></el-input>

+ 2 - 2
src/xt_pages/user/dialysisSolution.vue View File

535
               </el-form-item>
535
               </el-form-item>
536
          </el-col>
536
          </el-col>
537
 
537
 
538
-          <el-col :span="8" v-if="isShows('灌流器')&& this.$store.getters.xt_user.template_info.org_id != 10164" >
538
+          <el-col :span="8" v-if="isShows('灌流器')&& this.$store.getters.xt_user.template_info.org_id != 10164 && this.$store.getters.xt_user.template_info.org_id != 10727" >
539
             <el-form-item label="灌流器:">
539
             <el-form-item label="灌流器:">
540
               <el-input v-model="dialysis_irrigation" @focus="showInnerDialog('7')"></el-input>
540
               <el-input v-model="dialysis_irrigation" @focus="showInnerDialog('7')"></el-input>
541
             </el-form-item>
541
             </el-form-item>
542
           </el-col>
542
           </el-col>
543
 
543
 
544
-          <el-col :span="8" v-if="isShows('灌流器')&& this.$store.getters.xt_user.template_info.org_id == 10164" >
544
+          <el-col :span="8" v-if="isShows('灌流器')&& (this.$store.getters.xt_user.template_info.org_id == 10164 || this.$store.getters.xt_user.template_info.org_id == 10727)" >
545
             <el-form-item label="灌流器:">
545
             <el-form-item label="灌流器:">
546
               <el-input v-model="dialysis_irrigation" @focus="showInnerDialog('21')"></el-input>
546
               <el-input v-model="dialysis_irrigation" @focus="showInnerDialog('21')"></el-input>
547
             </el-form-item>
547
             </el-form-item>

+ 13 - 13
src/xt_permission.js View File

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