Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/dialysis/details/consumable/dialysisParameter.vue

@@ -997,7 +997,7 @@
           mode_name = "HDF"
          }
          if(id == 3){
-          mode_name = "HDF"
+          mode_name = "HD+HP"
          }
          if(id == 4){
           mode_name = "HP"

src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue

@@ -1600,7 +1600,7 @@ export default {
         }
       }
 
-      if(this.$store.getters.xt_user.org.id == 9671 || this.$store.getters.xt_user.org.id == 9675 || this.$store.getters.xt_user.org.id == 10340 || this.$store.getters.xt_user.org.id == 10517 || this.$store.getters.xt_user.org.id == 10580){
+      if(this.$store.getters.xt_user.org.id == 9671 || this.$store.getters.xt_user.org.id == 9675 || this.$store.getters.xt_user.org.id == 10340 || this.$store.getters.xt_user.org.id == 10517 || this.$store.getters.xt_user.org.id == 10580 || this.$store.getters.xt_user.org.id == 10579){
          var date = new Date()
           var year = date.getFullYear()
           var month = date.getMonth() + 1

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

@@ -2604,6 +2604,14 @@ mu
             } else if (schedual.schedule_type == 3) {
               this.start_time = year + '-' + month + '-' + day + ' ' + '18:00'
             }
+           }else if(this.$store.getters.xt_user.org.id == 10579){
+              if (schedual.schedule_type == 1) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '7:00'
+            } else if (schedual.schedule_type == 2) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '11:00'
+            } else if (schedual.schedule_type == 3) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '18:00'
+            }
            }else if(this.$store.getters.xt_user.org.id == 10440){
               if (schedual.schedule_type == 1) {
               this.start_time = year + '-' + month + '-' + day + ' ' + '7:00'
@@ -2744,6 +2752,7 @@ mu
           last_weight_after = this.last_record.weight_after
         }
         console.log("last2323232323232332wode",this.predialysis)
+        console.log("lastwoowowow",last)
         if(this.predialysis!=null && this.predialysis.id == 0){
             if(this.$store.getters.xt_user.org.id == 9671 || this.$store.getters.xt_user.org.id == 9675 || this.$store.getters.xt_user.org.id == 10340 ){
               this.dialysisPrescription.sodium = 138
@@ -2776,6 +2785,7 @@ mu
             this.dialysisPrescription.a_liquid = last.a_liquid
             this.zongliang = last.anticoagulant_zongliang
             this.dialysisPrescription.chaptalization = last.chaptalization
+            this.dialysisPrescription.blood_access_part_id = last.blood_access_part_id
             if(this.$store.getters.xt_user.template_info.org_id!=10013  && this.$store.getters.xt_user.template_info.org_id!=10014){
               this.remark = last.remark
             }
@@ -5071,8 +5081,7 @@ mu
       }
     },
     created() {
-      console.log('weretrertf',this.dialysisPrescription.sodium);
-      console.log("schedual232323323232323232",this.adminRoles)
+      
       this.illnessList = getDataConfig('hemodialysis', 'illness')
 
       this.blood_access_part = getDataConfig('hemodialysis', 'vascular_access')
@@ -5084,7 +5093,7 @@ mu
       this.educationList = getDataConfig('dialysis_remark', 'dialysis_remark')
 
      
-      console.log("透析准备232323232323wo",this.educationList)
+      
     }
   }
 </script>

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