Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

src/router/modules/dialysis.js

@@ -1,42 +1,43 @@
-import Layout from '@/views/layout/Layout'
+import Layout from "@/views/layout/Layout";
 
 export default {
-  path: '/dialysis/',
+  path: "/dialysis/",
   component: Layout,
-  redirect: 'noredirect',
-  name: 'dialysis',
+  redirect: "noredirect",
+  name: "dialysis",
   alwaysShow: true,
   meta: {
-    title: 'dialysis',
-    icon: 'touxi'
+    title: "dialysis",
+    icon: "touxi"
   },
-  children: [{
-      path: '/dialysis/dialysisrecord',
-      component: () => import('@/xt_pages/dialysis/schedualPatient'),
-      name: '透析记录',
+  children: [
+    {
+      path: "/dialysis/dialysisrecord",
+      component: () => import("@/xt_pages/dialysis/schedualPatient"),
+      name: "透析记录",
       meta: {
-        title: '透析记录'
+        title: "透析记录"
       }
     },
     {
-      path: '/dialysis/record/:id',
-      component: () => import('@/xt_pages/dialysis/dialysisPage'),
+      path: "/dialysis/record/:id",
+      component: () => import("@/xt_pages/dialysis/dialysisPage"),
       hidden: true,
       is_menu: false,
-      name: 'paper',
+      name: "paper",
       meta: {
-        title: 'paper',
+        title: "paper",
         noCache: true
       }
     },
     {
-      path: '/dialysis/print',
-      component: () => import('@/xt_pages/dialysis/dialysisPrintOrder'),
+      path: "/dialysis/print",
+      component: () => import("@/xt_pages/dialysis/dialysisPrintOrder"),
       hidden: true,
       is_menu: false,
-      name: 'dialysisPrintOrder',
+      name: "dialysisPrintOrder",
       meta: {
-        title: 'dialysisPrintOrder',
+        title: "dialysisPrintOrder",
         noCache: true
       }
     },
@@ -44,158 +45,186 @@ export default {
     // { path: 'advice', component: () => import('@/xt_pages/dialysis/doctorAdvice'), name: 'advice', meta: { title: 'advice' }},
     // { path: 'prepare', component: () => import('@/xt_pages/dialysis/dialysisPrepare'), name: 'prepare', meta: { title: 'prepare' }},
     {
-      path: '/dialysis/watch',
-      component: () => import('@/xt_pages/dialysis/bloodPresssWatch'),
-      name: 'watch',
+      path: "/dialysis/watch",
+      component: () => import("@/xt_pages/dialysis/bloodPresssWatch"),
+      name: "watch",
       meta: {
-        title: 'watch'
+        title: "watch"
       }
     },
     {
-      path: '/dialysis/details',
-      component: () => import('@/xt_pages/dialysis/details'),
-      name: 'details',
+      path: "/dialysis/details",
+      component: () => import("@/xt_pages/dialysis/details"),
+      name: "details",
       meta: {
-        title: 'details'
+        title: "details"
       },
       hidden: true,
       is_menu: false
     },
     {
-      path: '/dialysis/print/batch',
-      component: () => import('@/xt_pages/dialysis/batch_print/batch_print_order'),
+      path: "/dialysis/print/batch",
+      component: () =>
+        import("@/xt_pages/dialysis/batch_print/batch_print_order"),
+      hidden: true,
+      is_menu: false,
+      name: "dialysis_batch_print",
+      meta: {
+        title: "批量打印",
+        noCache: true
+      }
+    },
+    {
+      path: "/dialysis/print/batch/other",
+      component: () =>
+        import("@/xt_pages/dialysis/batch_print/batch_print_order_other"),
       hidden: true,
       is_menu: false,
-      name: 'dialysis_batch_print',
+      name: "dialysis_batch_print_two",
       meta: {
-        title: '批量打印',
+        title: "批量打印",
         noCache: true
       }
-    }, {
-      path: '/dialysis/print/batch/other',
-      component: () => import('@/xt_pages/dialysis/batch_print/batch_print_order_other'),
+    },
+    {
+      path: "/dialysis/print/batch/three",
+      component: () =>
+        import("@/xt_pages/dialysis/batch_print/batch_print_order_three"),
       hidden: true,
       is_menu: false,
-      name: 'dialysis_batch_print_two',
+      name: "dialysis_batch_print_two_one",
       meta: {
-        title: '批量打印',
+        title: "批量打印",
         noCache: true
       }
     },
     {
-      path: '/dialysis/print/batch/three',
-      component: () => import('@/xt_pages/dialysis/batch_print/batch_print_order_three'),
+      path: "/dialysis/print/batch/four",
+      component: () =>
+        import("@/xt_pages/dialysis/batch_print/batch_print_order_four"),
       hidden: true,
       is_menu: false,
-      name: 'dialysis_batch_print_two_one',
+      name: "dialysis_batch_print_two_one",
       meta: {
-        title: '批量打印',
+        title: "批量打印",
         noCache: true
       }
     },
     {
-      path: '/dialysis/print/batch/four',
-      component: () => import('@/xt_pages/dialysis/batch_print/batch_print_order_four'),
+      path: "/dialysis/print/batch/five",
+      component: () =>
+        import("@/xt_pages/dialysis/batch_print/batch_print_order_five"),
       hidden: true,
       is_menu: false,
-      name: 'dialysis_batch_print_two_one',
+      name: "dialysis_batch_print_two_one",
       meta: {
-        title: '批量打印',
+        title: "批量打印",
         noCache: true
       }
     },
     {
-      path: '/dialysis/print/batch/five',
-      component: () => import('@/xt_pages/dialysis/batch_print/batch_print_order_five'),
+      path: "/dialysis/print/batch/six",
+      component: () =>
+        import("@/xt_pages/dialysis/batch_print/batch_print_order_six"),
       hidden: true,
       is_menu: false,
-      name: 'dialysis_batch_print_two_one',
+      name: "dialysis_batch_six",
       meta: {
-        title: '批量打印',
+        title: "批量打印",
         noCache: true
       }
     },
     {
-      path: '/dialysis/print/batch/six',
-      component: () => import('@/xt_pages/dialysis/batch_print/batch_print_order_six'),
+      path: "/dialysis/print/batch/seven",
+      component: () =>
+        import("@/xt_pages/dialysis/batch_print/batch_print_order_seven"),
       hidden: true,
       is_menu: false,
-      name: 'dialysis_batch_six',
+      name: "dialysis_batch_seven",
       meta: {
-        title: '批量打印',
+        title: "批量打印",
         noCache: true
       }
     },
     {
-      path: '/dialysis/print/batch/seven',
-      component: () => import('@/xt_pages/dialysis/batch_print/batch_print_order_seven'),
+      path: "/dialysis/print/batch/eight",
+      component: () =>
+        import("@/xt_pages/dialysis/batch_print/batch_print_order_eight"),
       hidden: true,
       is_menu: false,
-      name: 'dialysis_batch_seven',
+      name: "dialysis_batch_eight",
       meta: {
-        title: '批量打印',
+        title: "批量打印",
         noCache: true
       }
     },
     {
-      path: '/dialysis/print/batch/eight',
-      component: () => import('@/xt_pages/dialysis/batch_print/batch_print_order_eight'),
+      path: "/dialysis/print/batch/nine",
+      component: () =>
+        import("@/xt_pages/dialysis/batch_print/batch_print_order_nine"),
       hidden: true,
       is_menu: false,
-      name: 'dialysis_batch_eight',
+      name: "dialysis_batch_nine",
       meta: {
-        title: '批量打印',
+        title: "批量打印",
         noCache: true
       }
     },
     {
-      path: '/dialysis/print/batch/otherone',
-      component: () => import('@/xt_pages/dialysis/batch_print/batch_print_order_other_one'),
+      path: "/dialysis/print/batch/otherone",
+      component: () =>
+        import("@/xt_pages/dialysis/batch_print/batch_print_order_other_one"),
       hidden: true,
       is_menu: false,
-      name: 'dialysis_batch_print_two_one',
+      name: "dialysis_batch_print_two_one",
       meta: {
-        title: '批量打印',
+        title: "批量打印",
         noCache: true
       }
-    }, {
-      path: '/dialysis/print/batch/othertwo',
-      component: () => import('@/xt_pages/dialysis/batch_print/batch_print_order_other_two'),
+    },
+    {
+      path: "/dialysis/print/batch/othertwo",
+      component: () =>
+        import("@/xt_pages/dialysis/batch_print/batch_print_order_other_two"),
       hidden: true,
       is_menu: false,
-      name: 'dialysis_batch_print_two_two',
+      name: "dialysis_batch_print_two_two",
       meta: {
-        title: '批量打印',
+        title: "批量打印",
         noCache: true
       }
-    }, {
-      path: '/dialysis/print/batch/fiveone',
-      component: () => import('@/xt_pages/dialysis/batch_print/batch_print_order_five_one'),
+    },
+    {
+      path: "/dialysis/print/batch/fiveone",
+      component: () =>
+        import("@/xt_pages/dialysis/batch_print/batch_print_order_five_one"),
       hidden: true,
       is_menu: false,
-      name: 'dialysis_batch_print_two_two',
+      name: "dialysis_batch_print_two_two",
       meta: {
-        title: '批量打印',
+        title: "批量打印",
         noCache: true
       }
-    }, {
-      path: '/dialysis/print/batch/fivetwo',
-      component: () => import('@/xt_pages/dialysis/batch_print/batch_print_order_five_two'),
+    },
+    {
+      path: "/dialysis/print/batch/fivetwo",
+      component: () =>
+        import("@/xt_pages/dialysis/batch_print/batch_print_order_five_two"),
       hidden: true,
       is_menu: false,
-      name: 'dialysis_batch_print_two_two',
+      name: "dialysis_batch_print_two_two",
       meta: {
-        title: '批量打印',
+        title: "批量打印",
         noCache: true
       }
     },
     {
-      path: '/dialysis/board',
-      component: () => import('@/xt_pages/dialysis/bulletinBoard'),
-      name: '数据看板',
+      path: "/dialysis/board",
+      component: () => import("@/xt_pages/dialysis/bulletinBoard"),
+      name: "数据看板",
       meta: {
-        title: '数据看板'
+        title: "数据看板"
       }
     }
   ]
-}
+};

src/xt_pages/dialysis/batch_print/batch_print_order_four.vue

@@ -337,7 +337,7 @@
                       目标KT/V:
                       <div class="under_line" style="width: 50px;"></div>&nbsp;&nbsp;
                       电导度::
-                      <div class="under_line" style="width: 50px;"></div>mS/m&nbsp;&nbsp;
+                      <div class="under_line" style="width: 50px;"></div>mS/cm&nbsp;&nbsp;
 
                     </div>
                   </div>

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -120,6 +120,16 @@
           >批量打印</el-button
         >
       </template>
+      <template v-if="this.template_id == 9">
+        <el-button
+          size="small"
+          icon="el-icon-printer"
+          :disabled="selecting_schs.length == 0"
+          @click="batchPrintAction"
+          type="primary"
+          >批量打印</el-button
+        >
+      </template>
     </div>
     <div class="app-container">
       <!-- <div class="filter-container">
@@ -579,6 +589,8 @@ export default {
         this.$router.push({ path: "/dialysis/print/batch/seven" });
       } else if (this.template_id == 8) {
         this.$router.push({ path: "/dialysis/print/batch/eight" });
+      } else if (this.template_id == 9) {
+        this.$router.push({ path: "/dialysis/print/batch/nine" });
       }
     },
     batchPrintActionOne: function() {

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

@@ -267,7 +267,7 @@
           <el-table-column
             prop="displacement_flow_quantity"
             align="center"
-            label="电导度(mS/m)"
+            label="电导度(mS/cm)"
             width="100"
             v-if="isShow('电导度')"
           >
@@ -447,7 +447,7 @@
           </el-col>
 
           <el-col :span="8" v-if="isShow('电导度')">
-            <el-form-item label="电导度(mS/m)：">
+            <el-form-item label="电导度(mS/cm)：">
               <el-input v-model="form.conductivity"></el-input>
             </el-form-item>
           </el-col>

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -22,7 +22,7 @@
         <th v-if="isShow('置换量')&& template_id == 6" width="92px">置换量(ml)</th>
         <th v-if="isShow('置换量')&& template_id != 6" width="92px">置换量(L)</th>
          <th v-if="isShow('SpO₂')&& template_id != 6" width="92px">SpO₂(%)</th>
-        <th v-if="isShow('电导度')" width="92px">电导度(mS/m)</th>
+        <th v-if="isShow('电导度')" width="92px">电导度(mS/cm)</th>
         <th v-if="isShow('置换液流量')"  width="92px">置换液流量(ml/h)</th>
         <th v-if="isShow('病情变化')" width="92px">病情变化</th>
         <th v-if="isShow('处理')"  width="92px">处理</th>

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -123,6 +123,16 @@
           >打印</el-button
         >
       </template>
+      <template v-if="org_template_info.template_id == 9">
+        <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+      </template>
     </div>
     <div class="app-container ">
       <!--<div class="order-print-btn"-->
@@ -184,6 +194,10 @@
         v-if="org_template_info.template_id == 8"
       >
       </DialysisPrintOrderEight>
+      <DialysisPrintOrderNine
+        v-bind:childResponse="childResponse"
+        v-if="org_template_info.template_id == 9"
+      ></DialysisPrintOrderNine>
     </div>
   </div>
 </template>
@@ -202,6 +216,7 @@ import DialysisPrintOrderFive from "./template/DialysisPrintOrderFive";
 import DialysisPrintOrderSix from "./template/DialysisPrintOrderSix";
 import DialysisPrintOrderSeven from "./template/DialysisPrintOrderSeven";
 import DialysisPrintOrderEight from "./template/DialysisPrintOrderEight";
+import DialysisPrintOrderNine from "./template/DialysisPrintOrderNine";
 import print from "print-js";
 
 export default {
@@ -215,6 +230,7 @@ export default {
     DialysisPrintOrderSix,
     DialysisPrintOrderSeven,
     DialysisPrintOrderEight,
+    DialysisPrintOrderNine,
     LabelBox,
     BreadCrumb
   },
@@ -412,6 +428,17 @@ export default {
           style: style3,
           scanStyles: false
         });
+      } else if (this.org_template_info.template_id == 9) {
+        console.log(
+          "joasdjjaslkdjlasjdlkasj",
+          this.org_template_info.template_id
+        );
+        printJS({
+          printable: "dialysis-print-box",
+          type: "html",
+          style: style3,
+          scanStyles: false
+        });
       }
     },
     printThisOnePage() {

src/xt_pages/dialysis/template/DialysisPrintOrderFour.vue

@@ -451,7 +451,7 @@
                           <span v-if="prescription.anticoagulant==2">{{prescription.anticoagulant_shouji}}</span>
                         </div>
                       </td>
-                      <td width="20">mS/m</td>
+                      <td width="20">mS/cm</td>
                       <td></td>
                     </tr>
                   </tbody>