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

config/sit.env.js

@@ -2,10 +2,10 @@ module.exports = {
   NODE_ENV: '"production"',
   ENV_CONFIG: '"sit"',
   // BASE_API: '"http://new_mobile.xt.api.sgjyun.com"',
-  BASE_API: '"https://api.xt.test.sgjyun.com"',
+  BASE_API:'"https://api.xt.test.sgjyun.com"',
   SSO_HOST: '"https://testsso.sgjyun.com"',
   SRCM_HOST: '"http://test1.sgjyun.com"',
-  XT_HOST: '"http://xt.test.sgjyun.com"',
+  XT_HOST: '"https://xt.test.sgjyun.com"',
   MIRCO_MALL_HOST: '"https://mall.test.sgjyun.com"',
   CDM_HOST: '"http://cdm.test.sgjyun.com"'
-};
+};

package.json

@@ -1,144 +1,144 @@
-{
-  "name": "vue-element-admin",
-  "version": "3.7.3",
-  "description": "A magical vue admin. Typical templates for enterprise applications. Newest development stack of vue. Lots of awesome features",
-  "author": "Pan <panfree23@gmail.com>",
-  "license": "MIT",
-  "scripts": {
-    "dev": "cross-env BABEL_ENV=development webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
-    "build:prod": "cross-env NODE_ENV=production env_config=prod node build/build.js",
-    "build:sit": "cross-env NODE_ENV=production env_config=sit node build/build.js && npm run fixfont && npm run fiximg",
-    "build-cdn": "node build/build-cdn.js",
-    "lint": "eslint --ext .js,.vue src",
-    "test": "npm run lint",
-    "precommit": "lint-staged",
-    "build": "cross-env NODE_ENV=production env_config=sit node build/build.js && npm run fixfont && npm run fiximg",
-    "fixfont": "xcopy %cd%\\dist\\static\\fonts %cd%\\dist\\static\\css\\static\\fonts /s /y /d /e /i",
-    "fiximg": "xcopy %cd%\\dist\\static\\img %cd%\\dist\\static\\css\\static\\img /s /y /d /e /i"
-  },
-  "lint-staged": {
-    "src/**/*.{js,vue}": [
-      "eslint --fix",
-      "git add"
-    ]
-  },
-  "keywords": [
-    "vue",
-    "element-ui",
-    "admin",
-    "management-system",
-    "admin-template"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/PanJiaChen/vue-element-admin.git"
-  },
-  "bugs": {
-    "url": "https://github.com/PanJiaChen/vue-element-admin/issues"
-  },
-  "dependencies": {
-    "@types/moment": "^2.13.0",
-    "ajv": "^6.5.3",
-    "axios": "0.17.1",
-    "clipboard": "^1.7.1",
-    "codemirror": "5.32.0",
-    "connect": "3.6.6",
-    "default-passive-events": "^2.0.0",
-    "driver.js": "0.5.2",
-    "dropzone": "5.2.0",
-    "echarts": "3.8.5",
-    "element-ui": "^2.13.2",
-    "file-saver": "^1.3.8",
-    "font-awesome": "4.7.0",
-    "js-cookie": "2.2.0",
-    "jsbarcode": "^3.11.5",
-    "jsonlint": "1.6.3",
-    "jszip": "3.1.5",
-    "mockjs": "1.0.1-beta3",
-    "moment": "^2.24.0",
-    "node-sass": "4.14.1",
-    "normalize.css": "7.0.0",
-    "nprogress": "0.2.0",
-    "print-js": "^1.0.50",
-    "qrcodejs2": "0.0.2",
-    "screenfull": "4.2.0",
-    "serve-static": "1.13.2",
-    "showdown": "1.8.5",
-    "simplemde": "1.11.2",
-    "sortablejs": "1.7.0",
-    "v-fit-columns": "^0.2.0",
-    "vue": "2.5.16",
-    "vue-clipboard": "0.0.1",
-    "vue-clipboard2": "^0.3.1",
-    "vue-count-to": "1.0.13",
-    "vue-i18n": "7.3.2",
-    "vue-multiselect": "2.0.8",
-    "vue-router": "3.0.1",
-    "vue-splitpane": "1.0.2",
-    "vuedraggable": "^2.16.0",
-    "vuex": "3.0.1",
-    "xlsx": "^0.11.19"
-  },
-  "devDependencies": {
-    "autoprefixer": "7.2.3",
-    "babel-core": "6.26.0",
-    "babel-eslint": "8.0.3",
-    "babel-helper-vue-jsx-merge-props": "2.0.3",
-    "babel-loader": "7.1.2",
-    "babel-plugin-dynamic-import-node": "^1.2.0",
-    "babel-plugin-syntax-jsx": "6.18.0",
-    "babel-plugin-transform-runtime": "6.23.0",
-    "babel-plugin-transform-vue-jsx": "3.5.0",
-    "babel-preset-env": "1.6.1",
-    "babel-preset-stage-2": "6.24.1",
-    "chalk": "2.3.0",
-    "copy-webpack-plugin": "4.3.0",
-    "cross-env": "^7.0.3",
-    "crypto-js": "^4.1.1",
-    "css-loader": "0.28.7",
-    "eslint": "4.13.1",
-    "eslint-friendly-formatter": "3.0.0",
-    "eslint-loader": "1.9.0",
-    "eslint-plugin-html": "4.0.1",
-    "extract-text-webpack-plugin": "3.0.2",
-    "file-loader": "1.1.5",
-    "friendly-errors-webpack-plugin": "1.6.1",
-    "html-webpack-plugin": "2.30.1",
-    "lint-staged": "7.2.0",
-    "node-notifier": "5.1.2",
-    "node-sass": "^4.14.1",
-    "optimize-css-assets-webpack-plugin": "3.2.0",
-    "ora": "1.3.0",
-    "portfinder": "1.0.13",
-    "postcss-import": "11.0.0",
-    "postcss-loader": "2.0.9",
-    "postcss-url": "7.3.0",
-    "qiniu-webpack-plugin": "^0.4.2",
-    "rimraf": "2.6.2",
-    "sass-loader": "^6.0.7",
-    "sass-resources-loader": "^1.3.4",
-    "script-loader": "^0.7.2",
-    "semver": "5.4.1",
-    "shelljs": "0.7.8",
-    "svg-sprite-loader": "3.5.2",
-    "uglifyjs-webpack-plugin": "1.1.3",
-    "url-loader": "0.6.2",
-    "vue-loader": "13.7.2",
-    "vue-style-loader": "3.0.3",
-    "vue-template-compiler": "2.5.16",
-    "webpack": "3.10.0",
-    "webpack-bundle-analyzer": "2.9.1",
-    "webpack-dev-server": "^2.9.7",
-    "webpack-merge": "4.1.1",
-    "write-json": "^3.0.1"
-  },
-  "engines": {
-    "node": ">= 4.0.0",
-    "npm": ">= 3.0.0"
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions",
-    "not ie <= 8"
-  ]
-}
+{
+  "name": "vue-element-admin",
+  "version": "3.7.3",
+  "description": "A magical vue admin. Typical templates for enterprise applications. Newest development stack of vue. Lots of awesome features",
+  "author": "Pan <panfree23@gmail.com>",
+  "license": "MIT",
+  "scripts": {
+    "dev": "cross-env BABEL_ENV=development webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
+    "build:prod": "cross-env NODE_ENV=production env_config=prod node build/build.js",
+    "build:sit": "cross-env NODE_ENV=production env_config=sit node build/build.js && npm run fixfont && npm run fiximg",
+    "build-cdn": "node build/build-cdn.js",
+    "lint": "eslint --ext .js,.vue src",
+    "test": "npm run lint",
+    "precommit": "lint-staged",
+    "build": "cross-env NODE_ENV=production env_config=sit node build/build.js && npm run fixfont && npm run fiximg",
+    "fixfont": "xcopy %cd%\\dist\\static\\fonts %cd%\\dist\\static\\css\\static\\fonts /s /y /d /e /i",
+    "fiximg": "xcopy %cd%\\dist\\static\\img %cd%\\dist\\static\\css\\static\\img /s /y /d /e /i"
+  },
+  "lint-staged": {
+    "src/**/*.{js,vue}": [
+      "eslint --fix",
+      "git add"
+    ]
+  },
+  "keywords": [
+    "vue",
+    "element-ui",
+    "admin",
+    "management-system",
+    "admin-template"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/PanJiaChen/vue-element-admin.git"
+  },
+  "bugs": {
+    "url": "https://github.com/PanJiaChen/vue-element-admin/issues"
+  },
+  "dependencies": {
+    "@types/moment": "^2.13.0",
+    "ajv": "^6.5.3",
+    "axios": "0.17.1",
+    "clipboard": "^1.7.1",
+    "codemirror": "5.32.0",
+    "connect": "3.6.6",
+    "default-passive-events": "^2.0.0",
+    "driver.js": "0.5.2",
+    "dropzone": "5.2.0",
+    "echarts": "3.8.5",
+    "element-ui": "^2.13.2",
+    "file-saver": "^1.3.8",
+    "font-awesome": "4.7.0",
+    "js-cookie": "2.2.0",
+    "jsbarcode": "^3.11.5",
+    "jsonlint": "1.6.3",
+    "jszip": "3.1.5",
+    "mockjs": "1.0.1-beta3",
+    "moment": "^2.24.0",
+    "node-sass": "4.14.1",
+    "normalize.css": "7.0.0",
+    "nprogress": "0.2.0",
+    "print-js": "^1.0.50",
+    "qrcodejs2": "0.0.2",
+    "screenfull": "4.2.0",
+    "serve-static": "1.13.2",
+    "showdown": "1.8.5",
+    "simplemde": "1.11.2",
+    "sortablejs": "1.7.0",
+    "v-fit-columns": "^0.2.0",
+    "vue": "2.5.16",
+    "vue-clipboard": "0.0.1",
+    "vue-clipboard2": "^0.3.1",
+    "vue-count-to": "1.0.13",
+    "vue-i18n": "7.3.2",
+    "vue-multiselect": "2.0.8",
+    "vue-router": "3.0.1",
+    "vue-splitpane": "1.0.2",
+    "vuedraggable": "^2.16.0",
+    "vuex": "3.0.1",
+    "xlsx": "^0.11.19"
+  },
+  "devDependencies": {
+    "autoprefixer": "7.2.3",
+    "babel-core": "6.26.0",
+    "babel-eslint": "8.0.3",
+    "babel-helper-vue-jsx-merge-props": "2.0.3",
+    "babel-loader": "7.1.2",
+    "babel-plugin-dynamic-import-node": "^1.2.0",
+    "babel-plugin-syntax-jsx": "6.18.0",
+    "babel-plugin-transform-runtime": "6.23.0",
+    "babel-plugin-transform-vue-jsx": "3.5.0",
+    "babel-preset-env": "1.6.1",
+    "babel-preset-stage-2": "6.24.1",
+    "chalk": "2.3.0",
+    "copy-webpack-plugin": "4.3.0",
+    "cross-env": "^7.0.3",
+    "crypto-js": "^4.1.1",
+    "css-loader": "0.28.7",
+    "eslint": "4.13.1",
+    "eslint-friendly-formatter": "3.0.0",
+    "eslint-loader": "1.9.0",
+    "eslint-plugin-html": "4.0.1",
+    "extract-text-webpack-plugin": "3.0.2",
+    "file-loader": "1.1.5",
+    "friendly-errors-webpack-plugin": "1.6.1",
+    "html-webpack-plugin": "2.30.1",
+    "lint-staged": "7.2.0",
+    "node-notifier": "5.1.2",
+    "node-sass": "^4.14.1",
+    "optimize-css-assets-webpack-plugin": "3.2.0",
+    "ora": "1.3.0",
+    "portfinder": "1.0.13",
+    "postcss-import": "11.0.0",
+    "postcss-loader": "2.0.9",
+    "postcss-url": "7.3.0",
+    "qiniu-webpack-plugin": "^0.4.2",
+    "rimraf": "2.6.2",
+    "sass-loader": "^6.0.7",
+    "sass-resources-loader": "^1.3.4",
+    "script-loader": "^0.7.2",
+    "semver": "5.4.1",
+    "shelljs": "0.7.8",
+    "svg-sprite-loader": "3.5.2",
+    "uglifyjs-webpack-plugin": "1.1.3",
+    "url-loader": "0.6.2",
+    "vue-loader": "13.7.2",
+    "vue-style-loader": "3.0.3",
+    "vue-template-compiler": "2.5.16",
+    "webpack": "3.10.0",
+    "webpack-bundle-analyzer": "2.9.1",
+    "webpack-dev-server": "^2.9.7",
+    "webpack-merge": "4.1.1",
+    "write-json": "^3.0.1"
+  },
+  "engines": {
+    "node": ">= 4.0.0",
+    "npm": ">= 3.0.0"
+  },
+  "browserslist": [
+    "> 1%",
+    "last 2 versions",
+    "not ie <= 8"
+  ]
+}

