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

src/xt_pages/dialysis/template/DialysisPrintOrderEighteen.vue

               <span v-if="setAdminUserES(prescription.creater) == ''">
                 {{ getAdminUser(prescription.creater) }}
               </span>
-              <img class="es-img" :src="setAdminUserES(prescription.creater)" alt srcset v-else />
+              <img class="es-img" style="height:30px;" :src="setAdminUserES(prescription.creater)" alt srcset v-else />
             </td>
           </tr>
           <tr style="text-align:left">
                 <span v-if="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.puncture_nurse) == ''">
                   {{ getAdminUser(dialysisOrder == null ? 0 : dialysisOrder.puncture_nurse) }}
                 </span>
-                <img class="es-img" :src="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.puncture_nurse)" alt srcset v-else />
+                <img class="es-img" style="height:30px;" :src="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.puncture_nurse)" alt srcset v-else />
               </span>
             </td>
           </tr>
       <table class="print-table" style="border:1px solid #000;border-top:none;border-bottom:none">
         <tr style="height:30px;line-height:30px;">
           <td width="70">血管通路:</td>
-          <td width="260">
+          <td width="250">
             <div>
               <label-box :isChecked="afterdialysis.internal_fistula.indexOf('通路出血') > -1 ? true : false" showValue='通路出血'></label-box>
-              &nbsp;
+              
               <label-box :isChecked="afterdialysis.internal_fistula.indexOf('通路良好') > -1 ? true : false" showValue='良好'></label-box>
-              &nbsp;
+              
               <label-box :isChecked="afterdialysis.internal_fistula.indexOf('通路欠佳') > -1 ? true : false" showValue='欠佳'></label-box>
-              &nbsp;
+              
               <label-box :isChecked="afterdialysis.internal_fistula.indexOf('通路不畅') > -1 ? true : false" showValue='不畅'></label-box>
             </div>
           </td>
 
-          <td></td>
+          <td width='10'></td>
           <td width="50">插管:</td>
           <td width="150">
             <div>
 
             </div>
           </td>
-          <td></td>
+          <td width='10'></td>
           <td width="70">出口皮肤:</td>
           <td width="240">
             <label-box :isChecked="afterdialysis.catheter.indexOf('良好') > -1 ? true : false" showValue='良好'></label-box>
       <table class="print-table" style="border:1px solid #000;border-top:none;border-bottom:none">
         <tr style="height:30px;line-height:30px;">
           <td width="70">内瘘情况:</td>
-          <td width="540">
-            <div>
+          <td width="520">
+            <div style="text-align:left">
               <label-box :isChecked="afterdialysis.internal_fistula.indexOf('有震颤') > -1 ? true : false" showValue='有'></label-box>
-              &nbsp;
+              
               <label-box :isChecked="afterdialysis.internal_fistula.indexOf('无震颤') > -1 ? true : false" showValue='无'></label-box>
-              &nbsp;
+             
               <label-box :isChecked="afterdialysis.internal_fistula.indexOf('震颤减弱') > -1 ? true : false" showValue='震颤减弱'></label-box>
-              &nbsp;
+              
               <label-box :isChecked="afterdialysis.internal_fistula.indexOf('出血') > -1 ? true : false" showValue='出血'></label-box>
-              &nbsp;
+              
               <label-box :isChecked="afterdialysis.internal_fistula.indexOf('瘀斑') > -1 ? true : false" showValue='瘀斑'></label-box>
-              &nbsp;
+              
               <label-box :isChecked="afterdialysis.internal_fistula.indexOf('血痂') > -1 ? true : false" showValue='血痂'></label-box>
-              &nbsp;
+              
               <label-box :isChecked="afterdialysis.internal_fistula.indexOf('血管瘤') > -1 ? true : false" showValue='血管瘤'></label-box>
-              &nbsp;
+              
               <label-box :isChecked="afterdialysis.internal_fistula.indexOf('发红') > -1 ? true : false" showValue='发红'></label-box>
-              &nbsp;
+              
               <label-box :isChecked="afterdialysis.internal_fistula.indexOf('感染') > -1 ? true : false" showValue='感染'></label-box>
             </div>
           </td>
 
           <td></td>
           <td width="120">透析器凝血情况:</td>
-          <td width="200">
+          <td width="220">
             <div>
