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

src/xt_pages/user/coursePrint.vue

@@ -115,7 +115,7 @@
     },
     methods: {
       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: 14px;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',

src/xt_pages/user/templateSummary.vue

@@ -63,27 +63,27 @@
                 <div style="padding:10px;border-bottom:1px solid #DCDFE6;">阶段小结时间:{{getTime(editObj.record_time)}}</div>  
                 <div style="padding: 10px 10px 0;">阶段小结概要:</div>  
                 <div style="padding:10px;border-bottom:1px solid #DCDFE6;">
-                  <span style="margin-right:10px;line-height:20px;">干体重(kg):{{editObj.dry_weight}}</span>
-                  <span style="margin-right:10px;line-height:20px;">共透析:{{editObj.dialysis_count}}次</span>
-                  <span style="margin-right:10px;line-height:20px;">HD:{{editObj.hd_count}}次</span>
+                  <span style="margin-right:10px;line-height:30px;">干体重(kg):{{editObj.dry_weight}}</span>
+                  <span style="margin-right:10px;line-height:30px;">共透析:{{editObj.dialysis_count}}次</span>
+                  <span style="margin-right:10px;line-height:30px;">HD:{{editObj.hd_count}}次</span>
                   <br>
-                  <span style="margin-right:10px;line-height:20px;">HDF:{{editObj.hdf_count}}次</span>
-                  <span style="margin-right:10px;line-height:20px;">HP:{{editObj.hp_count}}次</span>
-                  <span style="margin-right:10px;line-height:20px;">其他:{{editObj.other_count}}次</span>
+                  <span style="margin-right:10px;line-height:30px;">HDF:{{editObj.hdf_count}}次</span>
+                  <span style="margin-right:10px;line-height:30px;">HP:{{editObj.hp_count}}次</span>
+                  <span style="margin-right:10px;line-height:30px;">其他:{{editObj.other_count}}次</span>
                    <br>
-                  <span style="margin-right:10px;line-height:20px;">透析器:{{editObj.dialzer_apparatus}}</span>
-                  <span style="margin-right:10px;line-height:20px;">抗凝剂:
+                  <span style="margin-right:10px;line-height:30px;">透析器:{{editObj.dialzer_apparatus}}</span>
+                  <span style="margin-right:10px;line-height:30px;">抗凝剂:
                     <span> {{getAnticoagulant(editObj.anticoagulant)}}</span>
                   </span>
-                  <span style="margin-right:10px;line-height:20px;">透析液:(钾:{{editObj.kalium}} 钙:{{editObj.autunite}} Na:{{editObj.natrium}})</span>
+                  <span style="margin-right:10px;line-height:30px;">透析液:(钾:{{editObj.kalium}} 钙:{{editObj.autunite}} Na:{{editObj.natrium}})</span>
                   <br>
-                  <span style="margin-right:10px;line-height:20px;">每次透析:<span v-if="editObj.hour!=''"> {{editObj.hour}}小时</span>
+                  <span style="margin-right:10px;line-height:30px;">每次透析:<span v-if="editObj.hour!=''"> {{editObj.hour}}小时</span>
                    <span v-if="editObj.minute!=''">{{editObj.minute}}</span>分</span>
-                  <span style="margin-right:10px;line-height:20px;">透前体重（kg）:{{editObj.befor_weight}}</span>
-                  <span style="margin-right:10px;line-height:20px;">透后体重（kg）:{{editObj.after_weight}}</span>
+                  <span style="margin-right:10px;line-height:30px;">透前体重（kg）:{{editObj.befor_weight}}</span>
+                  <span style="margin-right:10px;line-height:30px;">透后体重（kg）:{{editObj.after_weight}}</span>
                   <br>
-                  <span style="margin-right:10px;line-height:20px;">透前血压（mmHg):{{editObj.befor_pressure}}</span>
-                  <span style="margin-right:10px;line-height:20px;">透后血压（mmHg):{{editObj.after_pressure}}</span>
+                  <span style="margin-right:10px;line-height:30px;">透前血压（mmHg):{{editObj.befor_pressure}}</span>
+                  <span style="margin-right:10px;line-height:30px;">透后血压（mmHg):{{editObj.after_pressure}}</span>
                 </div>
                  <div style="padding:10px;border-bottom:1px solid #DCDFE6;line-height:20px;">阶段小结总结:
                    {{editObj.template_summary_content}}
@@ -93,7 +93,7 @@
                     <div v-for="item in editObj.template_inspection_content">
                     <p style="font-weight: bold;margin: 10px 0;">{{ item.project_name }} 检查日期:{{getTime(item.arr[0].inspect_date)}}</p>
                     <div style="display:flex;flex-wrap: wrap;">
-                      <div v-for="it in item.arr" style="width:33%;">
+                      <div v-for="it in item.arr" style="width:33%;margin-bottom:5px;">
                         {{ it.item_name }} <span v-if="it.unit!=''">[{{it.unit}}]</span>:
                         <span v-if="parseInt(it.inspect_value) < parseInt(it.range_min)">
                             {{it.inspect_value}}↓
@@ -600,7 +600,7 @@
                       </div>
                      </div>
                   </el-row>
-                  <el-row>
+                  <el-row style="margin-top:10px;">
                     <el-col :span="8">
                       <el-form-item label="记录医生">
                         <el-select v-model="form.admin_user_id" placeholder="请选择">

src/xt_pages/user/templateSummaryPrint.vue

@@ -10,12 +10,12 @@
       
       <div style="padding-bottom:20px;border-bottom:1px solid #000;margin-top:40px;">
          <span>姓名:{{patientList.patient.name}}</span>  
-         <span>年龄:{{getNewAge(patientList.patient.id_card_no)}}</span>  
-         <span>性别:
+         <span style="margin-left:20px;">年龄:{{getNewAge(patientList.patient.id_card_no)}}</span>  
+         <span style="margin-left:20px;">性别:
              <span v-if="patientList.patient.gender == 1">男</span>
              <span v-if="patientList.patient.gender == 2">女</span>
          </span> 
-         <span>诊断:{{patientList.patient.diagnose}}</span> 
+         <span style="margin-left:20px;">诊断:{{patientList.patient.diagnose}}</span> 
       </div>
       <div style="padding:20px 0;border-bottom:1px solid #000;font-weight:bold;">
         <span>阶段评估时间:{{getTime(patientList.record_time)}}</span>  
@@ -54,8 +54,8 @@
           <div v-for="item in patientList.template_inspection_content">
             <p>{{ item.project_name }} 检查日期:{{getTime(item.arr[0].inspect_date)}}</p>
             <div style="display:flex;flex-wrap: wrap;">
-              <div v-for="it in item.arr" style="width:33%;">
-            {{ it.item_name }} <span v-if="it.unit!=''"> [{{it.unit}}] </span>:
+              <div v-for="it in item.arr" style="width:33%;margin-bottom:10px;">
+                {{ it.item_name }} <span v-if="it.unit!=''"> [{{it.unit}}] </span>:
                 <span v-if="parseInt(it.inspect_value) < parseInt(it.range_min)">
                   {{it.inspect_value}}↓
                 </span> 
@@ -73,7 +73,7 @@
       </div>
      <div style="margin-top:10px;">
        <span>记录医生:{{getPatientList(patientList.admin_user_id)}}</span>  
-       <span>记录时间:{{getTime(patientList.record_time)}}</span>  
+       <span style="margin-left:20px;">记录时间:{{getTime(patientList.record_time)}}</span>  
      </div>
     </div>
   </div>