src/App.vue

@@ -59,4 +59,18 @@ export default {
 body .el-table th.gutter {
   display: table-cell !important;
 }
+*{  
+   -webkit-touch-callout:none;  /*系统默认菜单被禁用*/   
+   -webkit-user-select:none; /*webkit浏览器*/   
+   -khtml-user-select:none; /*早期浏览器*/   
+   -moz-user-select:none;/*火狐*/   
+   -ms-user-select:none; /*IE10*/   
+   user-select:none;   
+} 
+input{  
+ -webkit-user-select:auto; /*webkit浏览器*/     
+}
+textarea{
+ -webkit-user-select:auto; /*webkit浏览器*/
+}
 </style>

src/api/his/his.js

@@ -725,3 +725,12 @@ export function exportOrderInfo() {
   });
 }
 
+
+export function getPrivateExpensesTwo(params) {
+  return request({
+    url: "/api/test/get",
+    method: "get",
+    params:params,
+  });
+}
+

src/api/schedule_template/sch_template.js

@@ -23,6 +23,7 @@ export function setTemplateMode(mode,week_time) {
     week_time:week_time,
 
   }
+  console.log(params)
   return request({
     url: '/api/schtemp/p/setmode',
     method: 'post',

src/main.js

@@ -45,7 +45,9 @@ Vue.prototype.$XLSX = XLSX; //设置全局
 import Computed from "../src/xt_pages/components/Computed/index"  //自动计算金额控件
 Vue.component("Computed",Computed)
 
-
+// 表格宽度自适应
+import fitcolumn from 'v-fit-columns' 
+Vue.use(fitcolumn)
 
 Vue.use(Element, {
   size: 'medium', // set element-ui default size

src/router/modules/workforce.js

@@ -166,6 +166,17 @@ export default {
       title: 'scheduleTablePrintTwo',
       noCache: true
     }
-  }
+  },
+  // {
+  //   path: '/historyWeekTable',
+  //   component: () => import('@/xt_pages/workforce/historyWeekTable'),
+  //   name: 'historyWeekTable',
+  //   hidden: true,
+  //   is_menu: false,
+  //   meta: {
+  //     title: 'historyWeekTable',
+  //     noCache: true
+  //   }
+  // }
   ]
 }

src/views/layout/components/Navbar.vue

@@ -624,12 +624,12 @@ export default {
   }
 }
 .el-dropdown-menu {
-  z-index: 9999 !important;
+  z-index: 9999 ;
 }
 
-.v-modal {
-  z-index: 9999 !important;
-}
+// .v-modal {
+//   z-index: 9999 !important;
+// }
 
 </style>
 

src/xt_pages/components/bread-crumb.vue

@@ -3,7 +3,7 @@
     <el-breadcrumb-item>首页</el-breadcrumb-item>
     <template v-for="(crumb, index) in crumbsList" >
       <el-breadcrumb-item v-if="crumb.path" :to="{ path: crumb.path }" :key="index">{{crumb.name}}</el-breadcrumb-item>
-      <el-breadcrumb-item v-else :key="index">{{crumb.name}}</el-breadcrumb-item>
+      <el-breadcrumb-item v-else >{{crumb.name}}</el-breadcrumb-item>
     </template>
     <!-- <el-breadcrumb-item><a href="/">活动管理</a></el-breadcrumb-item>
     <el-breadcrumb-item>活动列表</el-breadcrumb-item>

src/xt_pages/dialysis/PatientBox.vue

@@ -1,4 +1,5 @@
 <template>
+  <!-- 透析管理患者资料 -->
   <div>
     <!-- <router-link to="/dialysis/details"> -->
     <div

src/xt_pages/dialysis/details/index.vue

@@ -1,4 +1,5 @@
 <template>
+  <!-- 点击透析记录患者资料跳转的页面 -->
   <div class="main-contain">
     <div class="position">
       <bread-crumb :crumbs="crumbs"></bread-crumb>
@@ -50,6 +51,7 @@
           @click="refresh"
           >刷新</el-button>
       <el-tabs v-model="activeName" @tab-click="handleClick">
+        <!-- 候诊区 -->
         <el-tab-pane label="候诊区" name="first">
           <div class="cell clearfix" style="margin-bottom:10px;">
             <el-date-picker v-model="selected_date" prefix-icon="el-icon-date" @change="handleScheduleDateChange" :editable="false" :clearable="false" style="width: 45%;margin-right:10px;" type="date" placeholder="选择日期时间" align="right" ></el-date-picker>
@@ -108,7 +110,7 @@
                 <template slot-scope="scope">
                   {{ scope.row.patient.name }}
                   <span v-if="scope.row.assessment_before_dislysis && patientStateVal == 1">
-                    （{{ getTime(scope.row.assessment_before_dislysis.created_time) }}）
+                    ({{ getTime(scope.row.assessment_before_dislysis.created_time) }})
                   </span>
                 </template>
               </el-table-column>
@@ -130,6 +132,7 @@
             </el-table>
           </div>
         </el-tab-pane>
+        <!-- 透析区 -->
         <el-tab-pane label="透析区" name="second">
           <div class="cell clearfix" style="margin-bottom:10px;">
             <el-date-picker v-model="selected_date" prefix-icon="el-icon-date" @change="handleScheduleDateChange" :editable="false" :clearable="false" style="width: 45%;margin-right:10px;" type="date" placeholder="选择日期时间" align="right" ></el-date-picker>