-              <label-box :isChecked="afterdialysis.cruor?(afterdialysis.cruor.indexOf('透析器-0度') > -1 ? true : false):false" showValue="0级"></label-box>&nbsp;
-              <label-box :isChecked="afterdialysis.cruor?(afterdialysis.cruor.indexOf('透析器-Ⅰ度') > -1 ? true : false):false" showValue="1级"></label-box>&nbsp;
-              <label-box :isChecked="afterdialysis.cruor?(afterdialysis.cruor.indexOf('透析器-Ⅱ度') > -1 ? true : false):false" showValue="2级"></label-box>&nbsp;
-              <label-box :isChecked="afterdialysis.cruor?(afterdialysis.cruor.indexOf('透析器-Ⅲ度') > -1 ? true : false):false" showValue="3级"></label-box>&nbsp;
+              <label-box :isChecked="afterdialysis.cruor?(afterdialysis.cruor.indexOf('透析器-0度') > -1 ? true : false):false" showValue="0级"></label-box>
+              <label-box :isChecked="afterdialysis.cruor?(afterdialysis.cruor.indexOf('透析器-Ⅰ度') > -1 ? true : false):false" showValue="1级"></label-box>
+              <label-box :isChecked="afterdialysis.cruor?(afterdialysis.cruor.indexOf('透析器-Ⅱ度') > -1 ? true : false):false" showValue="2级"></label-box>
+              <label-box :isChecked="afterdialysis.cruor?(afterdialysis.cruor.indexOf('透析器-Ⅲ度') > -1 ? true : false):false" showValue="3级"></label-box>
             </div>
           </td>
           <td></td>
               &nbsp;
               <span v-if="doctorForm.url === ''">{{ doctorForm.doctor }}</span>
               <span v-if="doctorForm.url !== ''">
-                <img class="es-img" :src="doctorForm.url" />
+                <img class="es-img" :src="doctorForm.url" style="height:30px;" />
               </span>
             </span>
             核对护士
               <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;">
                 <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 />
+                <img class="es-img" style="height:30px;" :src="setAdminUserES(doctor_advices[0].execution_staff)" alt srcset v-else />
               </p>
             </span>
           </td>

src/xt_pages/dialysis/template/DialysisPrintOrderSeventeen.vue

               {{getDatge(queryParams.xtdate)}}
             </span>
           </td>
-          <td style="text-align:center;width:130px;">
+          <td style="text-align:center;width:140px;">
             姓名:
             <span style="display:inline-block;margin-left:10px;">
               {{patientInfo.name}}
           <td style="text-align:left;" colspan="1">
             <span style="display:inline-block;margin-left:15px;">
               透后体重:
-              {{ afterdialysis.weight_after ? afterdialysis.weight_after : '/' }}
+              {{ afterdialysis.weight_after ? afterdialysis.weight_after : '/' }}kg
             </span>
           </td>
           <td style="text-align:left;" colspan="1">
           <td style="text-align:left;" colspan="8">
             <span style="display:inline-block;margin-left:15px;">使用特殊药物:</span>
             <label-box :isChecked="prescription.special_medicine == 1 ? true : false" showValue="无"></label-box>
-            <label-box :isChecked="prescription.special_medicine == 2 ? true : false" showValue="有"></label-box>:
+            <label-box :isChecked="prescription.special_medicine != 1 && prescription.special_medicine != '' ? true : false" showValue="有"></label-box>:
             <label-box
-              :isChecked="prescription.special_medicine == 3 ? true : false"
+              :isChecked="prescription.special_medicine == 2 ? true : false"
               showValue="降压药"
             ></label-box>
             <label-box
-              :isChecked="prescription.special_medicine == 4 ? true : false"
+              :isChecked="prescription.special_medicine == 3 ? true : false"
               showValue="抗凝药"
             ></label-box>
             其他：{{ prescription.special_medicine_other }}
               <label-box
                 showValue="存在"
                 :isChecked="
-                  afterdialysis.internal_fistula.indexOf('震颤-存在') > -1
+                  afterdialysis.internal_fistula.indexOf('存在') > -1
                     ? true
                     : false
                 "
               <label-box
                 showValue="减弱"
                 :isChecked="
-                  afterdialysis.internal_fistula.indexOf('震颤-减弱') > -1
+                  afterdialysis.internal_fistula.indexOf('减弱') > -1
                     ? true
                     : false
                 "
               ></label-box>
               <label-box
-                showValue="不存在"
+                showValue="消失"
                 :isChecked="
-                  afterdialysis.internal_fistula.indexOf('震颤-无') > -1
+                  afterdialysis.internal_fistula.indexOf('消失') > -1
                     ? true
                     : false
                 "
             </span>&nbsp;
             <span>
               透析器及管路凝血情况:
-              <label-box showValue="0级" :isChecked="afterdialysis.cruor.indexOf('透析器-0级') > -1"></label-box>
-              <label-box showValue="1级" :isChecked="afterdialysis.cruor.indexOf('透析器-1级') > -1"></label-box>
-              <label-box showValue="2级" :isChecked="afterdialysis.cruor.indexOf('透析器-2级') > -1"></label-box>
-              <label-box showValue="3级" :isChecked="afterdialysis.cruor.indexOf('透析器-3级') > -1"></label-box>
+              <label-box showValue="0级" :isChecked="afterdialysis.cruor.indexOf('透析器-0度') > -1"></label-box>
+              <label-box showValue="1级" :isChecked="afterdialysis.cruor.indexOf('透析器-Ⅰ度') > -1"></label-box>
+              <label-box showValue="2级" :isChecked="afterdialysis.cruor.indexOf('透析器-Ⅱ度') > -1"></label-box>
+              <label-box showValue="3级" :isChecked="afterdialysis.cruor.indexOf('透析器-Ⅲ度') > -1"></label-box>
             </span>
           </td>
         </tr>