新分支

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -3061,7 +3061,7 @@ mu
         }
         // console.log('this.dialysisPrescription.mode_id', this.dialysisPrescription.mode_id)
         // console.log('this.schedual', schedual.mode_id)
-        if (pre.mode_id == 2 || pre.mode_id == 5 || pre.mode_id == 12 || schedual.mode_id == 2 || schedual.mode_id == 5 || schedual.mode_id == 12 || schedual.mode_id == 0 || schedual.mode_id == 37 || schedual.mode_id == 36 || schedual.mode_id == 35 || schedual.mode_id == 34) {
+        if (pre.mode_id == 2 || pre.mode_id == 5 || pre.mode_id == 12 || schedual.mode_id == 2 || schedual.mode_id == 5 || schedual.mode_id == 12 || schedual.mode_id == 0 || schedual.mode_id == 37 || schedual.mode_id == 36 || schedual.mode_id == 35 || schedual.mode_id == 34|| schedual.mode_id == 41) {
           this.zhiShow = true
           this.huShow = true
           this.totalShow = true

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -2197,7 +2197,7 @@
 
 
                       <tr
-                      v-if="org_id == 0 || org_id ==10206"
+                      v-if="org_id == 0 || org_id ==10206 || org_id== 10489"
                       v-for="(advice, advice_index) in projectsOne"
                       :key="advice_index"
                     >
@@ -2412,7 +2412,7 @@
                         </span>
                         </td>
                       </tr>
-                      <!-- </template> -->
+                     
 
 
                       <tr
@@ -5639,7 +5639,7 @@ export default {
 
         console.log("haaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",this.doctor_advices)
 
-        if(this.org_id ==10206 || this.org_id ==10489 || this.org_id ==10644 || this.org_id ==10633){
+        if(this.org_id ==10206 || this.org_id ==10489 || this.org_id ==10644 || this.org_id ==10633 || this.org_id == 0){
           let projectsOne = [];
           response.data.data.projects.map((item) => {
               projectsOne.push(item);
@@ -5702,15 +5702,16 @@ export default {
 
 
 
-        if(this.org_id!=10510 && this.org_id!=0&&this.org_id!=10206 && this.org_id!=10478){
+        if(this.org_id!=10510 && this.org_id!=0&&this.org_id!=10206 && this.org_id!=10478 && this.org_id!=0 && this.org_id!=10489){
             if(this.projects!=null && this.projects.length >0){
              for(let i=0;i<this.projects.length;i++){
               if(this.projects[i].type== 2){
 
                 this.projects[i].project_team_name = ""
                 this.projects[i].project_team_id = 0
-                console.log("this.projects[i].project.team",this.projects[i].project.team)
+               
                 if(this.projects[i].team!= "undefined" && this.projects[i].team.id >0){
+                  console.log("this.projects[i].project.team", this.projects[i].team)
                   this.projects[i].project_team = this.projects[i].team.project_team
                   this.projects[i].project_team_id = this.projects[i].team.id
                   this.projects[i].start_time = this.projects[i].start_time

src/xt_pages/org/orginfo.vue

@@ -411,6 +411,36 @@ import Neditor from '@/components/Neditor'
                     this.form.illness = res.data.orginfo.illness;
                     this.form.illness_list = [];
                     this.form.org_gallery = res.data.orginfo.org_gallery;
+                    
+                    this.orgtypes = [];
+                    this.orgtypesMap ={},
+                    this.childtypes = [];
+                    var orgtypes = res.data.orgtypes;
+                    for (const index in orgtypes) {
+                        if(orgtypes[index].pid>0) {
+                            if(!(orgtypes[index].pid in this.orgtypesMap)) {
+                                this.orgtypesMap[orgtypes[index].pid] = [];
+                            }
+                            this.orgtypesMap[orgtypes[index].pid].push(orgtypes[index]);
+                            if(orgtypes[index].id == this.form.org_type) {
+                                this.form.child_type = orgtypes[index].id;
+                                this.form.parent_type = orgtypes[index].pid;
+                            }
+                        }else {
+                            this.orgtypes.push(orgtypes[index]);
+                            if(orgtypes[index].id == this.form.org_type) {
+                                this.form.parent_type = orgtypes[index].id;
+                            }
+                        }
+                    }
+                    if (this.form.parent_type in this.orgtypesMap) {
+                        this.childtypes = this.orgtypesMap[this.form.parent_type];
+                    }else {
+                        this.childtypes = [];
+                    }
+                    console.log("机构",this.orgtypesMap)
+                    this.illnessOptions = res.data.illness?res.data.illness:[];
+                    console.log("疾病类型",this.illnessOptions)
                     this.fileList = [];
                     var gallery =  res.data.orginfo.org_gallery
                     console.log("haaaaaaaaaaaaaaaaaa",gallery)
@@ -466,33 +496,6 @@ import Neditor from '@/components/Neditor'
                     this.citys = res.data.citys?res.data.citys:[];
                     this.districts = res.data.districts?res.data.districts:[];
 
-                    this.orgtypes = [];
-                    this.orgtypesMap ={},
-                    this.childtypes = [];
-                    var orgtypes = res.data.orgtypes;
-                    for (const index in orgtypes) {
-                        if(orgtypes[index].pid>0) {
-                            if(!(orgtypes[index].pid in this.orgtypesMap)) {
-                                this.orgtypesMap[orgtypes[index].pid] = [];
-                            }
-                            this.orgtypesMap[orgtypes[index].pid].push(orgtypes[index]);
-                            if(orgtypes[index].id == this.form.org_type) {
-                                this.form.child_type = orgtypes[index].id;
-                                this.form.parent_type = orgtypes[index].pid;
-                            }
-                        }else {
-                            this.orgtypes.push(orgtypes[index]);
-                            if(orgtypes[index].id == this.form.org_type) {
-                                this.form.parent_type = orgtypes[index].id;
-                            }
-                        }
-                    }
-                    if (this.form.parent_type in this.orgtypesMap) {
-                        this.childtypes = this.orgtypesMap[this.form.parent_type];
-                    }else {
-                        this.childtypes = [];
-                    }
-                    this.illnessOptions = res.data.illness?res.data.illness:[];
                    
                 } else {
                     this.formloading = 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()
   // console.log(store.getters.current_role_urls.indexOf(to.path))