新分支

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

@@ -212,7 +212,7 @@
             </el-option>
            </el-select>
            <label class="title"> <span class="name">病区选择</span> : </label>
-           <el-select v-model="partion_type" placeholder="请选择" @change="changePartionType" multiple>
+           <el-select v-model="partion_type" placeholder="请选择" multiple @change="changePartionType" >
             <el-option
               v-for="item in partitionArr"
               :key="item.id"
@@ -320,7 +320,7 @@
             </el-option>
            </el-select>
            <label class="title"> <span class="name">病区选择</span> : </label>
-           <el-select v-model="partion_type" placeholder="请选择" @change="changePartionType">
+           <el-select v-model="partion_type" multiple placeholder="请选择" @change="changePartionType">
             <el-option
               v-for="item in partitionArr"
               :key="item.id"

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

@@ -28,7 +28,7 @@
           <el-col :span="8" v-if="isShow('实际超滤量')">
             <el-form-item
               label="实际超滤量(ml): "
-              v-if=" this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26 || this.template_id == 28 || this.template_id == 27 || this.template_id == 29 || this.template_id == 30 || this.template_id == 31 || this.template_id == 32 || this.template_id == 34 || this.template_id == 36 || this.template_id == 38 || this.template_id == 43 || this.template_id == 44 || this.template_id == 47 || this.template_id == 56 || this.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10307 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10441 || this.$store.getters.xt_user.template_info.org_id == 10445"  >
+              v-if=" this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26 || this.template_id == 28 || this.template_id == 27 || this.template_id == 29 || this.template_id == 30 || this.template_id == 31 || this.template_id == 32 || this.template_id == 34 || this.template_id == 36 || this.template_id == 38 || this.template_id == 43 || this.template_id == 44 || this.template_id == 47 || this.template_id == 56 || this.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10307 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10441 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410"  >
               <el-input v-model="form.actual_ultrafiltration"></el-input>
             </el-form-item>
             <el-form-item label="实际超滤量(L): " v-else>
@@ -377,7 +377,7 @@
                 :value="item.id"
                 :key="item.id"
               ></el-option>
-            </el-select> 
+            </el-select>
           </el-form-item>
         </el-col>
 
@@ -625,7 +625,7 @@
             </el-form-item>
         </el-col>
 
-      
+
       </el-form>
 
 
@@ -967,7 +967,7 @@ export default {
       data['weight_after'] = this.form.weight_after ? parseFloat(this.form.weight_after) : 0
       data['weight_loss'] = this.form.weight_loss ? parseFloat(this.form.weight_loss) : 0
       data['temperature'] = this.form.temperature ? parseFloat(this.form.temperature) : 0
-      data['breathing_rate'] = this.form.breathing_rate 
+      data['breathing_rate'] = this.form.breathing_rate
       data['systolic_blood_pressure'] = this.form.systolic_blood_pressure ? parseFloat(this.form.systolic_blood_pressure) : 0
       data['diastolic_blood_pressure'] = this.form.diastolic_blood_pressure ? parseFloat(this.form.diastolic_blood_pressure) : 0
       data['pulse_frequency'] = this.form.pulse_frequency ? parseFloat(this.form.pulse_frequency) : 0
@@ -1211,14 +1211,14 @@ export default {
       if(predialysis.id > 0){
         this.form.hypopiesia = predialysis.hypopiesia.toString()
       }
-     
+
       //针对长沙南雅 ，透后体重 - 目标超滤量
       // if(predialysis.id > 0){
       //  if(this.$store.getters.xt_user.template_info.org_id == 9671 || this.$store.getters.xt_user.template_info.org_id == 9675 || this.$store.getters.xt_user.template_info.org_id == 10340){
       //    if(predialysis.weight_after == 0){
       //      if(this.predialysis_evaluation!=null && this.prescription.target_ultrafiltration!=null){
       //        this.form.weight_after = this.predialysis_evaluation.weight_before - (this.prescription.target_ultrafiltration/1000)
-      //      }  
+      //      }
       //    }
       //  }
       // }
@@ -1253,7 +1253,7 @@ export default {
         //    if(this.prescription!=null && this.predialysis_evaluation!=null){
         //     this.form.weight_after = this.predialysis_evaluation.weight_before - (this.prescription.target_ultrafiltration/1000)
         //    }
-          
+
         // }
       }
 

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