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

src/router/modules/dialysis.js

@@ -1,64 +1,62 @@
-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: "透析记录",
         noCache: true
-
       }
     },
     {
-      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",
         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: "数据看板",
         noCache: true
-
       }
     },
     {
-      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
       }
     },
@@ -67,157 +65,183 @@ export default {
     // { path: 'prepare', component: () => import('@/xt_pages/dialysis/dialysisPrepare'), name: 'prepare', meta: { title: 'prepare' }},
 
     {
-      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,
       noCache: true
-
     },
     {
-      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',
+      name: "dialysis_batch_print",
       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/other",
+      component: () =>
+        import("@/xt_pages/dialysis/batch_print/batch_print_order_other"),
+      hidden: true,
+      is_menu: false,
+      name: "dialysis_batch_print_two",
+      meta: {
+        title: "批量打印",
+        noCache: true
+      }
+    },
+    {
+      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/nine',
+      path: "/dialysis/print/batch/twelve",
       component: () =>
-        import('@/xt_pages/dialysis/batch_print/batch_print_order_nine'),
+        import("@/xt_pages/dialysis/batch_print/batch_print_order_twelve"),
       hidden: true,
       is_menu: false,
-      name: 'dialysis_batch_nine',
+      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
       }
     }
-
   ]
-}
+};

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -130,6 +130,16 @@
           >批量打印</el-button
         >
       </template>
+      <template v-if="this.template_id == 12">
+        <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">
@@ -631,6 +641,8 @@ export default {
         this.$router.push({ path: "/dialysis/print/batch/eight" });
       } else if (this.template_id == 9) {
         this.$router.push({ path: "/dialysis/print/batch/nine" });
+      } else if (this.template_id == 12) {
+        this.$router.push({ path: "/dialysis/print/batch/twelve" });
       }
     },
     batchPrintActionOne: function() {

src/xt_pages/dialysis/template/dialysisPrintOrderTwelve.vue

@@ -45,12 +45,16 @@
             <td width="140" style="border:none;text-align: left;">
               <div>
                 <label-box
-                  showValue="住院"
-                  :isChecked="patientInfo_source_1 ? true : false"
+                  showValue="门诊"
+                  :isChecked="
+                    receiverTreatmentAccess.condition == 2 ? true : false
+                  "
                 ></label-box>
                 <label-box
-                  showValue="门诊"
-                  :isChecked="patientInfo_source_2 ? true : false"
+                  showValue="住院"
+                  :isChecked="
+                    receiverTreatmentAccess.condition == 1 ? true : false
+                  "
                 ></label-box>
               </div>
             </td>
@@ -1344,7 +1348,7 @@
               &nbsp;
               <span v-if="doctorForm.url === ''">{{ doctorForm.doctor }}</span>
               <span v-if="doctorForm.url !== ''">
-                <img style="height:20px" :src="doctorForm.url" />
+                <img class="es-img" :src="doctorForm.url" />
               </span>
             </span>
             护士签名

src/xt_permission.js

@@ -1,14 +1,14 @@
-import router from './router'
-import store from './store'
-import NProgress from 'nprogress' // progress bar
-import 'nprogress/nprogress.css' // progress bar style
+import router from "./router";
+import store from "./store";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
 
 NProgress.configure({
   showSpinner: false
-}) // NProgress Configuration
+}); // NProgress Configuration
 
-const loginWhiteList = ['/token/verify', '/401', '/404'] // 登录验证白名单
-const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名单
+const loginWhiteList = ["/token/verify", "/401", "/404"]; // 登录验证白名单
+const permissionWhiteList = loginWhiteList.concat(["/"]); // 权限验证白名单
 
 router.beforeEach((to, from, next) => {
   // 线上注释
@@ -27,33 +27,33 @@ router.beforeEach((to, from, next) => {
   // return
   // 线上注释
 
-  NProgress.start()
+  NProgress.start();
   // console.log(store.getters.current_role_urls.indexOf(to.path))
   // alert('path:' + to.path)
   // 如果 url 带有 lt (login_token)参数，则跳转到验证 token 时等待的页面
   if (to.query.lt != null && to.query.lt.length > 0) {
     // alert('will go to verify token: ' + to.query.lt)
     next({
-      path: '/token/verify',
+      path: "/token/verify",
       query: {
         token: to.query.lt
       }
-    })
+    });
 
     // 否则 如果没有 user 信息，则前往 sso 登录
   } else if (store.getters.xt_user.user.id === 0) {
     if (loginWhiteList.indexOf(to.path) !== -1) {
       // alert('登录白名单内，跳过登录')
-      next()
+      next();
     } else {
       // alert('前往登录')
-      window.location.href = process.env.BASE_API + '/login' // sso 地址
+      window.location.href = process.env.BASE_API + "/login"; // sso 地址
     }
 
     // 否则 如果当前 url 不需要验证访问权限，则通过
   } else if (permissionWhiteList.indexOf(to.path) !== -1) {
     // alert('权限验证白名单内，直接进入')
-    next()
+    next();
 
     // 否则 如果拥有当前 url 的权限，则通过
     // } else if (store.getters.current_role_urls.indexOf(to.path) !== -1) {
@@ -65,11 +65,11 @@ router.beforeEach((to, from, next) => {
     // console.log(store.getters.current_role_urls)
     // console.log(store.getters.current_role_urls.indexOf(to.path))
     // alert('401')
-    next()
+    next();
     // next({ path: '/404' })
   }
-})
+});
 
 router.afterEach(() => {
-  NProgress.done()
-})
+  NProgress.done();
+});