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

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -385,6 +385,12 @@
           align="center"
           width="120"
         ></el-table-column>
+        <el-table-column
+          prop="start_time"
+          label="上机时间"
+          align="center"
+          width="80"
+        ></el-table-column>
         <el-table-column
           prop="dialysis_no"
           label="透析号"
@@ -691,7 +697,7 @@ export default {
               const SchedualPatientsTable = {
                 bp: []
               };
-
+              SchedualPatientsTable["start_time"] = response.data.data.schedule[i].dialysis_order.start_time ? parseTime(response.data.data.schedule[i].dialysis_order.start_time,"{h}:{i}") : '';
               SchedualPatientsTable["sch_id"] = response.data.data.schedule[i].id;
               SchedualPatientsTable["sch_time_int"] = response.data.data.schedule[i].schedule_date;
               SchedualPatientsTable["sch_time"] = parseTime(response.data.data.schedule[i].schedule_date,"{y}-{m}-{d}");

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -1981,7 +1981,7 @@
         if (minites < 10) {
           minites = '0' + minites
         }
-        if (this.$store.getters.xt_user.org.id == 10016) {
+        if (this.$store.getters.xt_user.org.id == 10016 || this.$store.getters.xt_user.org.id == 10101) {
           this.start_time = year + '-' + month + '-' + day + ' ' + hours + ':' + minites
         } else {
           if (schedual.schedule_type == 1) {

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -1139,7 +1139,8 @@ export default {
         '@media print {.dialysis-print-order {width: 960px; 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 0px 20px;}.dialysis-print-order .table-box {  width: 100%;  line-height: 18px;  font-size: 18px;}.dialysis-print-order .print-table {  width: 100%;  text-align: center;  border-collapse: collapse;  line-height: 28px;  font-size: 18px;}.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;}.dialysis-print-order .radio-lebel-box {  font-weight: 400;  cursor: pointer;}.dialysis-print-order .radio-no {  opacity: 0;  outline: none;  position: absolute;  margin: 0;  width: 0;  height: 0;  z-index: -1;}.dialysis-print-order .radio-inner {  white-space: nowrap;  cursor: pointer;  outline: none;  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: 18px;  height: 18px;  background-color: #fff;  z-index: 1;  transition: border-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46),    background-color 0.25s cubic-bezier(0.71, -0.46, 0.29, 1.46);}.dialysis-print-order .is-checked-radio::after {  content: "√";  font-size: 19px;}.dialysis-print-order .print-table-no tr td {  padding: 8px 5px;  line-height: 25px;}.dialysis-print-order .print-table tr td {  padding: 1px 1px;  /*line-height: 25px;*/}.es-img {  height: 25px;}.advice-name {  text-align: left;}.advice-children {  display: flex;}.title-box-pro {  border: 0 #fff;  line-height: 25px;  height: 25px;  text-align: left;  padding-left: 10px !important;}.title-box-pro-tr {  border: 0 #fff;}.text-align-left {  text-align: left !important;  padding-left: 10px !important;  font-size: 14px !important;  line-height: 25px;}.print-table-tr-new td {line-height: 20px !important;}.border-top-solid {border: solid 1px #000;}.print-template-two tr {line-height: 30px;}}';
       const style8 =
         '@media print {.dialysis-print-order{width:960px;margin:0 auto;font-size:10px;}.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:10px}.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;}.widthLength25{width: 25%;}.lineHeight{line-height: 20px;display: flex;justify-content: space-between;}';
-
+      const style9 =
+        '@media print {.dialysis-print-order{width:920px;margin:0 10px;font-size:10px;}.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: 940px;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: 3px 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-50{margin-bottom:50px;}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:900px;}.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%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}.table-box1 {border: 1px solid #000;width: 100%;line-height: 30px;font-size: 14px;border-collapse: collapse;}.table-box1 tr {border-bottom: 1px solid #000;}';
 
       if (this.org_template_info.template_id == 1) {
         printJS({
@@ -1411,7 +1412,7 @@ export default {
         printJS({
           printable: "dialysis-print-box-1",
           type: "html",
-          style: style2,
+          style: style9,
           scanStyles: false
         });
       }

src/xt_pages/dialysis/template/DialysisPrintOrderFortyOne.vue

@@ -1,5 +1,5 @@
 <template>
-  <div id="dialysis-print-box-1">
+  <div id="dialysis-print-box-1" style="width:920px">
     <div
       id="dialysis-print-box-1-1"
       class="dialysis-print-order print-template-two print_page_main_content"
@@ -44,22 +44,26 @@
             <check-box :checked="receiverTreatmentAccess.condition == 2 ? true : false"></check-box>
           </div>
         </div>
+        
+
+      </div>
+      <div class="row">
         <div class="inline_block">
           病区：
-          <div class="under_line" style="width: 50px;text-align: center;">
+          <div class="under_line" style="width: 120px;text-align: center;">
             {{ patientInfo.DialysisSchedule.device_zone.name ? patientInfo.DialysisSchedule.device_zone.name : '' }}
           </div>
         </div>
         <div class="inline_block">
           床号：
-          <div class="under_line" style="width: 50px;text-align: center;">
+          <div class="under_line" style="width: 120px;text-align: center;">
             {{ dialysisOrder && dialysisOrder.DeviceNumber && dialysisOrder.DeviceNumber.number.length > 0 ? dialysisOrder.DeviceNumber.number : patientInfo.DialysisSchedule.device_number.number }}
           </div>
         </div>
         
         <div class="inline_block">
           透析次数：
-          <div class="under_line" style="width: 40px;text-align: left">
+          <div class="under_line" style="width: 60px;text-align: left">
             {{ patientInfo.total_dialysis + patientInfo.user_sys_before_count }} 次
           </div>
         </div>
@@ -69,7 +73,6 @@
             {{ queryParams.xtdate }}
           </div>
         </div>
-
       </div>
 
       <div class="row">
@@ -120,7 +123,7 @@
                   </div>
                   <div class="inline_block" style="margin-left:10px;">
                     透前症状：
-                    <div class="under_line" style="width: 140px;text-align: center">
+                    <div class="under_line" style="width: 130px;text-align: center">
                       {{ predialysis.symptom_before_dialysis ? predialysis.symptom_before_dialysis : "" }}
                     </div>
                   </div>
@@ -162,7 +165,14 @@
                     </div>
                     kg
                   </div>
-                  <div class="inline_block" style="margin-left:90px;">
+                  <div class="inline_block" style="margin-left:10px;">
+                    衣物重：
+                    <div class="under_line" style="width: 50px;text-align: center">
+                      {{ predialysis.additional_weight ? predialysis.additional_weight: "/" }}
+                    </div>
+                    kg
+                  </div>
+                  <div class="inline_block" style="margin-left:10px;">
                     体重增加：
                     <div class="under_line" style="width: 50px;text-align: center">
                       {{ predialysis.weight_before > 0 && lastafterdialysis.weight_after > 0 ? parseFloat(predialysis.weight_before - lastafterdialysis.weight_after).toFixed(2): "/" }}
@@ -186,7 +196,7 @@
                 </div>
               </td>
               <td colspan="1" style="width:50%;padding:0px 0px 5px">
-                <div style="letter-spacing:5px;text-align:center;font-weight:520;font-size:16px;padding: 6px 8px;line-height: 30px;border-bottom:1px solid #000;">
+                <div style="letter-spacing:5px;text-align:center;font-weight:520;font-size:16px;padding: 0px 8px;line-height: 30px;border-bottom:1px solid #000;">
                   透析后评估
                 </div>
                 <div class="row" style="padding:5px 8px;">
@@ -327,64 +337,64 @@
                   </div>
                   <div class="inline_block" style="flex:1;">
                     透析方式：
-                    <div class="under_line" style="width: 80px;text-align: center;font-weight:600;" v-if="!prescription.mode_id">
+                    <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="!prescription.mode_id">
                       /
                     </div>
-                    <div class="under_line" style="width: 80px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 1">
+                    <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 1">
                       HD
                     </div>
-                    <div class="under_line" style="width: 80px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 2">
+                    <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 2">
                       HDF
                     </div>
-                    <div class="under_line" style="width: 80px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 3">
+                    <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 3">
                       HD+HP
                     </div>
-                    <div class="under_line" style="width: 80px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 4">
+                    <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 4">
                       HP
                     </div>
-                    <div class="under_line" style="width: 80px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 5">
+                    <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 5">
                       HF
                     </div>
-                    <div class="under_line" style="width: 80px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 6">
+                    <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 6">
                       SCUF
                     </div>
-                    <div class="under_line" style="width: 80px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 7">
+                    <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 7">
                       IUF
                     </div>
-                    <div class="under_line" style="width: 80px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 8">
+                    <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 8">
                       HFHD
                     </div>
-                    <div class="under_line" style="width: 80px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 9">
+                    <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 9">
                       HFHD+HP
                     </div>
-                    <div class="under_line" style="width: 80px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 10">
+                    <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 10">
                       PHF
                     </div>
-                    <div class="under_line" style="width: 80px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 11">
+                    <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 11">
                       HFR
                     </div>
-                    <div class="under_line" style="width: 80px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 12">
+                    <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 12">
                       HDF+HP
                     </div>
-                    <div class="under_line" style="width: 80px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 13">
+                    <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 13">
                       CRRT
                     </div>
-                    <div class="under_line" style="width: 80px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 14">
+                    <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 14">
                       腹水回输
                     </div>
-                    <div class="under_line" style="width: 80px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 15">
+                    <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 15">
                       HD前置换
                     </div>
-                    <div class="under_line" style="width: 80px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 16">
+                    <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 16">
                       HD后置换
                     </div>
-                    <div class="under_line" style="width: 80px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 17">
+                    <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 17">
                       HDF前置换
                     </div>
-                    <div class="under_line" style="width: 80px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 18">
+                    <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 18">
                       HDF后置换
                     </div>
-                    <div class="under_line" style="width: 80px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 19">
+                    <div class="under_line" style="width: 70px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 19">
                       IUF+HD
                     </div>
                     <div class="under_line" style="width: 150px;text-align: center;font-weight:600;" v-if="prescription.mode_id == 22">
@@ -579,18 +589,21 @@
                     </tr>
                     <tr>
                       <td width="60">时间</td>
+                      <td width="40">体温<br />°C</td>
                       <td width="50">血流量<br />(ml/min)</td>
                       <td width="90">静脉压(mmHg)/<br />跨膜压(mmHg)</td>
                       <td width="80">超滤率(ml/h)/<br />超滤量(ml)</td>
                       <td width="80">钠浓度(ml/h)/<br />温度(°C)</td>
                       <td width="50">脉搏<br />(次/分)</td>
                       <td width="60">血压<br />(mmHg)</td>
+                      <td width="50">血容量</td>
                       <td width="50">签名</td>
                       <td width="200">病情变化及处理</td>
                     </tr>
 
                     <tr v-for="(monitor, monindex) in monitors" :key="monindex">
                       <td style="padding:1px 5px;" height="30px">{{ getTime(monitor.operate_time, "{h}:{i}") }}</td>
+                      <td style="padding:1px 5px;">{{ monitor.temperature ? monitor.temperature : '' }}</td>
                       <td style="padding:1px 5px;">{{ monitor.blood_flow_volume ? monitor.blood_flow_volume : "" }}
                       <td style="padding:1px 5px;"><span v-if="getTime(monitor.operate_time, '{h}:{i}')">{{ monitor.venous_pressure ? monitor.venous_pressure : "" }}/{{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : "" }}</span></td>
                       <td style="padding:1px 5px;"><span v-if="getTime(monitor.operate_time, '{h}:{i}')">{{ monitor.ultrafiltration_rate ? monitor.ultrafiltration_rate : "" }}/{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}</span></td>
@@ -608,6 +621,7 @@
                           <img style="height:30px;" :src="setAdminUserES(monitor.monitoring_nurse)" alt srcset />
                         </span>
                       </td>
+                      <td style="padding:1px 5px;">{{ monitor.accumulated_blood_volume ? monitor.accumulated_blood_volume : '' }}</td>
                       <td style="line-height:16px;padding:0px;">
                         <div style="min-height:20px;line-height:20px; overflow:hidden;">
                           <span v-if="getTime(monitor.operate_time, '{h}:{i}')" style="word-break: break-all;margin:0;line-height:16px;-webkit-line-clamp:3;overflow:visible;display:inline-block;vertical-align:middle;height:auto;">
@@ -648,7 +662,7 @@
                   </div>
                   <div class="inline_block" style="flex:1;margin-left:50px;">
                     透后宣教：
-                    <div class="under_line" style="width: 600px;text-align: left;">
+                    <div class="under_line" style="width: 550px;text-align: left;">
                       {{ summary.mission ? summary.mission : '' }}
                     </div>
                   </div>