@@ -2423,8 +2426,8 @@ export default {
         display: flex;
         box-sizing: border-box;
         justify-content: space-around;
-        .name {
-        }
+        // .name {
+        // }
         .InputBox {
           padding: 0;
           border: none;
@@ -2459,7 +2462,10 @@ export default {
     font-size: 12px;
     display: inline-block;
     width: 60px;
+    // height: 23px;
+    // line-height: 23px;
     color: #fff;
+   
   }
   .tip2{
     background: #ee8556;
@@ -2468,6 +2474,8 @@ export default {
     font-size: 12px;
     display: inline-block;
     width: 60px;
+    // height: 23px;
+    // line-height: 23px;
     color: #fff;
   }
   .tip3{
@@ -2515,6 +2523,10 @@ export default {
   }
   .el-table td, .el-table th{
     text-align: center;
+    
+  }
+  .el-table td{
+    height: 44px !important;
   }
   .el-table .cell{
     padding: 0;

src/xt_pages/dialysis/doctorAdvicePrint.vue

@@ -29,7 +29,7 @@
                     <th width="50px">开嘱时间</th>
                     </tr>
                     <template v-for="(schedules, zone_name, index) in scheduleMap">
-                    <tr :key="index">
+                    <tr ><!--:key="index"-->
                         <td>{{ zone_name }}</td>
                         <!-- <td></td> -->
                         <td></td>
@@ -140,7 +140,7 @@
                     <th width="50px">开嘱时间</th>
                     </tr>
                     <template v-for="(schedules, zone_name, index) in scheduleMap">
-                    <tr :key="index">
+                    <tr ><!--:key="index"-->
                         <td>{{ zone_name }}</td>
                         <!-- <td></td> -->
                         <td></td>

src/xt_pages/dialysis/doctorAdvicePrintOne.vue

@@ -21,7 +21,7 @@
                      <th width="50px">执行护士</th>
                     </tr>
                     <template v-for="(schedules, zone_name, index) in scheduleMap">
-                    <tr :key="index">
+                    <tr ><!--:key="index"-->
                         <td>{{ zone_name }}</td>
                         <td></td>
                         <td></td>
@@ -101,7 +101,7 @@
                     <th width="20px">执行护士</th>
                     </tr>
                     <template v-for="(schedules, zone_name, index) in scheduleMap">
-                    <tr :key="index">
+                    <tr ><!--:key="index"-->
                         <td>{{ zone_name }}</td>
                         <td></td>
                         <td></td>

src/xt_pages/dialysis/newDoctorAdvice.vue

@@ -293,7 +293,7 @@
             <span v-else>
 
             </span>
-            </span>
+           
           </template>
         </el-table-column>
         <el-table-column prop="date" label="开嘱医生" align="center" min-width="26px">

src/xt_pages/dialysis/schedualPatient.vue

@@ -1,4 +1,5 @@
 <template>
+  <!-- 透析记录首页 -->
 <div class="main-contain">
   <div class="position">
     <bread-crumb :crumbs='crumbs'></bread-crumb>

src/xt_pages/dialysis/signPrint.vue

@@ -55,7 +55,7 @@
             </div>
         </div>
 
-          <div class="app-container" style="background-color: white;" v-show="showOne">
+          <!-- <div class="app-container" style="background-color: white;" v-show="showOne">
             <div id="dialysisTable">
                 <div v-for="(item, index) in list" :key="index">
                     <div class="signPrint" v-for="it in item.doctor_advice" style="page-break-after: always;">
@@ -76,7 +76,7 @@
                   
                 </div>
             </div>
-        </div>
+        </div> -->
     </div>
 </template>
 

src/xt_pages/management/home.vue

@@ -2499,8 +2499,8 @@
 
              </el-main>
           </el-container>
-        </el-container>
-      </el-container>
+        <!-- </el-container>
+      </el-container> -->
 
          <!-- 新增计划 -->
         <plan-form ref="planForm" :equimentid="equimentid" v-on:getAllPlan="getAllPlan" v-on:getAllPlanDetail="getAllPlanDetail" @func="getPlanData"></plan-form>

src/xt_pages/outpatientCharges/statementTemplate/printTen.vue

@@ -0,0 +1,408 @@
+<template>
+    <div  id="statement-print" class="statement-print"
+         style="position: relative;">
+      <div class="print-content">
+        <div class="print-title">
+          <h1 style="text-align: center;">江西省医疗保障定点机构医疗费用结算单</h1>
+        </div>
+
+        <div class="print-tab" style="margin: 0px auto; text-align: center;">
+          <div class="hospital" style="margin:0px 112px ;width: 70%;">
+            <!-- style="display: inline-block;margin: 10px 80px 10px 0px ;" -->
+            <span class="yiliao" style="display: inline-block;margin: 10px 80px 10px 0px ;">
+                          <span>医疗机构名称：</span>
+                          <span>{{info.fixmedins_name}}</span>
+                      </span>
+            <span class="yiliao" style="display: inline-block;margin: 10px 80px 10px 0px ;">
+                          <span>医疗机构编码：</span>
+                          <span>{{info.fixmedins_code}}</span>
+                      </span>
+            <span class="yiliao" style="display: inline-block;margin: 10px 80px 10px 0px ;">
+                          <span>医院等级：</span>
+                          <span  v-if="info.hosp_lv == '1'">三级特等</span>
+                          <span  v-else-if="info.hosp_lv == '2'">三级甲等</span>
+                          <span v-else-if="info.hosp_lv == '3'">三级乙等</span>
+                          <span v-else-if="info.hosp_lv == '4'">三级丙等</span>
+                          <span v-else-if="info.hosp_lv == '5'">二级甲等</span>
+                          <span v-else-if="info.hosp_lv == '6'">二级乙等</span>
+                          <span v-else-if="info.hosp_lv == '7'">二级丙等</span>
+                          <span  v-else-if="info.hosp_lv == '8'">一级甲等</span>
+                          <span v-else-if="info.hosp_lv == '9'">一级乙等</span>
+                          <span v-else-if="info.hosp_lv == '10'">一级丙等</span>
+                          <span  v-else-if="info.hosp_lv == '11'">无等级</span>
+                          <span  v-else></span>
+            </span>
+          </div>
+          <table class="jiesuan" style="border-collapse: collapse;margin: auto;">
+            <tr>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">姓名</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.psn_name}}</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">性别</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-if="info.gend == '1'">男</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.gend == '2'">女</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else></td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">人员类别</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-if="info.psn_type == '11'">在职</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '1101'">职工在职</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '1102'">公务员在职</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '1103'">灵活就业人员在职</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '1160'">地方其他扩展人员</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '12'">退休人员</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '1201'">职工退休</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '1202'">公务员退休</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '1203'">灵活就业人员退休</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '1260'">地方其他扩展人员</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '13'">离休</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '1300'">离休人员</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '1360'">地方其他扩展人员</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '14'">居民(未成年)</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '1401'">新生儿</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '1402'">学龄前儿童</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '1403'">中小学生</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '1404'">大学生</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '1405'">未成年(未入学)</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '15'">居民(成年)</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '1501'">普通居民(成年)</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '1560'">地方其他扩展身份</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else-if="info.psn_type == '16'">居民(老年)</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-else></td>
+            </tr>
+            <tr>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">身份证号码</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.certno}}</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">参保险种</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-if="info.insutype == '310'">职工基本医疗保险</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-if="info.insutype == '320'">公务员医疗补助</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-if="info.insutype == '330'">大额医疗费用补助</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-if="info.insutype == '340'">离休人员医疗保障</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-if="info.insutype == '390'">城乡居民基本医疗保险</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-if="info.insutype == '392'">城乡居民大病医疗保险</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-if="info.insutype == '510'">生育保险</td>
+
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">医疗类别</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-if="info.med_type == '11'">普通门诊</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-if="info.med_type == '12'">门诊挂号</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-if="info.med_type == '13'">急诊</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-if="info.med_type == '14'">门诊特殊病</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-if="info.med_type == '15'">门诊统筹</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-if="info.med_type == '16'">门诊慢性病</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;" v-if="info.med_type == '21'">普通住院</td>
+
+            </tr>
+            <tr>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">结算ID</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.setl_id}}</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">住院号</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.number}}</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">住院天数</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{getDay(info.begndate,info.enddate)}}</td>
+            </tr>
+            <tr>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">科室</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{'血透'}}</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">床号</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;"></td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">参保区划</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.insu_optins}}</td>
+            </tr>
+            <tr>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">入院日期</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.begndate ? info.begndate.split(' ')[0] : ''}}</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">出院日期</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.enddate ? info.enddate.split(' ')[0] : ''}}</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">结算日期</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.setl_time ? info.setl_time.split(' ')[0] : ''}}</td>
+            </tr>
+            <tr>
+              <td colspan="6" style="border: 1px solid gray;width: 150px;height: 30px;"> 费用分类情况</td>
+            </tr>
+            <tr>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">项目名称</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">总金额</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">符合行政范围</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">先行自付</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">超限价</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">自费</td>
+            </tr>
+            <tr v-if="info.bed_cost_total > 0">
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">床位费</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.bed_cost_total}}</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.bedInscpTotal}}</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.bed_cost_part_self_total}}</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.bed_cost_self_total}}</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.bedSelfTotal}}</td>
+
+            </tr>
+
+            <tr v-if="info.operation_cost_total > 0">
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">手术费</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.operation_cost_total}}</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.operationInscpTotal}}</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.operation_cost_part_self_total}}</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.operation_cost_self_total}}</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.operationSelfTotal}}</td>
+
+            </tr>
+
+            <tr v-if="info.check_cost_total > 0">
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">检查费</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.check_cost_total}}</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.checkInscpTotal}}</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.check_cost_part_self_total}}</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.check_cost_self_total}}</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.checkSelfTotal}}</td>
+
+            </tr>
+
+            <tr v-if="info.treat_cost_total > 0">
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">治疗费</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.treat_cost_total}}</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.treatInscpTotal}}</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.treat_cost_part_self_total}}</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.treat_cost_self_total}}</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.treatSelfTotal}}</td>
+
+            </tr>
+
+            <tr v-if="info.treat_cost_total > 0">
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">化验费</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.laboratory_cost_total}}</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.laboratoryInscpTotal}}</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.laboratory_cost_part_self_total}}</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.laboratory_cost_self_total}}</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.laboratorySelfTotal}}</td>
+
+            </tr>
+
+
+            <tr v-if="info.western_medicine_cost_total > 0">
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">西药费</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.western_medicine_cost_total}}</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.westernMedicineInscpTotal}}</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.western_medicine_cost_part_self_total}}</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.western_medicine_cost_self_total}}</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.westernMedicineSelfTotal}}</td>
+
+            </tr>
+
+            <tr v-if="info.material_cost_total > 0">
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">材料费</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.material_cost_total}}</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.materialInscpTotal}}</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.material_cost_part_self_total}}</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.material_cost_self_total}}</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.materialSelfTotal}}</td>
+
+            </tr>
+            <tr v-if="info.other_cost_total > 0">
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">其他费</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.other_cost_total}}</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.otherInscpTotal}}</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.other_cost_part_self_total}}</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.other_cost_self_total}}</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.otherSelfTotal}}</td>
+            </tr>
+
+            <tr v-if="info.chinese_traditional_medicine_cost_total > 0">
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">中成药</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.chinese_traditional_medicine_cost_total}}</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.chineseTraditionalInscpTotal}}</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.chinese_traditional_medicine_cost_part_self_total}}</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.chinese_traditional_medicine_cost_self_total}}</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.chineseTraditionalSelfTotal}}</td>
+            </tr>
+
+            <tr>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">金额合计</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{(parseFloat(info.bed_cost_total) +
+                parseFloat(info.operation_cost_total) + parseFloat(info.other_cost_total) +
+                parseFloat(info.material_cost_total) + parseFloat(info.western_medicine_cost_total) +
+                parseFloat(info.chinese_traditional_medicine_cost_total) + parseFloat(info.check_cost_total) +
+                parseFloat(info.laboratory_cost_total) + parseFloat(info.treat_cost_total)).toFixed(2) }}
+              </td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{(parseFloat(info.bedInscpTotal) +
+                parseFloat(info.operationInscpTotal) + parseFloat(info.checkInscpTotal) +
+                parseFloat(info.treatInscpTotal) + parseFloat(info.laboratoryInscpTotal) +
+                parseFloat(info.westernMedicineInscpTotal) + parseFloat(info.materialInscpTotal) +
+                parseFloat(info.otherInscpTotal) + parseFloat(info.chineseTraditionalInscpTotal)).toFixed(2) }}
+              </td>
+
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{(parseFloat(info.bed_cost_part_self_total) +
+                parseFloat(info.operation_cost_part_self_total) + parseFloat(info.other_cost_part_self_total) +
+                parseFloat(info.material_cost_part_self_total) + parseFloat(info.western_medicine_cost_part_self_total) +
+                parseFloat(info.chinese_traditional_medicine_cost_part_self_total) +
+                parseFloat(info.check_cost_part_self_total) + parseFloat(info.laboratory_cost_part_self_total) +
+                parseFloat(info.treat_cost_part_self_total)).toFixed(2)}}
+              </td>
+
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{(parseFloat(info.bed_cost_self_total )+
+                parseFloat(info.operation_cost_self_total) + parseFloat(info.other_cost_self_total) +
+                parseFloat(info.material_cost_self_total) + parseFloat(info.western_medicine_cost_self_total) +
+                parseFloat(info.chinese_traditional_medicine_cost_self_total) + parseFloat(info.check_cost_self_total) +
+                parseFloat(info.laboratory_cost_self_total) + parseFloat(info.treat_cost_self_total)).toFixed(2)}}
+              </td>
+
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{(parseFloat(info.bedSelfTotal) +
+                parseFloat(info.operationSelfTotal) + parseFloat(info.checkSelfTotal) +
+                parseFloat(info.treatSelfTotal) + parseFloat(info.laboratorySelfTotal) +
+                parseFloat(info.westernMedicineSelfTotal) + parseFloat(info.materialSelfTotal) +
+                parseFloat(info.otherSelfTotal) + parseFloat(info.chineseTraditionalSelfTotal)).toFixed(2) }}
+              </td>
+
+            </tr>
+
+            <tr>
+              <td colspan="6" style="border: 1px solid gray;width: 150px;height: 30px;"> 费用结算情况</td>
+            </tr>
+            <tr>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">费用总额</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.medfee_sumamt}}</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">统筹基金支付</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.hifp_pay}}</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">大病保险支付</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.hifmi_pay}}</td>
+            </tr>
+            <tr>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">医疗救助支付</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.maf_pay}}</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">公务员补充支付</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.cvlserv_pay}}</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">离休保健专项</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;"></td>
+            </tr>
+            <tr>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">个人账户支付</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.acct_pay}}</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">个人现金支付</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.psn_cash_pay}}</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">其他基金支付</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">{{info.oth_pay}}</td>
+            </tr>
+            <tr>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">起付线</td>
+              <td colspan="2" style="border: 1px solid gray;width: 150px;height: 30px;">{{info.act_pay_dedc}}</td>
+              <td style="border: 1px solid gray;width: 150px;height: 30px;">医院垫付金额</td>
+              <td colspan="2" style="border: 1px solid gray;width: 150px;height: 30px;">{{info.hosp_part_amt}}</td>
+            </tr>
+          </table>
+          <div style="width: 51%; margin: 5px 90px; text-align: left;">
+           <span style="display: inline-block;"> 备注：其它包含军转、财政、慈善、其他商报等支付来源</span>
+          </div>
+        </div>
+      </div>
+
+    </div>
+</template>
+<script>
+import { getChargePrint } from '@/api/project/project'
+import { uParseTime } from '@/utils/tools'
+
+export default {
+  data() {
+    return {
+      list: {},
+      prescription: [],
+      patient: {},
+      orgname: '',
+
+      result: {},
+      org_code: '',
+      patient_name: '',
+      doctor_code: '',
+      doctor_name: '',
+
+      name_arr: [],
+      spec_arr: [],
+      count_arr: [],
+      price_arr: [],
+      total_arr: []
+
+    }
+  },
+  props: {
+    paramsObj: Object,
+    info: {
+      type: Object,
+      default: function() {
+        return {}
+      }
+    },
+    balanceAccounts: Object
+  },
+  methods: {
+    getDay(dateString1,dateString2){
+      var  startDate = Date.parse(dateString1);
+      var  endDate = Date.parse(dateString2);
+      if (startDate>endDate){
+        return 0;
+      }
+      if (startDate==endDate){
+        return 1;
+      }
+      var days=(endDate - startDate)/(1*24*60*60*1000);
+      return  days;
+    },
+    getTime(value, temp) {
+      if (value != undefined) {
+        return uParseTime(value, temp)
+      }
+      return ''
+    }
+  },
+  mounted() {
+
+
+  },
+  watch: {
+    paramsObj: {//深度监听，可监听到对象、数组的变化
+      handler(val, oldVal) {
+
+
+      },
+      deep: true
+    }
+  }
+}
+</script>
+
+
+<style lang="scss" scoped>
+.prescription-print {
+  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
+  -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
+  margin-bottom: 20px;
+  padding: 20px 10px;
+}
+// *{
+//   padding:0;
+//   margin: 0;
+//   border: 0;
+// }
+// .print-content{
+//   display: flex;
+//   justify-content: center;
+//   flex-direction:column
+// }
+// h1{
+//   text-align: center;
+// }
+// .yiliao{
+//   display: inline-block;
+//   margin: 10px 80px 10px 0px ;
+// }
+// .print-tab{
+//   margin: 0px auto;
+// }
+// .jiesuan{
+//   border-collapse: collapse;
+//   text-align: center;
+// }
+// .jiesuan tr td{
+//   border: 1px solid gray;
+//   width: 150px;
+//   height: 30px;
+// }
+
+
+</style>

