Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -364,6 +364,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 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  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: 2px 5px;} .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;}';
       const style4 =
         '@media print {.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: 16px;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: 16px;padding: 6px 5px;line-height: 18px;}.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;}';
+      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;}}';
 
       if (this.org_template_info.template_id == 1) {
         printJS({
@@ -429,14 +431,10 @@ export default {
           scanStyles: false
         });
       } else if (this.org_template_info.template_id == 9) {
-        console.log(
-          "joasdjjaslkdjlasjdlkasj",
-          this.org_template_info.template_id
-        );
         printJS({
           printable: "dialysis-print-box",
           type: "html",
-          style: style3,
+          style: style5,
           scanStyles: false
         });
       }

src/xt_pages/dialysis/template/dialysisPrintOrderNine.vue

@@ -44,6 +44,12 @@
           </tr>
         </tbody>
       </table>
+      <!-- <div style="display:flex:font-size:14px">
+        <span style="width:50px;text-align:text-algin">诊 断:</span>
+        <div class="under-line" style="text-align:left">
+          &nbsp;{{ patientInfo.diagnose }}
+        </div>
+      </div> -->
       <table class="table-box" style="margin-top: 10px;">
         <tbody>
           <tr>
@@ -1205,7 +1211,11 @@
                   <td colspan="3" style="font-size: 16px">执行核对医嘱</td>
                 </tr> -->
           <tr style="line-height:35px;padding:8px 5px;">
-            <td width="30px" :rowspan="doctor_advices.length + 1">
+            <td
+              style="font-size: 16px"
+              width="30"
+              :rowspan="doctor_advices.length + 1"
+            >
               医嘱内容
             </td>
             <td style="font-size: 16px" width="10%">时间</td>
@@ -1958,33 +1968,40 @@
             <td width="80">
               <div class="under-line">
                 &nbsp;
-                <span
-                  v-if="setAdminUserES(doctor_advices[0].execution_staff) == ''"
-                  >{{ getAdminUser(doctor_advices[0].execution_staff) }}</span
-                >
-                <img
-                  class="es-img"
-                  :src="setAdminUserES(doctor_advices[0].execution_staff)"
-                  alt=""
-                  srcset=""
-                  v-else
-                />
+                <p v-if="doctor_advices.length > 0">
+                  <span
+                    v-if="
+                      setAdminUserES(doctor_advices[0].execution_staff) == ''
+                    "
+                    >{{ getAdminUser(doctor_advices[0].execution_staff) }}</span
+                  >
+                  <img
+                    class="es-img"
+                    :src="setAdminUserES(doctor_advices[0].execution_staff)"
+                    alt=""
+                    srcset=""
+                    v-else
+                  />
+                </p>
               </div>
             </td>
             <td width="50">核对护士</td>
             <td width="80">
               <div class="under-line">
-                &nbsp;<span
-                  v-if="setAdminUserES(doctor_advices[0].checker) == ''"
-                  >{{ getAdminUser(doctor_advices[0].checker) }}</span
-                >
-                <img
-                  class="es-img"
-                  :src="setAdminUserES(doctor_advices[0].checker)"
-                  alt=""
-                  srcset=""
-                  v-else
-                />
+                &nbsp;
+                <p v-if="doctor_advices.length > 0">
+                  <span
+                    v-if="setAdminUserES(doctor_advices[0].checker) == ''"
+                    >{{ getAdminUser(doctor_advices[0].checker) }}</span
+                  >
+                  <img
+                    class="es-img"
+                    :src="setAdminUserES(doctor_advices[0].checker)"
+                    alt=""
+                    srcset=""
+                    v-else
+                  />
+                </p>
               </div>
             </td>
           </tr>
@@ -2680,7 +2697,6 @@ export default {
             response.data.data.advices == null
               ? []
               : response.data.data.advices;
-
           for (let index = 0; index < this.doctor_advices.length; index++) {
             this.doctor_advices[index]["isShow"] = 2;
           }
@@ -2908,7 +2924,7 @@ export default {
   font-weight: 600;
   text-align: center;
   font-size: 22px;
-  padding: 10px 20px 20px 20px;
+  padding: 10px 20px 0px 20px;
 }
 
 .dialysis-print-order .table-box {