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

build/cdn.json

@@ -1,3 +1,3 @@
 {
-  "version": "2999.999.13776"
+  "version": "2999.999.13784"
 }

src/pages/main/PatientBox.vue

@@ -565,7 +565,8 @@
                   $store.getters.user.template_info.org_id == 10445 ||
                   $store.getters.user.template_info.org_id ==10597 ||
                   $store.getters.user.template_info.org_id ==10599 ||
-                  $store.getters.user.template_info.org_id ==10702
+                  $store.getters.user.template_info.org_id ==10702 || 
+                  $store.getters.user.template_info.org_id ==10742
                 "
               >
                 滤过器:

src/pages/main/beforeDialysis/components/consumables.vue

@@ -92,6 +92,16 @@
           if(good_type_id == 9777){
             return prescription.dialysis_irrigation
           }
+
+          if(good_type_id == 10275){
+            return prescription.dialysis_dialyszers
+          }
+          if(good_type_id == 10277){
+            return prescription.dialysis_irrigation
+          }
+          if(good_type_id == 10278){
+            return prescription.dialysis_strainer
+          }
         }
         
       },
@@ -196,7 +206,7 @@
         }, 1000);
       },
       toDetail() {
-        if(this.$store.getters.user.template_info.org_id != 10579 && this.$store.getters.user.template_info.org_id != 10587 && this.$store.getters.user.template_info.org_id != 10597 && this.$store.getters.user.template_info.org_id != 10599){
+        if(this.$store.getters.user.template_info.org_id != 10579 && this.$store.getters.user.template_info.org_id != 10587 && this.$store.getters.user.template_info.org_id != 10597 && this.$store.getters.user.template_info.org_id != 10599  && this.$store.getters.user.template_info.org_id != 10742){
           this.$router.push("/consumablesDetail");
         }else{
           console.log("2332o32o3223o",this.partition_id)

src/pages/main/dialog/subMenu/LongAdviceSubMenu.vue

@@ -506,7 +506,7 @@ export default {
               this.advice_start_time = nowTime
               this.start_time = nowTime
           } else {
-            if (this.$store.getters.user.org.id == 10016 || this.$store.getters.user.org.id == 10013 || this.$store.getters.user.org.id == 10014 || this.$store.getters.user.org.id == 10121 || this.$store.getters.user.org.id == 10587 || this.$store.getters.user.org.id == 10597 || this.$store.getters.user.org.id == 10599) {
+            if (this.$store.getters.user.org.id == 10016 || this.$store.getters.user.org.id == 10013 || this.$store.getters.user.org.id == 10014 || this.$store.getters.user.org.id == 10121 || this.$store.getters.user.org.id == 10587 || this.$store.getters.user.org.id == 10597 || this.$store.getters.user.org.id == 10599 || this.$store.getters.user.org.id == 10742) {
               var nowDate = new Date()
               var nowYear = nowDate.getFullYear()
               var nowMonth = nowDate.getMonth() + 1