4月6日杨青

src/xt_pages/device/main.vue

@@ -7,11 +7,12 @@
                  @click="add_device_action">新增
       </el-button>
 
-
     </div>
     <div class="app-container">
       <device-list ref="device_list" :zones="zones" :groups="groups" :device_numbers="device_numbers"
-                   @did_select_device="did_select_device"></device-list>
+                   @did_select_device="did_select_device">
+                  
+      </device-list>
       <!--<el-col :span="17">-->
       <!--<device-detail ref="device_detail" :device_numbers="device_numbers" @did_update_device="did_update_device"></device-detail>-->
       <!--</el-col>-->

src/xt_pages/management/components/UserForm.vue

@@ -106,7 +106,7 @@
         <el-table-column label="运行" align="center" min-width="110px">
           <template slot-scope="scope">{{ scope.row.move }}</template>
         </el-table-column>
-        <el-table-column label="机表消毒" align="center" min-width="110px">
+        <el-table-column label="机表（床单元、床旁桌）消毒" align="center" min-width="110px">
           <el-table-column label="消毒方式" align="center" min-width="110px">
             <template slot-scope="scope">{{
               scope.row.disinfect_type

src/xt_pages/management/home.vue

@@ -1108,7 +1108,7 @@
                                 </el-row>
                                 <el-row>
                                   <el-col :span="3">
-                                      <el-form-item label="①机表"></el-form-item>
+                                      <el-form-item label="①机表(床单位、床旁桌)"></el-form-item>
                                   </el-col>
                                   <el-col :span="10">
                                      <el-form-item label="消毒方式:" required prop="disinfect_type">
@@ -1347,7 +1347,7 @@
                                   </div>
                                 </el-row>
                              </el-form>
-
+                           
                           </el-tab-pane>
                            <el-tab-pane label="使用登记列表" name="second">
                              <user-form ref="userForm" :userdata="userdata"></user-form>
@@ -2655,6 +2655,7 @@
   import {saveOxygenates,saveHardWater,saveWater,saveDevicePH} from '@/api/device'
 const cityOptions = ['HD', 'HDF', 'HD+HP', 'HP', 'HF', 'SCUF', 'IUF', 'HFHD', 'HFHD+HP', 'PHF', 'HFR', 'HDF+HP', 'CRRT', '腹水回输']
 const moment = require('moment')
+
 export default {
     name: 'home',
     components: {
@@ -2665,7 +2666,7 @@ export default {
       UserForm,
       QualityForm,
       RepairForm,
-      RemanderForm
+      RemanderForm,
     },
     data() {
       return {

src/xt_pages/user/firstDiseasePrint.vue

@@ -8,10 +8,8 @@
     </div>
     <div class="app-container">
       <div id="print_content">
-        <div class="print_page_main_content">
+        <div class="print_page_main_content" style="height: 100%;">
            <div class="order-yy-name"></div>
-          <!-- <div class="order_title" style="padding-top:12px;text-align:center;">首次病程记录</div>
-        -->
           <h1 style="text-align:center;">首次病程记录</h1>
           <div class="row" style="padding: 2px 0;line-height:24px;margin-top:10px;">
             <div class="inline_block;">
@@ -45,29 +43,25 @@
 
              <div class="inline_block" style="width:100%;">
               <span style="font-size:20px">初步诊断：</span>
-              <div v-html="hosDetail.tentative_diagnosis" class="printP" style="text-indent:20px">
-
+              <div v-html="hosDetail.tentative_diagnosis" class="printP" style="text-indent:20px;">
               </div>
              </div>
 
              <div class="inline_block" style="width:100%;">
               <span style="font-size:20px"> 诊断依据：</span>
-              <div v-html="hosDetail.diagnostic_basis" class="printP" style="text-indent:20px">
-
+              <div v-html="hosDetail.diagnostic_basis" class="printP" style="text-indent:20px; margin-bottom: 0px;">
               </div>
              </div>
 
              <div class="inline_block" style="width:100%;">
                 <span  style="font-size:20px">鉴别诊断：</span> 
                 <div v-html="hosDetail.differential_diagnosis" class="printP" style="text-indent:20px">
-
                 </div>
               </div>
 
               <div class="inline_block" style="width:100%;">
                  <span style="font-size:20px">诊疗计划：</span>
                 <div v-html="hosDetail.treatment_plan" class="printP" style="text-indent:20px">
-
                 </div>
               </div>
 
@@ -98,6 +92,7 @@ import BreadCrumb from '@/xt_pages/components/bread-crumb'
 import {getFirstDetail,getPatientInfo} from "@/api/patient"
 import { getAllDoctorList } from "@/api/device"
 import { getDataConfig } from "@/utils/data";
+import print from "print-js";
 export default {
   name: 'dialysisPrintOrderOne',
   components: {
@@ -135,7 +130,7 @@ export default {
     printThisPage() {
         var ptime = Math.round(new Date().getTime() / 1000)
         this.print_time = uParseTime(ptime, '{y}-{m}-{d} {h}:{i}')
-        const style ='@media print {.dialysis-print-order{width:960px;margin:0 auto;letter-spacing:5px} .dialysis-print-order p{margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;font-weight: bold;margin: 10px 0;}'
+        // const style ='@media print {.dialysis-print-order{width:960px;margin:0 auto;letter-spacing:5px} .dialysis-print-order p{margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;font-weight: bold;margin: 10px 0;}'
         printJS({
             printable: 'dialysis-print-box',
             type: 'html',
@@ -233,12 +228,12 @@ export default {
       return count + 1
     },
     printAction: function() {
-      const style = '@media print {.printP div{margin-bottom:5px;} .option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 50px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 20px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;}.print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 5px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 14px;padding: 6px 5px;line-height: 16px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:1000px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top:1050px;left: 50%;}.print-yema5{position: absolute;top:1370px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}'
+      // const style = '@media print {.printP div{margin-bottom:5px;} .option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 50px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 20px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;}.print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 5px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 14px;padding: 6px 5px;line-height: 16px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:1000px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top:1050px;left: 50%;}.print-yema5{position: absolute;top:1370px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}'
       printJS({
         printable: 'print_content',
         type: 'html',
         documentTitle: '  ',
-        style: style,
+        // style: style,
         scanStyles: false
       })
     },
@@ -301,7 +296,7 @@ export default {
 <style>
 .borderBox  p{
   font-weight: bold;
-  margin: 10px 0;
+  /* margin: 10px 0; */
 }
 .dialysis-print-order {
   width: 960px;
@@ -320,7 +315,7 @@ export default {
   font-weight: 600;
   text-align: center;
   font-size: 22px;
-  padding: 10px 20px 20px 20px;
+  /* padding: 10px 20px 20px 20px; */
 }
 
 .dialysis-print-order .table-box {

src/xt_pages/workforce/components/editTableData.vue

@@ -1691,7 +1691,7 @@
 
 <script>
 import { uParseTime } from "@/utils/tools";
-// import print from "print-js";
+import print from "print-js";
 import draggable from "vuedraggable";
 const moment = require("moment");
 import {

src/xt_pages/workforce/components/scheduleUploadExcel/index.vue

@@ -3,6 +3,8 @@
     <el-dialog
       :visible.sync="msgTipVisible"
       width="40%"
+      :modal-append-to-body='false'
+      :close-on-click-modal="false"
     >
       <span>若执行排班导入,系统将会清除当前已有临时排班数据,是否继续导入？</span>
       <span slot="footer" class="dialog-footer">