Merge branch 'master' of http://git.shengws.com/csx/Vue_New

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

   height: 40px;
   line-height: 40px;
   border-bottom: 1px solid #ccc;
+  color:#303133;
 }
 .warnTxt {
   text-align: center;

src/xt_pages/dialysis/dialysisPrintOrder.vue

 
       const style5 =
         '@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: 14px;}.dialysis-print-order .print-table {  width: 100%;  text-align: center;  border-collapse: collapse;  line-height: 40px;  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;}.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: 14px;  height: 14px;  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: 15px;}.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 style6 =
+        '@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 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:16px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:16px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:16px}.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;}';
 
       if (this.org_template_info.template_id == 1) {
         printJS({
         printJS({
           printable: "dialysis-print-box",
           type: "html",
-          style: style,
+          style: style6,
           scanStyles: false
         });
       } else if (this.org_template_info.template_id == 18) {

src/xt_pages/dialysis/template/DialysisPrintOrderFourteen.vue

 
           <tr v-for="monitor in monitors" :key="monitor.id">
             <td>&nbsp;{{ getTime(monitor.operate_time, "{h}:{i}") }}</td>
-            <td>&nbsp;{{ monitor.temperature }}</td>
+            <td>&nbsp;{{ monitor.temperature ? monitor.temperature : '' }}</td>
             <td>
               &nbsp;{{ monitor.systolic_blood_pressure ? monitor.systolic_blood_pressure : "" }}/
               {{ monitor.diastolic_blood_pressure ? monitor.diastolic_blood_pressure : "" }}
             </td>
-            <td>&nbsp;{{ monitor.pulse_frequency }}</td>
-            <td>&nbsp;{{ monitor.breathing_rate }}</td>
+            <td>&nbsp;{{ monitor.pulse_frequency ? monitor.pulse_frequency : '' }}</td>
+            <td>&nbsp;{{ monitor.breathing_rate ? monitor.breathing_rate : '' }}</td>
             <td>&nbsp;{{ monitor.venous_pressure ? monitor.venous_pressure : "" }}</td>
             <td>&nbsp;{{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : "" }}</td>
             <td>&nbsp;{{ monitor.conductivity ? monitor.conductivity : "" }}</td>

src/xt_pages/dialysis/template/DialysisPrintOrderSeventeen.vue

       <div class="order-title">{{ orgname }}&nbsp;&nbsp;&nbsp;血液净化治疗记录单</div>
       <table class="print-table" border="1" style="margin-top: 10px;">
         <tr>
-          <td style="text-align:left;">
+          <td style="text-align:left;width:150px;">
             <span style="display:inline-block;margin-left:15px;">
               {{getDatge(queryParams.xtdate)}}
             </span>
           </td>
-          <td style="text-align:center;">
+          <td style="text-align:center;width:130px;">
             姓名:
             <span style="display:inline-block;margin-left:10px;">
               {{patientInfo.name}}
           </td>
         </tr>
         <tr>
-          <td style="text-align:left;" colspan="2">
+          <td style="text-align:left;" colspan="3">
             <span style="display:inline-block;margin-left:15px;">治疗方式:</span>
             <label-box :isChecked="prescription.mode_id == 1 ? true : false" showValue="HD"></label-box>&nbsp;
             <label-box :isChecked="prescription.mode_id == 2 ? true : false" showValue="HDF"></label-box>&nbsp;
             <label-box :isChecked="prescription.mode_id == 7 ? true : false" showValue="IUF"></label-box>&nbsp;
             <label-box :isChecked="prescription.mode_id == 5 ? true : false" showValue="HF"></label-box>&nbsp;
           </td>
-          <td style="text-align:left;" colspan="5">
+          <td style="text-align:left;" colspan="4">
             <span style="display:inline-block;margin-left:15px;">诊断: {{ patientInfo.diagnose }}</span>
           </td>
         </tr>
               {{ predialysis.dry_weight ? predialysis.dry_weight : "/" }}kg
             </span>
           </td>
-          <td style="text-align:left;" colspan="1">
+          <td style="text-align:left;" colspan="2">
             <span style="display:inline-block;margin-left:15px;">
-              电导率:{{
-              prescription.conductivity ? prescription.conductivity : "/"
-              }}&nbsp;(mS/cm)
+              透后净体重:{{
+              afterdialysis.weight_after
+              ? parseFloat(
+              afterdialysis.weight_after -
+              afterdialysis.additional_weight
+              ).toFixed(1)
+              : "/"
+              }}kg
             </span>
           </td>
-          <td style="text-align:left;" colspan="4">
+          <td style="text-align:left;" colspan="3">
             <span style="display:inline-block;margin-left:15px;">
               Na:
               {{
               }}L
             </span>
           </td>
-          <td style="text-align:left;" colspan="6">
-            <span style="display:inline-block;">
-              <label-box :isChecked="anticoagulant == 1 ? true : false" showValue="无肝素"></label-box>
-            </span>
+          <td style="text-align:left;padding-left:15px;" colspan="6">
+            
             <span style="display:inline-block;">
               <label-box :isChecked="anticoagulant == 7 ? true : false" showValue="低分子肝素钠"></label-box>:
             </span>
                 <span v-if="prescription.anticoagulant == 6">iu</span>
                 <span v-if="prescription.anticoagulant == 7">iu</span>
             </span>
+            <span style="display:inline-block;">
+              <label-box :isChecked="anticoagulant == 1 ? true : false" showValue="无肝素"></label-box>
+            </span>
           </td>
         </tr>
         <tr>
           <td style="text-align:left;" colspan="1">
             <span style="display:inline-block;margin-left:15px;">
               透后体重:
-              {{
-              afterdialysis.weight_after
-              ? parseFloat(
-              afterdialysis.weight_after -
-              afterdialysis.additional_weight
-              ).toFixed(1)
-              : "/"
-              }}kg
+              {{ afterdialysis.weight_after ? afterdialysis.weight_after : '/' }}
             </span>
           </td>
           <td style="text-align:left;" colspan="1">
             <span style="display:inline-block;margin-left:15px;">
-              实际脱水量:{{
+              净脱水量:{{
               afterdialysis.actual_ultrafiltration
               ? afterdialysis.actual_ultrafiltration
               : "/"
           </td>
         </tr>
         <tr>
-          <td colspan="2" style="text-align:left;">
+          <td colspan="3" style="text-align:left;">
             <span style="display:inline-block;margin-left:15px;">食欲:</span>
             <label-box
               :isChecked="receiverTreatmentAccess.appetite == 1 ? true : false"
               showValue="腹泻"
             ></label-box>&nbsp;
           </td>
-          <td colspan="2" style="text-align:left;">
+          <td colspan="1" style="text-align:left;">
             <span style="display:inline-block;margin-left:15px;">
               体温:{{
               predialysis.temperature ? predialysis.temperature : "/"
         </tr>
         <tr>
           <td style="text-align:left;" colspan="6">
-            <span style="display:inline-block;margin-left:15px;">特殊记录:{{ special_record }}</span>
+            <span style="display:inline-block;margin-left:15px;">特殊记录:{{ dialysis_summary ? dialysis_summary : "" }}</span>
           </td>
         </tr>
         <tr>

src/xt_pages/upload/fast/FastProvince.vue

                 @row-click="changePatient"
                 highlight-current-row
                 :data="tableData"
-                height="500"
+                height="300"
                 border
                 style="width: 100%"
                 :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}">
             </div>
           </div>
         </div>
-        <div style="flex:1;width:0;margin-left:20px;" v-if="this.form.province == 13">
+        <div style="flex:1;width:0;margin-left:20px;height: calc(100vh - 178px);overflow-y: auto;" v-if="this.form.province == 13">
           <!-- <div class="cell clearfix" style="margin-bottom:0px;">
             <el-form :inline="true" :model="listQuery">
               <el-form-item label>