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

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

@@ -10,7 +10,7 @@
                 class="newDialog"
         >
             <el-button style="position: absolute;left: 12%;top: 2%" @click="handlePatientInfo(patient.id)">{{ patient.name }}</el-button>
-            <div style="position: absolute;left: 20%;top: 3%;width: 75%;">
+            <div style="position: absolute;left: 20%;top: 3%;width: 80%;">
               <span  v-if="this.$store.getters.xt_user.template_info.org_id!=0&&this.$store.getters.xt_user.template_info.org_id!=10702">
                 透前称重：{{predialysis&&predialysis.weight_before?predialysis.weight_before:"" }} kg
               </span>&nbsp;&nbsp;
@@ -28,7 +28,7 @@
                 <span v-if="this.$store.getters.xt_user.template_info.org_id==0 || this.$store.getters.xt_user.template_info.org_id==10702">{{last_record&&(last_record.weight_after-last_record.additional_weight).toFixed(2)?(last_record.weight_after-last_record.additional_weight).toFixed(2):""}}kg</span>
               </span>&nbsp;&nbsp;
             </div>
-            <div style="position: absolute;left: 20%;top: 10%;width: 75%;">
+            <div style="position: absolute;left: 20%;top: 10%;width: 80%;">
               <span style="display: inline-block;" v-if="this.$store.getters.xt_user.template_info.org_id==0||this.$store.getters.xt_user.template_info.org_id==10702 || this.$store.getters.xt_user.template_info.org_id ==10721">
                 衣物重：{{predialysis&&predialysis.additional_weight?predialysis.additional_weight:"" }} kg
               </span>&nbsp;&nbsp;
@@ -48,7 +48,7 @@
               </span>
             </div>
 
-            
+
             <!-- <span style="position: absolute;left: 48%;top: 3%"  :modal = 'false'>
               衣物重：{{predialysis&&predialysis.additional_weight?predialysis.additional_weight:""}}kg
             </span> -->
@@ -951,7 +951,7 @@
                     </el-col>
 
                     <el-col :span="8">
-                       
+
                     </el-col>
 
                     <el-col :span="8" v-if="isShows('置换液总量')" v-show="totalShow">
@@ -2636,7 +2636,7 @@ mu
       },
       show(pre, schedual, last, his_is_open,is_advice_open,admins) {
         console.log("除非=======================")
-      
+
         if(this.$store.getters.xt_user.template_info.org_id==10702 || this.$store.getters.xt_user.template_info.org_id==10635  || this.$store.getters.xt_user.template_info.org_id==0   || this.$store.getters.xt_user.template_info.org_id==10721 || this.$store.getters.xt_user.template_info.org_id==10726){
           if(this.predialysis!=undefined){
             if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
@@ -3105,7 +3105,7 @@ mu
         if(this.$store.getters.xt_user.template_info.org_id==10164 || this.$store.getters.xt_user.template_info.org_id==10721 || this.$store.getters.xt_user.template_info.org_id==10635 || this.$store.getters.xt_user.template_info.org_id==0 || this.$store.getters.xt_user.template_info.org_id == 10726){
           this.getPatientBefor()
         }
-      
+
 
         let last_weight_after = 0
         let weight_before = 0
@@ -3241,14 +3241,14 @@ mu
         }
 
         if(this.$store.getters.xt_user.template_info.org_id ==10635 || this.$store.getters.xt_user.template_info.org_id ==0 || this.$store.getters.xt_user.template_info.org_id ==10702 ||  this.$store.getters.xt_user.template_info.org_id == 10727 ||  this.$store.getters.xt_user.template_info.org_id == 10721){
-         
+
           if(this.dialysisPrescription.target_ultrafiltration == 0 || this.dialysisPrescription.target_ultrafiltration=="" || this.dialysisPrescription.target_ultrafiltration == "undefined" || this.dialysisPrescription.target_ultrafiltration == undefined){
-          
+
              this.dialysisPrescription.target_ultrafiltration = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(2)
-          
+
           }
         }
-      
+
       },
       hide() {
         this.isVisibility = false
@@ -3364,7 +3364,7 @@ mu
                 ParamsQuery['mode'] = '1'
                 ParamsQuery['patient_id'] = this.patient.id
                 console.log('第一', ParamsQuery)
-             
+
 
                 postPrescription(ParamsQuery).then(response => {
                   if (response.data.state == 0) {
@@ -4893,7 +4893,7 @@ mu
         })
     },
     getPatientBefor(){
-     
+
        var patient_id = 0
        var record_date =""
        if(this.$route.query.patient_id!=undefined){
@@ -4931,13 +4931,13 @@ mu
             // }
           }
           if(prescription!=undefined){
-           
+
             this.dialysisPrescription.target_ultrafiltration = prescription.target_ultrafiltration
             this.dialysisPrescription.prescription_water = prescription.prescription_water
           }
 
          }
-      }) 
+      })
     },
     unique(arr) {
       const res = new Map()
@@ -5561,7 +5561,7 @@ mu
 
         }
 
-      
+
 
       },
       stockType: function() {
@@ -5631,7 +5631,7 @@ mu
 
       this.org_id = this.$store.getters.xt_user.org.id
       console.log('this.org_id',this.org_id);
-      
+
     }
   }
 </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))