src/xt_pages/sign/lineUp.vue

@@ -10,6 +10,7 @@
                 >全屏投影</el-button
             >
         </div>
+        <!-- 全屏状态 -->
         <div id="fullscreenbroad" v-show="dialogTableVisible">
             <el-row class="fullRow">
                 <el-button
@@ -122,9 +123,9 @@
                             </div>
                         </div>
                     </div>
-                </div>
+                </div> 
                 
-            </div>
+             </div>
         
             <!-- <div class="page_lineUp">
                 <div class="lineUpTitle">
@@ -520,10 +521,10 @@ export default {
         }, 1000 * 60 * 30);
     },
     beforeDestroy(){
-        clearInterval(this.timer);　　// 清除定时器
+        clearInterval(this.timer);// 清除定时器
         this.timer = null
         clearInterval(this.timerID);
-        this.timerID = null;　　// 清除定时器
+        this.timerID = null;// 清除定时器
         // clearInterval(this.newTimes);　　// 清除定时器
         // this.newTimes = null
         let unObj = {
@@ -655,6 +656,7 @@ export default {
             }
             return (zero + num).slice(-digit);
         },
+        // 进入全屏
         fullscreenboard: function() {
             sessionStorage.setItem('lineUpKey',1);
             this.dialogTableVisible = true;

src/xt_pages/user/components/PatientForm.vue

@@ -1,5 +1,7 @@
 <template>
+  <!-- 电子病历/新增患者 -->
   <div class="main-contain">
+    <!-- 传染病（已隐藏） -->
     <el-dialog
       title="新增传染病检查"
       :visible.sync="dialogFormVisible"
@@ -12,7 +14,7 @@
           <el-col :span="1">&nbsp;</el-col>
 
           <template v-for="(item, index) in form.formItem">
-            <el-col :span="7" :key="index">
+            <el-col :span="7" ><!--:key="index"-->
               <el-form-item
                 :label="item.item_name"
                 v-if="item.range_type == 1"
@@ -27,11 +29,11 @@
                 >
                   <template slot="append">{{ item.unit }}</template>
                 </el-input>
-              </el-form-item>
+              </el-form-item><!--:key="item.item_id"-->
               <el-form-item
                 :label="item.item_name"
                 v-else
-                :key="item.item_id"
+                
                 :prop="'formItem.' + index + '.value'"
               >
                 <el-select
@@ -48,7 +50,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="1" :key="'form-col' + index">&nbsp;</el-col>
+            <el-col :span="1" >&nbsp;</el-col><!--:key="'form-col' + index"-->
           </template>
         </el-row>
       </el-form>
@@ -133,7 +135,7 @@
                   <el-input
                     v-model="form.idCardNo"
                     @blur="checkIdCardNo"
-                  ></el-input>
+                  ></el-input><!---->
                 </el-form-item>
               </el-col>
 
@@ -170,14 +172,6 @@
                 </el-col>
               </template>
               <template v-else>
-                <!-- <el-col :span="8" >
-                  <el-form-item label="患者类型 : " class="is-required" prop="patientType">
-                    <el-select v-model="form.patientType"  placeholder="请选择患者类型"  >
-                      <el-option v-for="item in styleOptions" :key="item.id" :label="item.name" :value="item.id"/>
-                    </el-select>
-                  </el-form-item>
-                </el-col>-->
-
                 <el-col :span="8">
                   <el-form-item
                     label="透析号 : "
@@ -1202,9 +1196,32 @@ export default {
     }
   },
   data() {
+    var checkName = (rule, value, callback) => {
+      const regName=/^([\u4E00-\u9FA5]{1,20}|[a-zA-Z\.\s])$/;
+      if (regName.test(value)){
+        return callback();
+      }
+      callback(new Error("请输入正确的名字"));
+    };
+    var checkage = (rule, value, callback) =>{
+      const regage=/^(?:[1-9][0-9]?|1[01][0-9]|120)$/
+        if(regage.test(value)){
+          callback()
+        }else{
+          callback(new Error('年龄输入不合法'))
+        }
+    }
+    var checkidCard = (rule, value, callback) =>{
+      const regid=/^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[0-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}([0-9Xx])$/
+        if(regid.test(value)){
+          callback()
+        }else{
+          callback(new Error('身份证输入有误'))
+        }
+    }
     var checkContagions = (rule, value, callback) => {
-      if (this.form.is_infectious == 0) {
-        return callback(new Error("至少选择一项传染病"));
+      if (this.form.is_infectious == '1') {
+        return callback();
       }
       if (this.form.is_infectious == "2" && value.length == 0) {
         return callback(new Error("至少选择一项传染病"));
@@ -1319,6 +1336,7 @@ export default {
         ],
         dialysisNo: [
           { required: true, message: "请填写透析号", trigger: "blur" }
+          // {type:'number', message:"透析号填写有误", trigger: 'blur'}
         ],
         phone: [{ validator: checkPhone, trigger: "blur" }],
         source: [
@@ -1327,13 +1345,17 @@ export default {
         lapseto: [
           { required: true, message: "请选择治疗状态", trigger: "blur" }
         ],
-        name: [{ required: true, message: "请填写姓名", trigger: "blur" }],
+        name: [{ required: true, message: "请填写姓名", trigger: "blur" },
+        { validator: checkName,min:2,max:5, message: '请输入正确的名字', trigger: 'blur'}
+        ],
         gender: [{ required: true, message: "请选择性别", trigger: "blur" }],
         idCardNo: [
-          { required: true, message: "请填写身份证号", trigger: "blur" }
+          { required: true, message: "请填写身份证号", trigger: "blur" },
+          {validator:checkidCard,trigger:'blur'}
         ],
         birth: [{ required: true, message: "请填写生日", trigger: "blur" }],
-        age: [{ required: true, message: "请填写年龄", trigger: "blur" }],
+        age: [{ required: true, message: "年龄不能为空", trigger: "blur" },
+        {validator: checkage,trigger:'blur'}],
         firstDialysisDate: [
           { required: true, message: "请选择日期", trigger: "blur" }
         ],
@@ -1646,9 +1668,9 @@ export default {
       });
     },
     checkIdCardNo() {
-      console.log(this.form.idCardNo);
+      // console.log(this.form.idCardNo);
       if (!isCardNo(this.form.idCardNo)) {
-        this.$message.error("身份证号码信息有误!");
+        // this.$message.error("身份证号码信息有误!");
         this.form.birth = "";
         return false;
       }

src/xt_pages/workforce/appointment.vue

@@ -102,7 +102,10 @@
         >
         </el-date-picker>
       </div>
-      <el-tabs v-model="activeName" :tab-position="tabPosition" ref="elTabs">
+      <el-tabs v-model="activeName" :tab-position="tabPosition" ref="elTabs" @tab-click="handleClick">
+        <el-tab-pane name="historyWeek">
+          <span slot="label"><i class="el-icon-date"></i> 历史周期 ({{ theWeek.historyWeek }}) </span>
+        </el-tab-pane>
         <el-tab-pane name="lastWeek">
           <span slot="label"><i class="el-icon-date"></i> 上周 ({{ theWeek.lastWeek }})</span>
         </el-tab-pane>
@@ -116,18 +119,18 @@
           <span slot="label"><i class="el-icon-date"></i> 下下周 ({{ theWeek.nextTwoWeek }})</span>
         </el-tab-pane>
       </el-tabs>
-
-      <table-data ref="tableData"  :week-time="activeName" :partitions-prop="partitions"
-                  :schedule-zone-row-prop="scheduleZoneRow"
-                  :schedule-zone-prop="scheduleZone" title="" @event1="changePartition"
-                  @event2="changeSchedule" v-if="!is_edit" @event3="changeWeekDay">
-      </table-data>
-
-      <edit-table-data ref="edittableData"  :week-time="activeName" :partitions-prop="partitions"
+      <div v-if="!is_edit">
+        <table-data ref="tableData"  :week-time="activeName" :partitions-prop="partitions"
+                    :schedule-zone-row-prop="scheduleZoneRow"
+                    :schedule-zone-prop="scheduleZone" title="" @event1="changePartition"
+                    @event2="changeSchedule"  @event3="changeWeekDay" v-show="showtableOne">
+        </table-data>
+      </div>
+       <edit-table-data ref="edittableData"  :week-time="activeName" :partitions-prop="partitions"
                         :schedule-zone-row-prop="scheduleZoneRow" :schedule-zone-prop="scheduleZone"
                          title="" @event1="changePartition"
                          @event2="changeSchedule" v-if="is_edit" @event3="changeWeekDay">
-                      
+
         <div class="position">
           <!-- <bread-crumb :crumbs="crumbs"></bread-crumb> -->
           <div>
@@ -158,7 +161,7 @@
               type="primary"
               v-if="is_edit"
               size="small"
-          >下载日志 
+          >下载日志
           </el-button>
           <el-button type="primary" size="small" icon="el-icon-setting" @click="setScheduleTemplateAction">排班模板
           </el-button>
@@ -170,6 +173,10 @@
       </div>
         </edit-table-data>
 
+        <HistoryWeekTable v-show="showtable" ref="tableDataZero"  :week-time="activeName" partitions-prop="partitions"
+                  :schedule-zone-row-prop="scheduleZoneRow"
+                  :schedule-zone-prop="scheduleZone" title="" >
+          </HistoryWeekTable>
       <el-dialog title="复制排班" width="600px" :visible.sync="newVisible">
         <el-form :model="form" ref="form" label-width="90px" :rules="rules">
           <el-form-item label="周次:">
@@ -220,7 +227,7 @@ import ScheduleUploadExcel from './components/scheduleUploadExcel/index'
 import {generateLog} from '@/api/config'
 import {uParseTime} from '@/utils/tools'
 import EditTableData from "./components/editTableData";
-
+import HistoryWeekTable from './components/historyWeekTable'
 export default {
   name: 'appointment',
   data() {
@@ -259,6 +266,8 @@ export default {
       scheduleZone: [],
       days: [],
       logs: [],
+      showtable:false,
+      showtableOne:true,
       is_edit: false,
       schedulingTableVisible:false,//全屏
       scheduleZoneRow: [],
@@ -268,12 +277,15 @@ export default {
       isExistRepeatVisible: false,
       exportVisible: false,
       exportLogVisible: false,
+      // 周期
       theWeek: {
+        historyWeek:0,
         lastWeek: 0,
         thisWeek: 0,
         nextWeek: 0,
         nextTwoWeek: 0
       },
+
       tableList: [],
       weekTime: "",
       schedule_type: 0,
@@ -313,9 +325,24 @@ export default {
     tableData,
     BreadCrumb,
     UploadExcel,
-
+    HistoryWeekTable
   },
   methods: {
+    handleClick(e,tab){
+      if(e.name == 'historyWeek'){
+        this.showtable=true
+        this.showtableOne=false
+        this.$nextTick(() => {
+
+          this.$refs.tableDataZero.start()
+        })
+        // console.log('12343545',this.$refs.tableDataZero);
+      }else{
+        this.showtable=false
+        this.showtableOne=true
+      }
+
+    },
     dragstart(event, item) {
       // console.log('start的索引',item.moveIndex)
       // 开始移动的时候将移动的索引值+图片的url存储下来
@@ -404,17 +431,17 @@ export default {
           return false
         }
         var partitions = response.data.data.partitions
-        // console.log("分区",partitions)
+        console.log("分区",response.data.data)
         this.theWeek.thisWeek = response.data.data.theWeek
         this.theWeek.lastWeek = response.data.data.theLastWeek
         this.theWeek.nextWeek = response.data.data.theNextWeek
         this.theWeek.nextTwoWeek = response.data.data.theNextSecWeek
+        this.theWeek.historyWeek = response.data.data.theWeek - 2
         // 在控制变量改变的时候进行 强制渲染更新
         let childrenRefs = this.$refs.elTabs.$children
         this.$nextTick(() => {
           childrenRefs.forEach(child => child.$forceUpdate())
         })
-
         var that = this
 
         if (partitions.length > 0) {
@@ -679,7 +706,7 @@ export default {
 
         }
         // console.log("111111111")
-        // console.log(that.scheduleZone)
+         console.log(that.scheduleZone)
       })
     },
     changeSch(val){
@@ -870,8 +897,7 @@ export default {
       } else if (this.activeName == 'nextTwoWeek') {
         date = date + 14 * 24 * 60 * 60 * 1000
       }
-
-      if (this.templateObj.template_id == 0 || this.templateObj.template_id == 1) {
+      if (this.templateObj.template_id == 1) {
         this.$router.push({path: '/workforce/schedule/print', query: {date: date}})
       }
       if (this.templateObj.template_id == 2) {
@@ -880,7 +906,6 @@ export default {
       if (this.templateObj.template_id == 3) {
         this.$router.push({path: '/scheduleTablePrintOne?partition_id=' + this.partition_id + "&weekTime=" + this.activeName+"&week_date="+this.week_date})
       }
-
       if(this.templateObj.template_id == 4){
         this.$router.push({path: '/scheduleTablePrintTwo?partition_id=' + this.partition_id + "&weekTime=" + this.activeName+"&week_date="+this.week_date})
       }
@@ -2335,7 +2360,7 @@ export default {
 
       return next_monday
     },
-
+    //
     getThreeWeekList() {
       var params = {
         start_time: this.start_time,
@@ -2862,7 +2887,6 @@ export default {
     },
 
     changeWeek(val) {
-
       this.start_time = ""
       this.end_time = ""
       this.newDay = []
@@ -3041,9 +3065,10 @@ export default {
     },
     getlist() {
       getScheduleTemplate().then(response => {
+
         if (response.data.state == 1) {
           var template = response.data.data.template
-
+          console.log('12243254',response.data.data);
           this.templateObj = template
         }
       })

src/xt_pages/workforce/components/ScheduleItem.vue

@@ -1,61 +1,71 @@
-<template>
-  <!-- 排班表填充内容 -->
-    <div >
-
-            <div>
-                <span :class='modeColor(scheduleDetail.mode_name)'>{{scheduleDetail.patient}}</span><br/>
-                <span v-if="scheduleDetail.mode_name.length>0" :class='modeColor(scheduleDetail.mode_name)'>({{scheduleDetail.mode_name}})</span>
-                <br/><span v-if="schedulFlag">{{scheduleDetail.dialysis_machine_name}}</span>
-            </div>
-    </div>
-</template>
-
-<script>
-export default {
-  name: "scheduleItem",
-  props:{
-      scheduleDetail:{
-          type:Object,
-          default: function (){
-              return {
-                mode_id:0,
-                mode_name:'',
-                patient_id:0,
-                patient:"",
-                dialysis_machine_name:"",
-              }
-          },
-      },
-      schedulFlag:{
-        type:Boolean,
-        default:false
-      }
-  },
-  data() {
-    return {
-      schedul:false
-    }
-  },
-
-  methods:{
-        modeColor(name){
-            if(name == 'HD'){
-
-            }else if(name == 'HDF'){
-                return 'modeRed'
-            }else if(name == 'HD+HP'){
-                return 'modePurple'
-            }
-        }
-  }
-};
-</script>
-
-<style lang="scss" scoped>
-.modeRed{
-  color:#ee0ad0;
-}
-.modePurple{
-  color: #53b86e;
-}
-</style>
+<template>
+  <!-- 排班表填充内容 -->
+    <div >
+
+            <div>
+                <span :class='modeColor(scheduleDetail.mode_name)'>{{scheduleDetail.patient}}</span>
+                <template v-if="schedulMode">
+                  <br/>
+                  <span v-if="scheduleDetail.mode_name.length>0"  :class='modeColor(scheduleDetail.mode_name)' >{{'('+scheduleDetail.mode_name+')'}}</span>
+                </template>
+                <template v-if="schedulFlag">
+                  <br/><span >{{scheduleDetail.dialysis_machine_name}}</span>
+                </template>
+                
+            </div>
+    </div>
+</template>
+
+<script>
+export default {
+  name: "scheduleItem",
+  props:{
+      scheduleDetail:{
+          type:Object,
+          default: function (){
+              return {
+                mode_id:0,
+                mode_name:'',
+                patient_id:0,
+                patient:"",
+                dialysis_machine_name:"",
+              }
+          },
+      },
+      schedulFlag:{
+        type:Boolean,
+        default:false
+      },
+      schedulMode:{
+        type:Boolean,
+        default:true
+      }
+  },
+  data() {
+    return {
+      
+    }
+  },
+
+  methods:{
+        modeColor(name){
+            if(name == 'HD'){
+
+            }else if(name == 'HDF'){
+                return 'modeRed'
+            }else if(name == 'HD+HP'){
+                return 'modePurple'
+            }
+        }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.modeRed{
+  color:#ee0ad0;
+}
+.modePurple{
+  color: #53b86e;
+}
+</style>

src/xt_pages/workforce/components/setup_template_dialog.vue

@@ -72,9 +72,9 @@ export default {
       },
       visible: false,
       week_time:"",
+      week_time_two:"",
       form: {
         mode: 0,
-        week_time:"",
       }
     }
   },
@@ -107,11 +107,8 @@ export default {
     },
 
     changeWeek(val) {
-      this.form.week_time = this.getYearWeek(val) -1
-
-
-
-
+      // this.week_time = this.getYearWeek(val) -1
+      this.template_mode.original_week =  this.getYearWeek(val) -1
     },
     _close: function (done) {
       this.clear()
@@ -121,8 +118,7 @@ export default {
 
     },
     show() {
-      this.clear()
-      this.form.week_time = this.template_mode.origin_mode
+      this.week_time =""
       this.visible = true
     },
     hide() {
@@ -130,8 +126,7 @@ export default {
       this.visible = false
     },
     saveAction: function () {
-      console.log(this.form.week_time)
-      if(this.form.mode > 0 && this.form.week_time.length == 0){
+      if(this.form.mode > 0 && this.week_time.length == 0){
         this.$message.error("请选择模版自动生成起始周")
         return
       }
@@ -168,12 +163,10 @@ export default {
       }
     },
     submit: function () {
-      setTemplateMode(this.form.mode,this.form.week_time).then(rs => {
+      setTemplateMode(this.form.mode,this.template_mode.original_week).then(rs => {
         var resp = rs.data
         if (resp.state == 1) {
           this.template_mode.mode = this.form.mode
-          this.template_mode.original_week = this.form.week_time
-
           this.hide()
           this.$emit('chenge_mode', this.form.mode)
         } else {

src/xt_pages/workforce/components/tableWeeks.vue

@@ -119,26 +119,26 @@
             <el-table-column label="透析模式" min-width="100" align="center">
                 <template slot-scope="scope">
                     <!--{{getModeDesc(scope.row.list)}}-->
-                    <div v-html>{{getModeDesc(scope.row.list)}}</div>
+                    <div >{{getModeDesc(scope.row.list)}}</div>
 
                 </template>
             </el-table-column>
             <el-table-column label="透析液" min-width="100" align="center">
                 <template slot-scope="scope">
-                    <div v-html>{{getDialysisLiquidDesc(scope.row.list)}}</div>
+                    <div >{{getDialysisLiquidDesc(scope.row.list)}}</div>
                 </template>
             </el-table-column>
 
             <el-table-column label="透析管路" min-width="100" align="center">
                 <template slot-scope="scope">
-                    <div v-html>{{getDialysisPipeDesc(scope.row.list)}}</div>
+                    <div >{{getDialysisPipeDesc(scope.row.list)}}</div>
 
                 </template>
             </el-table-column>
 
             <el-table-column label="穿刺针" min-width="100" align="center">
                 <template slot-scope="scope">
-                    <div v-html>{{getPunctureNeedleDesc(scope.row.list)}}</div>
+                    <div >{{getPunctureNeedleDesc(scope.row.list)}}</div>
 
                 </template>
             </el-table-column>
@@ -146,7 +146,7 @@
 
             <el-table-column label="抗凝剂" min-width="100" align="center">
                 <template slot-scope="scope">
-                    <div v-html>{{getAnticoagulantDesc(scope.row.list)}}</div>
+                    <div >{{getAnticoagulantDesc(scope.row.list)}}</div>
 
                 </template>
             </el-table-column>
@@ -154,7 +154,7 @@
 
             <el-table-column label="促红素" min-width="100" align="center">
                 <template slot-scope="scope">
-                    <div v-html>{{getEPODesc(scope.row.list)}}</div>
+                    <div >{{getEPODesc(scope.row.list)}}</div>
 
                 </template>
             </el-table-column>

src/xt_pages/workforce/components/template_schedule_dialog.vue

@@ -0,0 +1,148 @@
+<template>
+  <el-dialog
+    width="40%"
+    :close-on-click-modal="isClose"
+    :close-on-press-escape="isClose"
+    :show-close="isClose"
+    :visible.sync="visible"
+    :before-close="_close"
+  >
+    <el-form :model="form" label-width="80px" :rules="rules" ref="formValue"     >
+            <el-form-item label="患者" required prop="patient_id">
+              <el-select
+                v-model="form.patient_id"
+                placeholder="选择患者"
+                filterable
+                clearable
+              >
+                <el-option
+                  v-for="item in patients"
+                  :key="item.id"
+                  :value="item.id"
+                  :label="item.name"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          <el-form-item label="透析模式" required prop="treat_mode">
+        <el-select
+          v-model="form.treat_mode"
+          placeholder="选择透析模式"
+          clearable
+        >
+          <el-option
+            v-for="mode in treatment_modes"
+            :key="mode.id"
+            :value="mode.id"
+            :label="mode.name"
+          >
+          </el-option>
+        </el-select>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="clearAction('formValue')">取消</el-button>
+      <el-button type="primary" @click="saveAction()">保 存</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  name: "TemplateScheduleDialog",
+  data() {
+    return {
+      patients:[],
+      visible: false,
+      isClose:false,
+      form: {
+        patient_id: "",
+        treat_mode: "",
+        weekday: 1,
+        time_type: 1,
+        device_number_id: 0
+      },
+      treatment_modes: {},
+      rules: {
+        patient_id: [{ required: true, message: "请选择患者" }],
+        treat_mode: [{ required: true, message: "请选择透析模式" }]
+      }
+    };
+  },
+
+  created() {
+    this.treatment_modes = this.$store.getters.treatment_mode;
+  },
+  methods: {
+    _close: function(done) {
+      this.clear();
+      done();
+    },
+    clear: function() {
+      this.form.patient_id = "";
+      this.form.treat_mode = "";
+      this.form.weekday = 1;
+      this.form.time_type = 1;
+      this.form.device_number_id = 0;
+    },
+    show(weekday, time_type, device_number_id,patients) {
+      this.clear();
+      this.patients = patients
+      this.form.weekday = weekday;
+      this.form.time_type = time_type;
+      this.form.device_number_id = device_number_id;
+      this.visible = true;
+    },
+    showWith(patient_id, treat_mode, weekday, time_type, device_number_id,patients) {
+      this.clear();
+      this.patients = patients
+      this.form.patient_id = patient_id;
+      this.form.treat_mode = treat_mode;
+      this.form.weekday = weekday;
+      this.form.time_type = time_type;
+      this.form.device_number_id = device_number_id;
+      this.visible = true;
+    },
+    hide() {
+      this.clear();
+      this.visible = false;
+    },clearAction(){
+      this.form.patient_id = "";
+      this.form.treat_mode = "";
+      this.$refs.formValue.resetFields()
+      this.visible = false;
+    },
+    saveAction: function() {
+
+      if (this.form.patient_id <= 0) {
+        this.$message.error("请选择患者", 1500);
+        return;
+      }
+      if (this.form.treat_mode <= 0) {
+        this.$message.error("请选择透析模式", 1500);
+        return;
+      }
+      this.$emit(
+        "did_selected",
+        this.form.patient_id,
+        this.form.treat_mode,
+        this.form.weekday,
+        this.form.time_type,
+        this.form.device_number_id
+      );
+      this.$refs.formValue.resetFields()
+
+    },
+    cancelScheduleAction: function() {
+      this.$emit(
+        "did_cancel",
+        this.form.weekday,
+        this.form.time_type,
+        this.form.device_number_id
+      );
+    }
+  }
+};
+</script>
+
+<style scoped></style>

src/xt_pages/workforce/components/template_schedule_selector_dialog.vue

@@ -39,7 +39,7 @@
       </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
-<!--      <el-button @click="cancelScheduleAction">取消排班</el-button>-->
+     <el-button @click="visible=false">取消</el-button>
       <el-button type="primary" @click="saveAction">保 存</el-button>
     </div>
   </el-dialog>

src/xt_pages/workforce/scheduleTablePrintTwo.vue

@@ -1,8 +1,8 @@
 <template>
-    <div>
-
-        <el-button style="float:right;" type="primary" @click="printAction">打印</el-button>
-        <table id="scheduleTable" class="scheduleTable" border="1" cellspacing="0">
+    <div class="scheduleTablePrint">
+      <div class="butt"><el-button style="float:right;" type="primary" @click="printAction">打印</el-button></div>
+        <div class="tab">
+        <table id="scheduleTable" class="scheduleTable" border="1" cellspacing="0" style='width: 100%;table-layout:fixed;'>
             <tr>
                 <td rowspan="2">分区</td>
                 <td rowspan="2">机号</td>
@@ -13,7 +13,7 @@
                 <td colspan="3" v-if="five_day == 5">周五({{ weekTitle[4] }})</td>
                 <td colspan="3" v-if="six_day == 6">周六({{ weekTitle[5] }})</td>
                 <td colspan="3" v-if="seven_day == 7">周日({{ weekTitle[6] }})</td>
-                <td>总数</td>
+                 <!-- <td>总数</td>  -->
             </tr>
             <tr>
                 <td v-if="first_day == 1">上午</td>
@@ -41,164 +41,161 @@
             <tr v-for="(item,index) in scheduleZone" :key="index">
                 <td style="min-width:50px;">{{ item.area }}</td>
                 <td style="min-width:50px;">{{ item.cut }}</td>
-                <td style="min-width:50px;" v-if="first_day == 1">
+                <td style="width:50px;" v-if="first_day == 1">
                     <span v-if="item.Mon_M.patient_id">
-                        <div>{{ item.Mon_M.patient }} </div>
-                        <div v-if="item.Mon_M.mode_name != 'HD'">
-                            {{ item.Mon_M.mode_name }}
-                       </div>
-                        <div v-if="item.zone_id>0">{{item.Mon_M.dialysis_machine_name}}</div>
+                        <span>{{ item.Mon_M.patient }} </span><br/>
+                        <span >{{ item.Mon_M.mode_name }}</span><br/>
+                        <span v-show="showflag">{{item.Mon_M.dialysis_machine_name}}</span>
                     </span>
                 </td>
-                <td style="min-width:50px;" v-if="first_day == 1">
+                <td style="width:50px;" v-if="first_day == 1">
                     <span v-if="item.Mon_A.patient_id">
-                        <div>{{ item.Mon_A.patient }} </div>
-                        <div v-if="item.Mon_A.mode_name != 'HD'">{{ item.Mon_A.mode_name }}</div>
-                       <div v-if="item.zone_id>0">{{item.Mon_A.dialysis_machine_name}}</div>
+                        <span>{{ item.Mon_A.patient }} </span><br/>
+                        <span >{{ item.Mon_A.mode_name }}</span><br/>
+                       <span v-show="showflag">{{item.Mon_A.dialysis_machine_name}}</span>
                     </span>
                 </td>
-                <td style="min-width:50px;" v-if="first_day == 1">
+                <td style="width:50px;" v-if="first_day == 1">
                     <span v-if="item.Mon_N.patient_id">
-                        <div>{{ item.Mon_N.patient }}</div>
-                        <div v-if="item.Mon_N.mode_name != 'HD'">{{ item.Mon_N.mode_name }}</div>
-                        <div v-if="item.zone_id>0">{{item.Mon_N.dialysis_machine_name}}</div>
+                        <span>{{ item.Mon_N.patient }} </span><br/>
+                        <span >{{ item.Mon_N.mode_name }}</span><br/>
+                        <span v-show="showflag">{{item.Mon_N.dialysis_machine_name}}</span>
                     </span>
                 </td>
-                <td style="min-width:50px;"  v-if="second_day == 2">
+                <td style="width:50px;"  v-if="second_day == 2">
                     <span v-if="item.Tue_M.patient_id">
-                        <div>{{ item.Tue_M.patient }}</div>
-                        <div v-if="item.Tue_M.mode_name != 'HD'">{{ item.Tue_M.mode_name }}</div>
-                         <div v-if="item.zone_id>0">{{item.Tue_M.dialysis_machine_name}}</div>
+                        <span>{{ item.Tue_M.patient }} </span><br/>
+                        <span >{{ item.Tue_M.mode_name }}</span><br/>
+                        <span v-show="showflag">{{item.Tue_M.dialysis_machine_name}}</span>
                     </span>
                 </td>
-                <td style="min-width:50px;"  v-if="second_day == 2">
+                <td style="width:50px;"  v-if="second_day == 2">
                     <span v-if="item.Tue_A.patient_id">
-                        <div>{{ item.Tue_A.patient }}</div>
-                        <div v-if="item.Tue_A.mode_name != 'HD'">{{ item.Tue_A.mode_name }}</div>
-                        <div v-if="item.zone_id>0">{{item.Tue_A.dialysis_machine_name}}</div>
+                      <span>{{ item.Tue_A.patient }} </span><br/>
+                        <span >{{ item.Tue_A.mode_name }}</span><br/>
+                        <span v-show="showflag">{{item.Tue_A.dialysis_machine_name}}</span>
 
                     </span>
                 </td>
-                <td style="min-width:50px;"  v-if="second_day == 2">
+                <td style="width:50px;"  v-if="second_day == 2">
                     <span v-if="item.Tue_N.patient_id">
-                        <div>{{ item.Tue_N.patient }}</div>
-                        <div v-if="item.Tue_N.mode_name != 'HD'">{{ item.Tue_N.mode_name }}</div>
-                        <div v-if="item.zone_id>0">{{item.Tue_N.dialysis_machine_name}}</div>
+                      <span>{{ item.Tue_N.patient }} </span><br/>
+                        <span >{{ item.Tue_N.mode_name }}</span><br/>
+                        <span v-show="showflag">{{item.Tue_N.dialysis_machine_name}}</span>
                     </span>
                 </td>
-                <td style="min-width:50px;" v-if="three_day == 3">
+                <td style="width:50px;" v-if="three_day == 3">
                     <span v-if="item.Wed_M.patient_id">
-                        <div>{{ item.Wed_M.patient }}</div>
-                        <div v-if="item.Wed_M.mode_name != 'HD'">{{ item.Wed_M.mode_name }}</div>
-                        <div v-if="item.zone_id>0">{{item.Wed_M.dialysis_machine_name}}</div>
+                      <span>{{ item.Wed_M.patient }} </span><br/>
+                        <span >{{ item.Wed_M.mode_name }}</span><br/>
+                        <span v-show="showflag">{{item.Wed_M.dialysis_machine_name}}</span>
                     </span>
                 </td>
-                <td style="min-width:50px;" v-if="three_day == 3">
+                <td style="width:50px;" v-if="three_day == 3">
                     <span v-if="item.Wed_A.patient_id">
-                        <div>{{ item.Wed_A.patient }}</div>
-                        <div v-if="item.Wed_A.mode_name != 'HD'">{{ item.Wed_A.mode_name }}</div>
-                       <div v-if="item.zone_id>0">{{item.Wed_A.dialysis_machine_name}}</div>
+                      <span>{{ item.Wed_A.patient }} </span><br/>
+                        <span >{{ item.Wed_A.mode_name }}</span><br/>
+                        <span v-show="showflag">{{item.Wed_A.dialysis_machine_name}}</span>
                     </span>
                 </td>
-                <td style="min-width:50px;" v-if="three_day == 3">
+                <td style="width:50px;" v-if="three_day == 3">
                     <span v-if="item.Wed_N.patient_id">
-                        <div>{{ item.Wed_N.patient }}</div>
-                        <div v-if="item.Wed_N.mode_name != 'HD'">{{ item.Wed_N.mode_name }}</div>
-                        <div v-if="item.zone_id>0">{{item.Wed_N.dialysis_machine_name}}</div>
+                      <span>{{ item.Wed_N.patient }} </span><br/>
+                        <span >{{ item.Wed_N.mode_name }}</span><br/>
+                        <span v-show="showflag">{{item.Wed_N.dialysis_machine_name}}</span>
                     </span>
                 </td>
-                <td style="min-width:50px;" v-if="four_day == 4">
+                <td style="width:50px;" v-if="four_day == 4">
                     <span v-if="item.Thurs_M.patient_id">
-                        <div>{{ item.Thurs_M.patient }}</div>
-                        <div v-if="item.Thurs_M.mode_name != 'HD'">{{ item.Thurs_M.mode_name }}</div>
-                        <div v-if="item.zone_id>0">{{item.Thurs_M.dialysis_machine_name}}</div>
+                      <span>{{ item.Thurs_M.patient }} </span><br/>
+                        <span >{{ item.Thurs_M.mode_name }}</span><br/>
+                        <span v-show="showflag">{{item.Thurs_M.dialysis_machine_name}}</span>
                     </span>
                 </td>
-                <td style="min-width:50px;" v-if="four_day == 4">
+                <td style="width:50px;" v-if="four_day == 4">
                     <span v-if="item.Thurs_A.patient_id">
-                        <div>{{ item.Thurs_A.patient }}</div>
-                        <div v-if="item.Thurs_A.mode_name != 'HD'">{{ item.Thurs_A.mode_name }}</div>
-                       <div v-if="item.zone_id>0">{{item.Thurs_A.dialysis_machine_name}}</div>
+                      <span>{{ item.Thurs_A.patient }} </span><br/>
+                        <span >{{ item.Thurs_A.mode_name }}</span><br/>
+                        <span v-show="showflag">{{item.Thurs_A.dialysis_machine_name}}</span>
                     </span>
                 </td>
-                <td style="min-width:50px;" v-if="four_day == 4">
+                <td style="width:50px;" v-if="four_day == 4">
                     <span v-if="item.Thurs_N.patient_id">
-                        <div>{{ item.Thurs_N.patient }}</div>
-                        <div v-if="item.Thurs_N.mode_name != 'HD'">{{ item.Thurs_N.mode_name }}</div>
-                        <div v-if="item.zone_id>0">{{item.Thurs_N.dialysis_machine_name}}</div>
+                      <span>{{ item.Thurs_N.patient }} </span><br/>
+                        <span >{{ item.Thurs_N.mode_name }}</span><br/>
+                        <span v-show="showflag">{{item.Thurs_N.dialysis_machine_name}}</span>
                     </span>
                 </td>
-                <td style="min-width:50px;" v-if="five_day == 5">
+                <td style="width:50px;" v-if="five_day == 5">
                     <span v-if="item.Fri_M.patient_id">
-                        <div>{{ item.Fri_M.patient }}</div>
-                        <div v-if="item.Fri_M.mode_name != 'HD'">{{ item.Fri_M.mode_name }}</div>
-                        <div v-if="item.zone_id>0">{{item.Fri_M.dialysis_machine_name}}</div>
+                      <span>{{ item.Fri_M.patient }} </span><br/>
+                        <span >{{ item.Fri_M.mode_name }}</span><br/>
+                        <span v-show="showflag">{{item.Fri_M.dialysis_machine_name}}</span>
                     </span>
                 </td>
-                <td style="min-width:50px;" v-if="five_day == 5">
+                <td style="width:50px;" v-if="five_day == 5">
                     <span v-if="item.Fri_A.patient_id">
-                        <div>{{ item.Fri_A.patient }}</div>
-                        <div v-if="item.Fri_A.mode_name != 'HD'">{{ item.Fri_A.mode_name }}</div>
-                        <div v-if="item.zone_id>0">{{item.Fri_A.dialysis_machine_name}}</div>
+                      <span>{{ item.Fri_A.patient }} </span><br/>
+                        <span >{{ item.Fri_A.mode_name }}</span><br/>
+                        <span v-show="showflag">{{item.Fri_A.dialysis_machine_name}}</span>
                     </span>
                 </td>
-                <td style="min-width:50px;" v-if="five_day == 5">
+                <td style="width:50px;" v-if="five_day == 5">
                     <span v-if="item.Fri_N.patient_id">
-                        <div>{{ item.Fri_N.patient }}</div>
-                        <div v-if="item.Fri_N.mode_name != 'HD'">{{ item.Fri_N.mode_name }}</div>
-                       <div v-if="item.zone_id>0">{{item.Fri_N.dialysis_machine_name}}</div>
+                      <span>{{ item.Fri_N.patient }} </span><br/>
+                        <span >{{ item.Fri_N.mode_name }}</span><br/>
+                        <span v-show="showflag">{{item.Fri_N.dialysis_machine_name}}</span>
                     </span>
                 </td>
-                <td style="min-width:50px;" v-if="six_day == 6">
+                <td style="width:50px;" v-if="six_day == 6">
                     <span v-if="item.Sat_M.patient_id">
-                        <div>{{ item.Sat_M.patient }}</div>
-                        <div v-if="item.Sat_M.mode_name != 'HD'">{{ item.Sat_M.mode_name }}</div>
-                       <div v-if="item.zone_id>0">{{item.Sat_M.dialysis_machine_name}}</div>
+                      <span>{{ item.Sat_M.patient }} </span><br/>
+                        <span >{{ item.Sat_M.mode_name }}</span><br/>
+                        <span v-show="showflag">{{item.Sat_M.dialysis_machine_name}}</span>
                     </span>
                 </td>
-                <td style="min-width:50px;" v-if="six_day == 6">
+                <td style="width:50px;" v-if="six_day == 6">
                     <span v-if="item.Sat_A.patient_id">
-                        <div>{{ item.Sat_A.patient }}</div>
-                        <div v-if="item.Sat_A.mode_name != 'HD'">{{ item.Sat_A.mode_name }}</div>
-                        <div v-if="item.zone_id>0">{{item.Sat_A.dialysis_machine_name}}</div>
+                      <span>{{ item.Sat_A.patient }} </span><br/>
+                        <span >{{ item.Sat_A.mode_name }}</span><br/>
+                        <span v-show="showflag">{{item.Sat_A.dialysis_machine_name}}</span>
                     </span>
                 </td>
-                <td style="min-width:50px;" v-if="six_day == 6">
+                <td style="width:50px;" v-if="six_day == 6">
                     <span v-if="item.Sat_N.patient_id">
-                        <div>{{ item.Sat_N.patient }}</div>
-                        <div v-if="item.Sat_N.mode_name != 'HD'">{{ item.Sat_N.mode_name }}</div>
-                        <div v-if="item.zone_id>0">{{item.Sat_N.dialysis_machine_name}}</div>
+                      <span>{{ item.Sat_N.patient }} </span><br/>
+                        <span >{{ item.Sat_N.mode_name }}</span><br/>
+                        <span v-show="showflag">{{item.Sat_N.dialysis_machine_name}}</span>
                     </span>
                 </td>
-                <td style="min-width:50px;" v-if="seven_day == 7">
+                <td style="width:50px;" v-if="seven_day == 7">
                     <span v-if="item.Sun_M.patient_id">
-                        <div>{{ item.Sun_M.patient }}</div>
-                        <div v-if="item.Sun_M.mode_name != 'HD'">{{ item.Sun_M.mode_name }} </div>
-                        <div v-if="item.zone_id>0">{{item.Sun_M.dialysis_machine_name}}</div>
+                      <span>{{ item.Sun_M.patient }} </span><br/>
+                        <span >{{ item.Sun_M.mode_name }}</span><br/>
+                        <span v-show="showflag">{{item.Sun_M.dialysis_machine_name}}</span>
                     </span>
                 </td>
-                <td style="min-width:50px;" v-if="seven_day == 7">
+                <td style="width:50px;" v-if="seven_day == 7">
                     <span v-if="item.Sun_A.patient_id">
-                        <div>{{ item.Sun_A.patient }}</div>
-                        <div v-if="item.Sun_A.mode_name != 'HD'">{{ item.Sun_A.mode_name }} </div>
-                        <div v-if="item.zone_id>0">{{item.Sun_A.dialysis_machine_name}}</div>
+                      <span>{{ item.Sun_A.patient }} </span><br/>
+                        <span >{{ item.Sun_A.mode_name }}</span><br/>
+                        <span v-show="showflag">{{item.Sun_A.dialysis_machine_name}}</span>
 
                     </span>
                 </td>
-                <td style="min-width:50px;" v-if="seven_day == 7">
+                <td style="width:50px;" v-if="seven_day == 7">
                     <span v-if="item.Sun_N.patient_id">
-                        <div>{{ item.Sun_N.patient }}</div>
-                        <div v-if="item.Sun_N.mode_name != 'HD'">{{ item.Sun_N.mode_name }} </div>
-                        <div v-if="item.zone_id>0">{{item.Sun_N.dialysis_machine_name}}</div>
+                      <span>{{ item.Sun_N.patient }} </span><br/>
+                        <span >{{ item.Sun_N.mode_name }}</span><br/>
+                        <span v-show="showflag">{{item.Sun_N.dialysis_machine_name}}</span>
                     </span>
                 </td>
-                <td>{{item.total}}</td>
+                <!-- <td>{{item.total}}</td> -->
             </tr>
         </table>
+      </div>
     </div>
-</template>
-
-
+</template> 
 
 <script>
 import {getSchedulesTwo,getWeekPanelsOne,getPatientSheduleCount,getAllZones,getSolutionSchedule} from "@/api/schedule";
@@ -212,6 +209,7 @@ export default {
     },
     data(){
         return{
+            showflag:sessionStorage.getItem('value1'),
             schedule_type:'',
             partition_id:'',
             theType:2,
@@ -1218,8 +1216,23 @@ export default {
 
 
 <style lang="scss">
-td{
-    text-align: center;
-    padding: 5px;
+.scheduleTablePrint{
+  width: 100%;
+  height: 100vh;
+  .butt{
+    height: 50px;
+    line-height: 50px;
+  }
+  .tab{
+    table{
+      td{
+        text-align: center;
+        padding: 5px;
+        word-wrap:break-word;
+      }
+    }
+  }
+  
 }
+
 </style>

src/xt_pages/workforce/template.vue

@@ -118,34 +118,41 @@
 <!--          <template-table :editable="false" :device_numbers="device_numbers" :template="this_week_schedules" :is_editing="false"-->
 <!--                          :patients="patients" :data="data"></template-table>-->
 <!--        </el-tab-pane>-->
-        <el-tab-pane name="first" :disabled="template_mode.mode == 0" :label=" first_template.week?'一周模版'+ first_template.week+'周':'一周模版'">
+        <el-tab-pane name="first" :disabled="template_mode.mode == 0" >
 <!--          <span slot="label">-->
 <!--          </span>-->
+          <span slot="label"> {{first_template.week?'一周模版':'一周模版'}}
+<!--             <span v-if="schedule.mode == 2 && schedule.execute_times%2==0">(下一周)</span>-->
+<!--             <span v-if="schedule.mode == 2 && schedule.execute_times%2!=0">(本周)</span>-->
+
+             <span v-if="schedule.mode ==1">(本周)</span>
+             <span v-if="schedule.mode == 2 && schedule.execute_times%2==0">(下一周)</span>
+             <span v-if="schedule.mode == 2 && schedule.execute_times%2!=0">(本周)</span>
+          </span>
 
         </el-tab-pane>
 
-        <el-tab-pane :label="  second_template.week?'二周模版' + second_template.week+'周':'二周模版'" name="second" :disabled="template_mode.mode != 2 && template_mode.mode != 3 && template_mode.mode  != 4">
+        <el-tab-pane  name="second" :disabled="template_mode.mode != 2 && template_mode.mode != 3 && template_mode.mode  != 4">
 <!--          <template-table   ref="table_two"  :is_editing="is_editing" :editable="true" :device_numbers="device_numbers" :template="first_template"-->
 <!--                           :modes="modes"  :patients="patients" @cancel_sch="refresh" :data="data"  :template_mode="template_mode"  @cur_info="cur_info" @saveData="saveData" @event1="changeZone" @saveSuccessTwo="refresh"></template-table>-->
-
+          <span slot="label"> {{second_template.week?'二周模版':'二周模版'}}
+<!--             <span v-if="schedule.mode == 2 && schedule.execute_times%2==0">(下一周)</span>-->
+<!--             <span v-if="schedule.mode == 2 && schedule.execute_times%2!=0">(本周)</span>-->
+<!--            -->
+              <span v-if="schedule.mode == 2 && schedule.execute_times%2==0">(本周)</span>
+             <span v-if="schedule.mode == 2 && schedule.execute_times%2!=0">(下一周)</span>
+          </span>
         </el-tab-pane>
 
 
 
-        <el-tab-pane :label="  third_template.week? '三周模版' + third_template.week+'周':'三周模版'" name="third" :disabled="template_mode.mode != 3 && template_mode.mode  != 4">
-<!--          <span slot="label">三周模版{{ third_template.week?third_template.week+'周':" "}}-->
-<!--             <span v-if="schedule.execute_times%2==0">(下一周)</span>-->
-<!--             <span v-if="schedule.execute_times%2!=0">(本周)</span>-->
-<!--                  <span v-if="schedule.execute_times%4==0">(本周)</span>-->
-<!--             <span v-if="schedule.execute_times%4==1">(下一周)</span>-->
-<!--            <span v-if="schedule.execute_times%4==2">(下二周)</span>-->
-<!--             <span v-if="schedule.execute_times%4==3">(下三周)</span>-->
-<!--           </span>-->
+        <el-tab-pane :label="  third_template.week? '三周模版':'三周模版'" name="third" :disabled="template_mode.mode != 3 && template_mode.mode  != 4">
+
 <!--          <template-table  ref="table_three"  :is_editing="is_editing" :editable="true" :device_numbers="device_numbers" :template="first_template"-->
 <!--                           :modes="modes"  :patients="patients" @cancel_sch="refresh" :data="data"  :template_mode="template_mode"  @cur_info="cur_info" @saveData="saveData" @event1="changeZone" @saveSuccessTwo="refresh"></template-table>-->
         </el-tab-pane>
 
-      <el-tab-pane :label="four_template.week?'四周模版'+four_template.week+'周':'四周模版'" name="four" :disabled="template_mode.mode  != 4 ">
+      <el-tab-pane :label="four_template.week?'四周模版':'四周模版'" name="four" :disabled="template_mode.mode  != 4 ">
 <!--          <span slot="label"> 四周模版 {{ four_template.week?four_template.week+'周':""}}-->
 <!--             <span v-if="schedule.execute_times%2==0">(下一周)</span>-->
 <!--             <span v-if="schedule.execute_times%2!=0">(本周)</span>-->