3月23日杨青

config/sit.env.js

@@ -2,9 +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"',
   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-lock.json

@@ -4759,7 +4759,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -4782,13 +4783,15 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
           "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -4804,19 +4807,22 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
           "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
           "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -4946,7 +4952,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -4960,6 +4967,7 @@
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -4976,6 +4984,7 @@
           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
           "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -4983,13 +4992,15 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.3.5",
           "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz",
           "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -5010,6 +5021,7 @@
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
           "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -5097,7 +5109,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5111,6 +5124,7 @@
           "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5205,7 +5219,8 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -5247,6 +5262,7 @@
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -5268,6 +5284,7 @@
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -5315,13 +5332,15 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.3",
           "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
           "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -14075,6 +14094,11 @@
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
       "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
     },
+    "v-fit-columns": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/v-fit-columns/-/v-fit-columns-0.2.0.tgz",
+      "integrity": "sha512-xR0jIFmTyJeg4VZgEx7z8BIijZnHQegtbwAhG3L3TmyAoq/TXk7H6vzFLNxAVzOj9pSpO/0B2mf7jmuO2nE4Ag=="
+    },
     "validate-npm-package-license": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",

package.json

@@ -66,6 +66,7 @@
     "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",

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/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/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>
@@ -49,6 +50,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>
@@ -107,7 +109,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>
@@ -129,6 +131,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>
@@ -2421,8 +2424,8 @@ export default {
         display: flex;
         box-sizing: border-box;
         justify-content: space-around;
-        .name {
-        }
+        // .name {
+        // }
         .InputBox {
           padding: 0;
           border: none;
@@ -2457,7 +2460,10 @@ export default {
     font-size: 12px;
     display: inline-block;
     width: 60px;
+    // height: 23px;
+    // line-height: 23px;
     color: #fff;
+   
   }
   .tip2{
     background: #ee8556;
@@ -2466,6 +2472,8 @@ export default {
     font-size: 12px;
     display: inline-block;
     width: 60px;
+    // height: 23px;
+    // line-height: 23px;
     color: #fff;
   }
   .tip3{
@@ -2513,6 +2521,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

@@ -277,7 +277,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

@@ -23,7 +23,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;">
@@ -37,7 +37,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/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

@@ -68,29 +68,29 @@
       <bread-crumb :crumbs="crumbs"></bread-crumb>
       <div style="display:flex;align-items:center">
         <el-button type="primary" size="small" icon="el-icon-printer" @click="printScheduleAction">打印排班</el-button>
-        <schedule-upload-excel style="margin-right:10px;" :on-success='handleSuccess' v-if="is_edit"></schedule-upload-excel>
+        <!-- <schedule-upload-excel style="margin-right:10px;" :on-success='handleSuccess' v-if="is_edit"></schedule-upload-excel> -->
         <!-- <el-button @click="printTable" type="primary" size="small">打印排班</el-button> -->
         <el-button v-if="isShow()" type="primary" size="small" @click="export_file()" :loading="downloadLoading">
           导出排班
         </el-button>
-        <el-button
+        <!-- <el-button
             @click="generateLog()"
             class="filter-item"
             type="primary"
             v-if="is_edit"
             size="small"
         >下载日志
-        </el-button>
+        </el-button> -->
         <el-button type="primary" size="small" icon="el-icon-setting" @click="setScheduleTemplateAction">排班模板
         </el-button>
-        <el-button type="primary" size="small" @click="copySchedule" v-if="is_edit">复制排班</el-button>
-        <el-button type="primary" size="small" v-if="is_edit" @click="smartsch">智能排班</el-button>
+        <!-- <el-button type="primary" size="small" @click="copySchedule" v-if="is_edit">复制排班</el-button>
+        <el-button type="primary" size="small" v-if="is_edit" @click="smartsch">智能排班</el-button> -->
         <el-button type="primary" size="small" v-if="!is_edit" @click="editsch">编辑排班</el-button>
-        <el-button type="danger" size="small" v-if="is_edit" @click="is_edit = false ">退出编辑</el-button>
+        <!-- <el-button type="danger" size="small" v-if="is_edit" @click="outisedit">退出编辑</el-button> -->
       </div>
     </div>
     <div class="app-container">
-      <div style="right:30px;position:fixed;z-index:99">
+      <div style="right:30px;position:absolute;z-index:99">
         <span>导出周次:</span>
         <el-date-picker
             v-model="weekTime"
@@ -115,14 +115,8 @@
         <el-tab-pane name="nextTwoWeek">
           <span slot="label"><i class="el-icon-date"></i> 下下周 ({{ theWeek.nextTwoWeek }})</span>
         </el-tab-pane>
-
-
       </el-tabs>
 
-      <!-- </el-col>
-    </el-row> -->
-<!--  -->
-
       <table-data ref="tableData"  :week-time="activeName" :partitions-prop="partitions"
                   :schedule-zone-row-prop="scheduleZoneRow"
                   :schedule-zone-prop="scheduleZone" title="" @event1="changePartition"
@@ -130,10 +124,51 @@
       </table-data>
 
       <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"></edit-table-data>
-
+                        :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>
+            <el-tabs v-model="activeName" :tab-position="tabPosition" ref="elTabs">
+          <el-tab-pane name="lastWeek">
+            <span slot="label"><i class="el-icon-date"></i> 上周 ({{ theWeek.lastWeek }})</span>
+          </el-tab-pane>
+          <el-tab-pane name="thisWeek">
+            <span slot="label"><i class="el-icon-date"></i> 本周 ({{ theWeek.thisWeek }})</span>
+          </el-tab-pane>
+          <el-tab-pane name="nextWeek">
+            <span slot="label"><i class="el-icon-date"></i> 下一周 ({{ theWeek.nextWeek }})</span>
+          </el-tab-pane>
+          <el-tab-pane name="nextTwoWeek">
+            <span slot="label"><i class="el-icon-date"></i> 下下周 ({{ theWeek.nextTwoWeek }})</span>
+          </el-tab-pane>
+        </el-tabs>
+          </div>
+        <div style="display:flex;align-items:center">
+          <el-button type="primary" size="small" icon="el-icon-printer" @click="printScheduleAction">打印排班</el-button>
+          <schedule-upload-excel style="margin-right:10px;" :on-success='handleSuccess' v-if="is_edit"></schedule-upload-excel>
+          <el-button v-if="isShow()" type="primary" size="small" @click="export_file()" :loading="downloadLoading">
+            导出排班
+          </el-button>
+          <el-button
+              @click="generateLog()"
+              class="filter-item"
+              type="primary"
+              v-if="is_edit"
+              size="small"
+          >下载日志 
+          </el-button>
+          <el-button type="primary" size="small" icon="el-icon-setting" @click="setScheduleTemplateAction">排班模板
+          </el-button>
+          <el-button type="primary" size="small" @click="copySchedule" v-if="is_edit">复制排班</el-button>
+          <el-button type="primary" size="small" v-if="is_edit" @click="smartsch">智能排班</el-button>
+          <el-button type="primary" size="small" v-if="!is_edit" @click="editsch">编辑排班</el-button>
+          <el-button type="danger" size="small" v-if="is_edit" @click="outisedit">退出编辑</el-button>
+        </div>
+      </div>
+        </edit-table-data>
 
       <el-dialog title="复制排班" width="600px" :visible.sync="newVisible">
         <el-form :model="form" ref="form" label-width="90px" :rules="rules">
@@ -225,6 +260,7 @@ export default {
       days: [],
       logs: [],
       is_edit: false,
+      schedulingTableVisible:false,//全屏
       scheduleZoneRow: [],
       downloadLoading: false,
       msgTipVisible: false,
@@ -276,7 +312,8 @@ export default {
     ScheduleUploadExcel,
     tableData,
     BreadCrumb,
-    UploadExcel
+    UploadExcel,
+
   },
   methods: {
     dragstart(event, item) {
@@ -644,20 +681,16 @@ export default {
         // console.log("111111111")
         // console.log(that.scheduleZone)
       })
-    },changeSch(val){
+    },
+    changeSch(val){
       // console.log(this.partitions)
       // console.log(this.scheduleZoneRow)
       // console.log(this.scheduleZone)
 
-
-
-    },changeWeekType(val){
-
-
-
-    },changeZone(val){
-
-
+    },
+    changeWeekType(val){
+    },
+    changeZone(val){
     },
     setScheduleTemplateAction: function () {
       this.$router.push({path: '/workforce/template'})
@@ -665,7 +698,8 @@ export default {
     export_file: function () {
       // this.getWeekPanelsTwo()
       this.export_file_step_two()
-    },export_file_step_two: function(){
+    },
+    export_file_step_two: function(){
 
       this.downloadLoading = true
       import('@/vendor/Export2Excel').then(excel => {
@@ -2871,16 +2905,23 @@ export default {
 
     getTime(val) {
       return uParseTime(val, '{y}-{m}-{d}')
-    }, smartsch(){
+    },
+     smartsch(){
       this.$nextTick(function() {
         this.$refs.edittableData.showSmartDialog()
       })
-    },editsch() {
+    },
+    editsch() {
       this.is_edit = true
-      this.$nextTick(function() {
+      this.schedulingTableVisible=true
+      this.$nextTick(function() {//, this.days,this.zones
         this.$refs.edittableData.setEditData(this.patientList, this.$store.getters.treatment_mode, this.days,this.zones)
       })
     },
+    outisedit(){
+      this.is_edit=false
+      this.schedulingTableVisible=false
+    },
     copySchedule() {
       this.newVisible = true
     },
@@ -3006,7 +3047,8 @@ export default {
           this.templateObj = template
         }
       })
-    },getPatientList(){
+    },
+    getPatientList(){
       patientLists().then(response => {
         if (response.data.state == 1) {
           var patientList = response.data.data.list

src/xt_pages/workforce/components/ScheduleItem.vue

@@ -1,11 +1,11 @@
 <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>
-              <span >{{scheduleDetail.dialysis_machine_name}}</span>
-
+                <br/><span v-if="schedulFlag">{{scheduleDetail.dialysis_machine_name}}</span>
             </div>
     </div>
 </template>
@@ -26,8 +26,16 @@ export default {
               }
           },
       },
+      schedulFlag:{
+        type:Boolean,
+        default:false
+      }
+  },
+  data() {
+    return {
+      
+    }
   },
-
 
   methods:{
         modeColor(name){
@@ -45,7 +53,7 @@ export default {
 
 <style lang="scss" scoped>
 .modeRed{
-  color:#ed5555;
+  color:#ee0ad0;
 }
 .modePurple{
   color: #53b86e;

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_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>