Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/dialysis/template/DialysisPrintOrderThirty.vue

@@ -146,7 +146,7 @@
                 <td width="80">透析前体重:</td>
                 <td width="70">
                   <div class="under-line">
-                    &nbsp;{{ predialysis.weight_before ? predialysis.weight_before : "" }}
+                    &nbsp;{{ predialysis.weight_before ? predialysis.weight_before : "未称重" }}
                   </div>
                 </td>
                 <td width="35">kg</td>
@@ -430,7 +430,7 @@
                     <td width="30"></td>
                     <td width='70'>透后体重:</td>
                     <td width="50">
-                      <div class="under-line">&nbsp;{{ afterdialysis.weight_after ? afterdialysis.weight_after : "" }}</div>
+                      <div class="under-line">&nbsp;{{ afterdialysis.weight_after ? afterdialysis.weight_after : "未称重" }}</div>
                     </td>
                     <td width="10">Kg</td>
                     <td></td>

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyFour.vue

@@ -1,9 +1,9 @@
 <template>
   <div id="dialysis-print-box">
     <div id='new-dialysis-1' class="dialysis-print-order">
-      <div class="order-yy-name"></div>
-      <div class="order-title">{{ orgname }} 血液净化治疗记录单</div>
-      <table class="table-box" style="margin-top: 10px;">
+      <div class="order-yy-name" style="font-size:28px;font-weight:bold;">{{ orgname }}</div>
+      <div class="order-title">血液净化治疗记录单</div>
+      <table class="table-box">
         <tbody>
           <tr>
             <td width="50">姓 名:</td>
@@ -93,12 +93,10 @@
             </td>
             <td width='30'></td>
             <td width="30">机位</td>
-            <td width="50">
+            <td width="120">
                 <div class="under-line">&nbsp;{{ getNumber() }}</div>
             </td>
             <td width="20">号</td>
-            
-            <td width="20"></td>
 
             <td></td>
 
@@ -168,7 +166,7 @@
                       </div>
                     </td>
                     <td width="100">
-                        <div class="under-line">{{ predialysis.hemorrhage_other ? predialysis.hemorrhage_other : '' }}</div>
+                        <div class="under-line">&nbsp;{{ predialysis.hemorrhage_other ? predialysis.hemorrhage_other : '' }}</div>
                     </td>
                     <td></td>
                   </tr>
@@ -376,12 +374,12 @@
                     <td width='50'>血流量</td>
                     <td width="220">
                       <div>
-                        <label-box :isChecked="predialysis.catheter.indexOf('血流量-好') > -1 ? true : false" showValue="干洁"></label-box>
+                        <label-box :isChecked="predialysis.catheter.indexOf('血流量-好') > -1 ? true : false" showValue="好"></label-box>
                         &nbsp;
                         <label-box :isChecked="predialysis.catheter.indexOf('血流量差-A') > -1 ? true : false" showValue="A"></label-box>
-                        &nbsp;
+                        /
                         <label-box :isChecked="predialysis.catheter.indexOf('血流量差-V') > -1 ? true : false" showValue="V"></label-box>
-                        &nbsp;
+                        差&nbsp;
                         <label-box :isChecked="predialysis.catheter.indexOf('血流量-AV反接') > -1 ? true : false" showValue="AV反接"></label-box>
                       </div>
                     </td>

src/xt_pages/sign/lineUp.vue

@@ -76,15 +76,15 @@
                                 <div class="callingTop" style="margin-bottom:10px;">
                                     <div class="callingTopTip"><span style="margin: 0 auto;">正在<br />接诊</span></div>
                                     <div class="callingContent">
-                                        <p style="margin:50px 0 14px;"><span v-for="(item,index) in receivingPatient.slice(0,3)" :key="index">{{ item.patient_name }}、</span></p>
-                                        <p><span v-for="(item,index) in receivingPatient.slice(3,6)" :key="index">{{ item.patient_name }}、</span></p>
+                                        <p style="margin:50px 0 14px;"><span v-for="(item,index) in (receivingPatient || '').slice(0,3)" :key="index">{{ item.patient_name }}、</span></p>
+                                        <p><span v-for="(item,index) in (receivingPatient || '').slice(3,6)" :key="index">{{ item.patient_name }}、</span></p>
                                     </div>
                                 </div>
                                 <div class="callingTop" style="border-radius: 0 0 15px 0;">
                                     <div class="callingTopTip"><span style="margin: 0 auto;">等待<br />接诊</span></div>
                                     <div class="callingContent">
-                                        <p style="margin:50px 0 14px;"><span v-for="(item,index) in waitDoctorList.slice(0,3)" :key="index">{{ item.patient_name }}、</span></p>
-                                        <p><span v-for="(item,index) in waitDoctorList.slice(3,6)" :key="index">{{ item.patient_name }}、</span></p>
+                                        <p style="margin:50px 0 14px;"><span v-for="(item,index) in (waitDoctorList || '').slice(0,3)" :key="index">{{ item.patient_name }}、</span></p>
+                                        <p><span v-for="(item,index) in (waitDoctorList || '').slice(3,6)" :key="index">{{ item.patient_name }}、</span></p>
                                     </div>
                                 </div>
                             </div>
@@ -95,15 +95,15 @@
                                 <div class="callingTop" style="margin-bottom:10px;">
                                     <div class="callingTopTip newCallingTopTip"><span style="margin: 0 auto;">正在<br />叫号</span></div>
                                     <div class="callingContent newCallingContent">
