搜索

src/xt_pages/dialysis/template/DialysisPrintOrderSeven.vue

@@ -28,7 +28,6 @@
             </td>
           </tr>
           <tr>
-<<<<<<< HEAD
             <td style="text-align:left;">
               <span style="display:inline-block;margin-left:15px;"
                 >上机前病情</span
@@ -56,7 +55,6 @@
               </div>
             </td>
           </tr>
-=======
             <td style="text-align:left;"><span style="display:inline-block;margin-left:15px;">上机前病情</span>：<div style="display:inline-block;">
                     <label-box :isChecked='receiverTreatmentAccess.way==1?true:false' showValue='步行'></label-box>
                     &nbsp;
@@ -66,8 +64,7 @@
                     &nbsp;
                     <label-box :isChecked='receiverTreatmentAccess.way==4?true:false' showValue='平车'></label-box>
                   </div></td>
-          </tr>  
->>>>>>> 62fe3df8139e458f8ec02667f4fdba291e5fb132
+          </tr>
         </tbody>
       </table>
       <table class="print-table" style="margin-top: 10px;" border="2">