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

src/router/modules/dialysis.js

@@ -347,6 +347,30 @@ export default {
         noCache: true
       }
     },
+    {
+      path: '/dialysis/print/batch/fiftyone',
+      component: () =>
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_fiftyone'),
+      hidden: true,
+      is_menu: false,
+      name: 'dialysis_batch_fiftyone',
+      meta: {
+        title: '批量打印',
+        noCache: true
+      }
+    },
+    {
+      path: '/dialysis/print/batch/fiftythree',
+      component: () =>
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_fiftythree'),
+      hidden: true,
+      is_menu: false,
+      name: 'dialysis_batch_fiftythree',
+      meta: {
+        title: '批量打印',
+        noCache: true
+      }
+    },
     {
       path: '/dialysis/print/batch/fiftynine',
       component: () =>
@@ -383,6 +407,18 @@ export default {
         noCache: true
       }
     },
+    {
+      path: '/dialysis/print/batch/sixtyTwo',
+      component: () =>
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_sixtyTwo'),
+      hidden: true,
+      is_menu: false,
+      name: 'dialysis_batch_sixtyTwo',
+      meta: {
+        title: '批量打印',
+        noCache: true
+      }
+    },
     {
       path: '/dialysis/print/batch/seven',
       component: () =>

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -328,6 +328,24 @@
           type="primary"
           >批量打印</el-button
         >
+      </template>
+       <template v-if="this.template_id == 51">
+        <el-button
+          size="small"
+          icon="el-icon-printer"
+          :disabled="selecting_schs.length == 0"
+          @click="batchPrintAction"
+          type="primary"
+          >批量打印</el-button>
+      </template>
+       <template v-if="this.template_id == 53">
+        <el-button
+          size="small"
+          icon="el-icon-printer"
+          :disabled="selecting_schs.length == 0"
+          @click="batchPrintAction"
+          type="primary"
+          >批量打印</el-button>
       </template>
       <template v-if="this.template_id == 59">
         <el-button
@@ -356,6 +374,15 @@
           type="primary"
           >批量打印</el-button>
       </template>
+      <template v-if="this.template_id == 62">
+        <el-button
+          size="small"
+          icon="el-icon-printer"
+          :disabled="selecting_schs.length == 0"
+          @click="batchPrintAction"
+          type="primary"
+          >批量打印</el-button>
+      </template>
 
 
     </div>
@@ -1994,7 +2021,7 @@ export default {
       } else if (this.template_id == 12) {
         this.$router.push({ path: "/dialysis/print/batch/twelve" });
       } else if (this.template_id == 13) {
-        this.$router.push({ path: "/dialysis/print/batch/thirteen" });
+        this.$router.push({ path: "/dialysis/print/batch/fiftythree" });
       } else if (this.template_id == 15) {
         this.$router.push({ path: "/dialysis/print/batch/fifteen" });
       } else if (this.template_id == 17) {
@@ -2031,12 +2058,18 @@ export default {
         this.$router.push({ path: "/dialysis/print/batch/fortyThree" });
       } else if (this.template_id == 48) {
         this.$router.push({ path: "/dialysis/print/batch/six" });
+      }else if (this.template_id == 51) {
+        this.$router.push({ path: "/dialysis/print/batch/fiftyone" });
+      }else if (this.template_id == 53) {
+        this.$router.push({ path: "/dialysis/print/batch/fiftythree" });
       }else if (this.template_id == 59) {
         this.$router.push({ path: "/dialysis/print/batch/fiftynine" });
       }else if (this.template_id == 60) {
         this.$router.push({ path: "/dialysis/print/batch/sixty" });
       }else if (this.template_id == 61) {
         this.$router.push({ path: "/dialysis/print/batch/sixtyOne" });
+      }else if (this.template_id == 62) {
+        this.$router.push({ path: "/dialysis/print/batch/sixtyTwo" });
       }
     },
     batchPrintActionOne: function() {

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyTwo.vue

@@ -990,9 +990,7 @@
             <td>{{ monitor.pulse_frequency }}</td>
             <td>{{ monitor.blood_flow_volume }}</td>
             <td>{{ monitor.venous_pressure }}</td>
-            <td>
-              {{ monitor.arterial_pressure ? monitor.arterial_pressure : "" }}
-            </td>
+            <td>{{ monitor.arterial_pressure ? monitor.arterial_pressure : "" }}</td>
             <td>{{ monitor.transmembrane_pressure }}</td>
             <td>{{ monitor.ultrafiltration_rate }}</td>
             <!-- <td>{{ monitor.ultrafiltration_volume }}</td> -->
@@ -1086,7 +1084,15 @@
                   :isChecked="afterdialysis.cruor.indexOf('透析器-3级') > -1"
                 ></label-box
                 >&nbsp;&nbsp;
-                {{ getCruor(afterdialysis.cruor) }}
+                <label-box
+                  showValue="无"
+                  :isChecked="afterdialysis.cruor.indexOf('透析器-0度') <= 0&&
+                  afterdialysis.cruor.indexOf('透析器-Ⅲ度') <= 0&&
+                  afterdialysis.cruor.indexOf('透析器-Ⅰ度') <= 0&&
+                  afterdialysis.cruor.indexOf('透析器-Ⅱ度') <= 0"
+                ></label-box
+                >
+                <!-- {{ getCruor(afterdialysis.cruor) }} -->
               </span>
             </td>
           </tr>