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

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -1031,7 +1031,7 @@
       </div>
 
       <div v-if="org_template_info.template_id == 2" id="dialysis-print-box-1">
-        <div class="dialysis-print-order">
+        <div class="dialysis-print-order print-template-two">
           <div class="order-yy-name">{{orgname}}</div>
           <div class="order-title">血液净化专科护理记录单</div>
           <table class="table-box" style="margin-top: 10px;">
@@ -1704,7 +1704,7 @@
                     <td width="160">透析器及血路管凝血情况:</td>
                     <td width="10"></td>
                     <td width="65">动脉管道:</td>
-                    <td width="150">
+                    <td width="160">
                       <label-box :isChecked="afterdialysis.arterial_tube == 1?true:false"
                                  showValue='0'></label-box>
                       <label-box :isChecked="afterdialysis.arterial_tube == 2?true:false"
@@ -1716,7 +1716,7 @@
                     </td>
                     <td width="10"></td>
                     <td width="65">静脉管道:</td>
-                    <td width="150">
+                    <td width="160">
                       <label-box :isChecked="afterdialysis.intravenous_tube == 1?true:false"
                                  showValue='0'></label-box>
                       <label-box :isChecked="afterdialysis.intravenous_tube == 2?true:false"
@@ -1728,7 +1728,7 @@
                     </td>
                     <td width="10"></td>
                     <td width="65">透析器:</td>
-                    <td width="150">
+                    <td width="160">
                       <label-box :isChecked="afterdialysis.dialyzer == 1?true:false"
                                  showValue='0'></label-box>
                       <label-box :isChecked="afterdialysis.dialyzer == 2?true:false"
@@ -2243,15 +2243,15 @@
           <!--</table>-->
           <table class="print-table-no" border="1" count="0" >
             <tbody>
-            <tr><td colspan="6">医嘱</td></tr>
-            <tr><td colspan="3">开医嘱</td><td colspan="3">执行核对医嘱</td></tr>
+            <tr><td colspan="7">医嘱</td></tr>
+            <tr><td colspan="4">开医嘱</td><td colspan="3">执行核对医嘱</td></tr>
             <tr>
-              <td width="40px">时间</td>
-              <td width="120px">医嘱内容</td>
-              <td width="50px">医生签名</td>
-              <td width="50px">核对人签名</td>
-              <td width="50px">执行人签名</td>
-              <td width="55px">时间</td>
+              <td width="10%">时间</td>
+              <td colspan="2" width="45%">医嘱内容</td>
+              <td width="10%">医生签名</td>
+              <td width="10%">核对人签名</td>
+              <td width="10%">执行人签名</td>
+              <td width="10%">时间</td>
             </tr>
             <template v-for="(group, group_index) in advice_groups">
 
@@ -2265,7 +2265,7 @@
                                   </span>
                 <span v-else>&nbsp;<br/>&nbsp;</span>
               </td>
-              <td class="advice-name" v-if="advice.isShow == 2">
+              <td class="advice-name"  :colspan="advice.children && advice.children.length > 0 || advice.parent_id > 0 ? 1 :2" v-if="advice.isShow == 2">
                 <span >{{advice.advice_name }}</span>
                 <span>{{advice.advice_desc}}</span>
                 <!-- <span v-if="advice[0].drug_spec">{{advice[0].drug_spec}}{{advice[0].drug_spec_unit}}</span> -->
@@ -2273,18 +2273,20 @@
                 <span  v-if="advice.single_dose != 0">单次用量 {{advice.single_dose}}{{advice.single_dose_unit}}</span>
                 <span v-if="advice.parent_id == 0  && advice.children.length == 0">{{advice.delivery_way}}</span>
                 <span v-if="advice.parent_id == 0  && advice.children.length == 0">{{advice.execution_frequency}}</span>
-                <span v-if="advice.children && advice.children.length > 0 || advice.parent_id > 0" style="float:right;width: 1px;height:30px; background: darkgray;"></span>
+                <!-- <span v-if="advice.children && advice.children.length > 0 || advice.parent_id > 0" style="float:right;width: 1px;height:30px; background: darkgray;"></span> -->
                 <span v-if="advice.parent_id == 0 && advice.remark.length > 0" >({{advice.remark}})</span>
 
               </td>
 
-              <td class="advice-name" v-else style="text-align: center">
+              <td colspan="2" class="advice-name" v-else style="text-align: center">
                 <span>{{advice.delivery_way}}</span>
                 <span>{{advice.execution_frequency}}</span>
                 <span v-if="advice.remark.length > 0">({{advice.remark}})</span>
 
               </td>
 
+              <td width="10%" v-if="(advice.children && advice.children.length > 0 || advice.parent_id > 0) && advice.isShow == 2" ></td>
+
 
               <td>
                 <span
@@ -2453,7 +2455,7 @@
         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}.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:15px;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;}'
+        const style = '@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:15px;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;}'
 
         if (this.org_template_info.template_id != 2) {
           printJS({
@@ -3017,4 +3019,7 @@
   .border-top-solid{
     border:solid 1px #000;
   }
+  .print-template-two tr {
+    line-height: 30px;
+  }
 </style>