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

src/xt_pages/dialysis/template/DialysisPrintOrderThirteen.vue

@@ -29,7 +29,7 @@
         <div class="inline_block" style="margin-right:30px;">
             机器编号 
             <div class="inline_block under_line" style="width:80px;">
-            {{ dialysisOrder && dialysisOrder.DeviceNumber && dialysisOrder.DeviceNumber.number.length > 0 ? dialysisOrder.DeviceNumber.number : patientInfo.DialysisSchedule.device_number.number }}
+            {{ getNumber() }}
             </div>
         </div>
         <div class="inline_block" style="margin-right:30px;">
@@ -92,7 +92,7 @@
           &nbsp;
           <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('股静脉') > -1 ? true : false" showValue="股"></label-box>
           &nbsp;
-          <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('内瘘-左') == -1 ? true : predialysis.blood_access_part_opera_name.indexOf('内瘘-右') == -1 ? true : predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-左') == -1 ? true : predialysis.blood_access_part_opera_name.indexOf('中心静脉置管-右') == -1 ? true : predialysis.blood_access_part_opera_name.indexOf('颈内静脉') == -1 ? true : predialysis.blood_access_part_opera_name.indexOf('锁骨下') == -1 ? true : predialysis.blood_access_part_opera_name.indexOf('股静脉') == -1 ? true : false" showValue="其他"></label-box>
+          <label-box :isChecked="['内瘘-左','内瘘-右','中心静脉置管-左','中心静脉置管-右','颈内静脉','锁骨下','股静脉'].indexOf(predialysis.blood_access_part_opera_name) == -1? true : false" showValue="其他"></label-box>
           &nbsp;
         </div>
       </div>
@@ -167,10 +167,12 @@
       <div class="row">
           <div class="inline_block" style="margin-right:22px;">
               净化时间
-              <div class="inline_block under_line" style="width:100px;">
-                  {{ afterdialysis.actual_treatment_hour ? afterdialysis.actual_treatment_hour : 0 }}.
-                  {{ afterdialysis.actual_treatment_minute ? afterdialysis.actual_treatment_minute : 0 }}
+              <div class="inline_block under_line" style="width:50px;">
+                  {{ afterdialysis.actual_treatment_hour ? afterdialysis.actual_treatment_hour : 0 }}
               </div>h
+              <div class="inline_block under_line" style="width:50px;">
+                  {{ afterdialysis.actual_treatment_minute ? afterdialysis.actual_treatment_minute : 0 }}
+              </div>min
           </div>
           <div class="inline_block" style="margin-right:30px;">
               净化后体重
@@ -241,7 +243,7 @@
             <tr>
               <td width="40"></td>
               <td width="60">时间</td>
-              <td width="80">Bp</td>
+              <td width="80">BP</td>
               <td width="40">心率</td>
               <td width="60">血流速</td>
               <td width="60">静脉压</td>
@@ -313,7 +315,7 @@
               <span v-if="setAdminUserES(check == null ? 0 : check.modifier) == ''">
                 {{ getAdminUser(check == null ? 0 : check.modifier) }}
               </span>
-              <img style="height:20px;" :src="setAdminUserES(check == null ? 0 : check.modifier)" alt srcset v-else />
+              <img style="height:30px;" :src="setAdminUserES(check == null ? 0 : check.modifier)" alt srcset v-else />
             </span>
             医生签名
             <span style="display: inline-block;width:100px;text-align: left;">
@@ -713,6 +715,7 @@ export default {
             response.data.data.dialysisOrder === null
               ? null
               : response.data.data.dialysisOrder;
+              console.log(111,this.dialysisOrder)
           if (this.operators.length > 0) {
             var operatorsLen = this.operators.length;
             for (var index = 0; index < operatorsLen; index++) {