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

src/router/modules/dialysis.js

@@ -1162,5 +1162,16 @@ export default {
       is_menu: false,
       hidden: true
     },
+    {
+      path: '/dialysis/new/doctoradvice',
+      component: () => import('@/xt_pages/dialysis/batch_print/new_doctor_advice'),
+      name: '医嘱打印',
+      meta: {
+        title: '医嘱打印',
+        noCache: true
+      },
+      is_menu: false,
+      hidden: true
+    },
   ]
 }

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -230,6 +230,7 @@
       </template>
       <template v-if="this.template_id == 27">
         <el-button
+          style="margin-left: 1000px;"
           size="small"
           icon="el-icon-printer"
           :disabled="selecting_schs.length == 0"
@@ -237,6 +238,14 @@
           type="primary"
           >批量打印</el-button
         >
+        <el-button
+          size="small"
+          icon="el-icon-printer"
+          :disabled="selecting_schs.length == 0"
+          @click="batchPrintActionThree"
+          type="primary"
+          >医嘱打印</el-button
+        >
       </template>
       <template v-if="this.template_id == 28">
         <el-button
@@ -2817,6 +2826,14 @@ export default {
         this.$router.push({ path: "/dialysis/print/batch/thirtyThree_two" });
       }
     },
+    batchPrintActionThree:function(){
+      var sch_ids = [];
+      for (let index = 0; index < this.selecting_schs.length; index++) {
+        sch_ids.push(this.selecting_schs[index].sch_id);
+      }
+      this.$store.dispatch("SetBatchPrintDialysisRecordIDs", sch_ids);
+      this.$router.push({path:"/dialysis/new/doctoradvice"})
+    },
     toExport(){
       import('@/vendor/Export2Excel').then(excel => {