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

src/router/modules/dialysis.js

@@ -231,6 +231,42 @@ export default {
         noCache: true
       }
     },
+    {
+      path: '/dialysis/print/batch/twentyTwo',
+      component: () =>
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_twentyTwo'),
+      hidden: true,
+      is_menu: false,
+      name: 'dialysis_batch_twentyTwo',
+      meta: {
+        title: '批量打印',
+        noCache: true
+      }
+    },
+    {
+      path: '/dialysis/print/batch/twentyTwo_one',
+      component: () =>
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_twentyTwo_one'),
+      hidden: true,
+      is_menu: false,
+      name: 'dialysis_batch_twentyTwo_one',
+      meta: {
+        title: '批量打印',
+        noCache: true
+      }
+    },
+    {
+      path: '/dialysis/print/batch/twentyTwo_two',
+      component: () =>
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_twentyTwo_two'),
+      hidden: true,
+      is_menu: false,
+      name: 'dialysis_batch_twentyTwo_two',
+      meta: {
+        title: '批量打印',
+        noCache: true
+      }
+    },
     {
       path: '/dialysis/print/batch/otherone',
       component: () =>

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -170,6 +170,35 @@
           >批量打印</el-button
         >
       </template>
+      <template v-if="this.template_id == 22">
+        <div>
+          <el-button
+            :loading="loading"
+            size="small"
+            icon="el-icon-printer"
+            @click="batchPrintAction"
+            type="primary"
+            >打印全部</el-button
+          >
+          <el-button
+            :loading="loading"
+            size="small"
+            icon="el-icon-printer"
+            @click="batchPrintActionOne"
+            type="primary"
+            style=""
+            >打印纪录单</el-button
+          >
+          <el-button
+            :loading="loading"
+            size="small"
+            icon="el-icon-printer"
+            @click="batchPrintActionTwo"
+            type="primary"
+            >打印医嘱单</el-button
+          >
+        </div>
+      </template>
     </div>
     <div class="app-container">
       <!-- <div class="filter-container">
@@ -679,6 +708,8 @@ export default {
         this.$router.push({ path: "/dialysis/print/batch/fifteen" });
       } else if (this.template_id == 20) {
         this.$router.push({ path: "/dialysis/print/batch/twenty" });
+      } else if (this.template_id == 22) {
+        this.$router.push({ path: "/dialysis/print/batch/twentyTwo" });
       }
     },
     batchPrintActionOne: function() {
@@ -697,6 +728,8 @@ export default {
         this.$router.push({ path: "/dialysis/print/batch" });
       } else if (this.template_id == 5) {
         this.$router.push({ path: "/dialysis/print/batch/fiveone" });
+      } else if (this.template_id == 22) {
+        this.$router.push({ path: "/dialysis/print/batch/twentyTwo_one" });
       }
     },
     batchPrintActionTwo: function() {
@@ -715,6 +748,8 @@ export default {
         this.$router.push({ path: "/dialysis/print/batch" });
       } else if (this.template_id == 5) {
         this.$router.push({ path: "/dialysis/print/batch/fivetwo" });
+      } else if (this.template_id == 22) {
+        this.$router.push({ path: "/dialysis/print/batch/twentyTwo_two" });
       }
     }
   },

src/xt_pages/dialysis/details/dialog/monitor_dialog.vue

@@ -317,7 +317,7 @@
             align="center"
             label="超滤率(ml/h)"
             width="100"
-            v-if="isShow('超滤率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21) "
+            v-if="isShow('超滤率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22) "
           >
             <template slot-scope="scope">
               {{ scope.row.ultrafiltration_rate ? scope.row.ultrafiltration_rate : ""  }}
@@ -328,7 +328,7 @@
             align="center"
             label="超滤率(L/h)"
             width="100"
-            v-if="isShow('超滤率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21"
+            v-if="isShow('超滤率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22"
           >
             <template slot-scope="scope">
               {{ scope.row.ultrafiltration_rate ? scope.row.ultrafiltration_rate : ""  }}
@@ -469,12 +469,12 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="8" v-if="isShow('超滤率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21) ">
+          <el-col :span="8" v-if="isShow('超滤率') && (template_id == 6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22) ">
             <el-form-item label="超滤率(ml/h)">
               <el-input v-model="form.ultrafiltration_rate"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if="isShow('超滤率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21">
+          <el-col :span="8" v-if="isShow('超滤率') && template_id != 6 && template_id != 10 && template_id != 11 && template_id != 12 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22">
             <el-form-item label="超滤率(L/h)">
               <el-input v-model="form.ultrafiltration_rate"></el-input>
             </el-form-item>

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -26,8 +26,8 @@
           <th v-if="isShow('电导度')" width="92px">电导度(mS/m)</th>
           <th v-if="isShow('置换液流量')" width="92px">置换液流量(ml/h)</th>
           <th v-if="isShow('透析液流量')" width="92px">透析液流量(ml/h)</th>
-          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21)" width="50px"> 超滤率 <br />(ml/h) </th>
-          <th v-if="isShow('超滤率') && template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21" width="50px"> 超滤率 <br />(L/h) </th>
+          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22)" width="50px"> 超滤率 <br />(ml/h) </th>
+          <th v-if="isShow('超滤率') && template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('肝素用量余量')" width="92px">肝素用量余量(ml)</th>
           <th v-if="isShow('病情变化')" width="92px">病情变化</th>
           <th v-if="isShow('处理')" width="92px">处理</th>

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyTwo.vue

@@ -150,9 +150,10 @@
                     <check-box text="股静脉" :checked="predialysis.blood_access_part_id == getIsCheckDataConfig('hemodialysis','vascular_access','股静脉') ? true : false"></check-box>
                     <div class="inline_block">
                       其它：
-                      <div class="under_line" style="width: 50px;text-align: left">
+                      <div class="under_line" style="width: 100px;text-align: left">
                         <span>
-                          {{ predialysis.venous_catheterization_part_other }}
+                          <!-- {{ predialysis.venous_catheterization_part_other }} -->
+                          {{ ['锁骨下','颈静脉','股静脉'].indexOf(getPartName(predialysis.blood_access_part_id)) == -1 ? getPartName(predialysis.blood_access_part_id) : '' }}
                         </span>
                       </div>
                     </div>
@@ -1319,6 +1320,15 @@ export default {
     };
   },
   methods: {
+    getPartName(id) {
+      var vascularAccess = getDataConfig('hemodialysis', 'vascular_access')
+      this.vascularAccess = vascularAccess
+      for (let i = 0; i < this.vascularAccess.length; i++) {
+        if (this.vascularAccess[i].id == id) {
+          return this.vascularAccess[i].name
+        }
+      }
+    },
     getIsCheckDataConfig(pName, cName, targetName) {
       var arr = getDataConfig(pName, cName);
       for (let i = 0; i < arr.length; i++) {