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

src/router/modules/dialysis.js

@@ -411,6 +411,18 @@ export default {
         noCache: true
       }
     },
+    {
+      path: '/dialysis/print/batch/thirtyEight',
+      component: () =>
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_thirtyEight'),
+      hidden: true,
+      is_menu: false,
+      name: 'batch_print_order_thirtyEight',
+      meta: {
+        title: '批量打印',
+        noCache: true
+      }
+    },
     {
       path: '/dialysis/print/batch/thirtyNine',
       component: () =>

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -259,6 +259,16 @@
           >批量打印</el-button
         >
       </template>
+      <template v-if="this.template_id == 38">
+        <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 == 39">
         <el-button
           size="small"
@@ -880,6 +890,8 @@ export default {
         this.$router.push({ path: "/dialysis/print/batch/thirtyThree" });
       } else if (this.template_id == 37) {
         this.$router.push({ path: "/dialysis/print/batch/thirtySeven" });
+      } else if (this.template_id == 38) {
+        this.$router.push({ path: "/dialysis/print/batch/thirtyEight" });
       } else if (this.template_id == 39) {
         this.$router.push({ path: "/dialysis/print/batch/thirtyNine" });
       } else if (this.template_id == 40) {

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyEight.vue

@@ -118,7 +118,7 @@
         </div>
         <div class="lineHeight">治疗方案：</div>
         <div class="lineHeight">
-            <div class="widthLength25">病情：{{ prescription.illness ? prescription.illness : '' }}</div>
+            <div class="widthLength25">病情：<span v-for="item in illnessList" v-if="prescription.illness == item.id">{{ item.name }}</span></div>
             <div class="widthLength25">治疗模式：
               <span v-if="prescription.mode_id == 1">HD</span>
               <span v-if="prescription.mode_id == 2">HDF</span>
@@ -1499,6 +1499,7 @@ export default {
     // this.bloodAccessParOpera = getDataConfig('hemodialysis', 'vascular_access_desc')
     this.complicationList = getDataConfig('hemodialysis','complication')
     this.bloodPressureMmonitoringSite = getDataConfig('hemodialysis','blood_pressure_monitoring_site');
+    this.illnessList = getDataConfig('hemodialysis', 'illness')
 
     var bloodAccessParOpera = getDataConfig(
       "hemodialysis",