-                                        <p style="margin:50px 0 14px;"><span v-for="(item,index) in upPatientList.slice(0,3)" :key="index">{{ item.patient_name }}、</span></p>
-                                        <p><span v-for="(item,index) in upPatientList.slice(3,6)" :key="index">{{ item.patient_name }}、</span></p>
+                                        <p style="margin:50px 0 14px;"><span v-for="(item,index) in (upPatientList || '').slice(0,3)" :key="index">{{ item.patient_name }}、</span></p>
+                                        <p><span v-for="(item,index) in (upPatientList || '').slice(3,6)" :key="index">{{ item.patient_name }}、</span></p>
                                     </div>
                                 </div>
                                 <div class="callingTop" style="border-radius: 0 0 15px 0;">
                                     <div class="callingTopTip newCallingTopTip"><span style="margin: 0 auto;">等待<br />叫号</span></div>
                                     <div class="callingContent newCallingContent">
-                                        <p style="margin:50px 0 14px;"><span v-for="(item,index) in receivingPatient.slice(0,3)" :key="index">{{ item.patient_name }}、</span></p>
-                                        <p><span v-for="(item,index) in receivingPatient.slice(3,6)" :key="index">{{ item.patient_name }}、</span></p>
+                                        <p style="margin:50px 0 14px;"><span v-for="(item,index) in (receivingPatient || '').slice(0,3)" :key="index">{{ item.patient_name }}、</span></p>
+                                        <p><span v-for="(item,index) in (receivingPatient || '').slice(3,6)" :key="index">{{ item.patient_name }}、</span></p>
                                     </div>
                                 </div>
                             </div>
@@ -155,15 +155,15 @@
                                 <div class="callingTop" style="margin-bottom:10px;">
                                     <div class="callingTopTip"><span style="margin: 0 auto;">正在<br />接诊</span></div>
                                     <div class="callingContent">
-                                        <p style="margin:50px 0 14px;"><span v-for="(item,index) in receivingPatient.slice(0,3)" :key="index">{{ item.patient_name }}、</span></p>
-                                        <p><span v-for="(item,index) in receivingPatient.slice(3,6)" :key="index">{{ item.patient_name }}、</span></p>
+                                        <p style="margin:50px 0 14px;"><span v-for="(item,index) in (receivingPatient || '').slice(0,3)" :key="index">{{ item.patient_name }}、</span></p>
+                                        <p><span v-for="(item,index) in (receivingPatient || '').slice(3,6)" :key="index">{{ item.patient_name }}、</span></p>
                                     </div>
                                 </div>
                                 <div class="callingTop" style="border-radius: 0 0 15px 0;">
                                     <div class="callingTopTip"><span style="margin: 0 auto;">等待<br />接诊</span></div>
                                     <div class="callingContent">
-                                        <p style="margin:50px 0 14px;"><span v-for="(item,index) in waitDoctorList.slice(0,3)" :key="index">{{ item.patient_name }}、</span></p>
-                                        <p><span v-for="(item,index) in waitDoctorList.slice(3,6)" :key="index">{{ item.patient_name }}、</span></p>
+                                        <p style="margin:50px 0 14px;"><span v-for="(item,index) in (waitDoctorList || '').slice(0,3)" :key="index">{{ item.patient_name }}、</span></p>
+                                        <p><span v-for="(item,index) in (waitDoctorList || '').slice(3,6)" :key="index">{{ item.patient_name }}、</span></p>
                                     </div>
                                 </div>
                             </div>
@@ -174,15 +174,15 @@
                                 <div class="callingTop" style="margin-bottom:10px;">
                                     <div class="callingTopTip newCallingTopTip"><span style="margin: 0 auto;">正在<br />叫号</span></div>
                                     <div class="callingContent newCallingContent">
-                                        <p style="margin:50px 0 14px;"><span v-for="(item,index) in upPatientList.slice(0,3)" :key="index">{{ item.patient_name }}、</span></p>
-                                        <p><span v-for="(item,index) in upPatientList.slice(3,6)" :key="index">{{ item.patient_name }}、</span></p>
+                                        <p style="margin:50px 0 14px;"><span v-for="(item,index) in (upPatientList || '').slice(0,3)" :key="index">{{ item.patient_name }}、</span></p>
+                                        <p><span v-for="(item,index) in (upPatientList || '').slice(3,6)" :key="index">{{ item.patient_name }}、</span></p>
                                     </div>
                                 </div>
                                 <div class="callingTop" style="border-radius: 0 0 15px 0;">
                                     <div class="callingTopTip newCallingTopTip"><span style="margin: 0 auto;">等待<br />叫号</span></div>
                                     <div class="callingContent newCallingContent">
-                                        <p style="margin:50px 0 14px;"><span v-for="(item,index) in receivingPatient.slice(0,3)" :key="index">{{ item.patient_name }}、</span></p>
-                                        <p><span v-for="(item,index) in receivingPatient.slice(3,6)" :key="index">{{ item.patient_name }}、</span></p>
+                                        <p style="margin:50px 0 14px;"><span v-for="(item,index) in (receivingPatient || '').slice(0,3)" :key="index">{{ item.patient_name }}、</span></p>
+                                        <p><span v-for="(item,index) in (receivingPatient || '').slice(3,6)" :key="index">{{ item.patient_name }}、</span></p>
                                     </div>
                                 </div>
                             </div>