Merge branch '20220812' of http://git.shengws.com/csx/Vue_New into 20220812

src/xt_pages/dialysis/batch_print/batch_print_order_fiftynine.vue

@@ -2766,7 +2766,7 @@ export default {
         bloodAccessParOpera[key];
     }
 
-    this.blood_access_part = getDataConfig("hemodialysis", "vascular_access");
+    this.blood_access_part = getDataConfig("hemodialysis", "vascular_access_desc");
 
     var dialysateFormulationOptions = getDataConfig(
       "hemodialysis",
@@ -2961,7 +2961,7 @@ export default {
     },
     QueryPartById: function (val) {
       let vascular_access_part_name = "/";
-      const vascular_access = getDataConfig("hemodialysis", "vascular_access");
+      const vascular_access = getDataConfig("hemodialysis", "vascular_access_desc");
 
       for (let i = 0; i < vascular_access.length; i++) {
         if (vascular_access[i].id == val) {

src/xt_pages/dialysis/batch_print/batch_print_order_sixty.vue

@@ -2641,8 +2641,8 @@ export default {
         bloodAccessParOpera[key];
     }
 
-    this.blood_access_part = getDataConfig("hemodialysis", "vascular_access");
-
+    this.blood_access_part = getDataConfig("hemodialysis", "vascular_access_desc");
+    console.log("批量打印血管通路",this.blood_access_part)
     var dialysateFormulationOptions = getDataConfig(
       "hemodialysis",
       "dialysate_formulation"
@@ -2845,10 +2845,10 @@ export default {
       return displace_liqui_part_name;
     },
     QueryPartById: function (val) {
-      console.log(val,'val')
+      console.log('val233232233232323223',val)
       let vascular_access_part_name = "/";
-      const vascular_access = getDataConfig("hemodialysis", "vascular_access");
-      console.log(vascular_access)
+      const vascular_access = getDataConfig("hemodialysis", "vascular_access_desc");
+      console.log("val99999999999999",vascular_access)
       for (let i = 0; i < vascular_access.length; i++) {
         if (vascular_access[i].id == val) {
           vascular_access_part_name = vascular_access[i].name;