1

src/xt_pages/outpatientCharges/summary.vue

@@ -40,11 +40,7 @@
           <!--<el-radio v-model="radio" label="2">汇总</el-radio>-->
         </div>
         <div>
-<<<<<<< HEAD
           <el-popover
-=======
-        <el-popover
->>>>>>> d3b7e304402742c1d1973613d211171842d623fe
             placement="bottom"
             width="210"
             trigger="click">
@@ -126,7 +122,6 @@
       <!--<statementPrint ref="print" :paramsObj='orderObj'></statementPrint>-->
     <new-statement-print ref="print" :paramsObj='orderObj'></new-statement-print>
     </el-dialog>
-<<<<<<< HEAD
     <el-dialog
       class="centerDialog"
       width="900px"
@@ -141,9 +136,6 @@
       :visible.sync="allListVisible">
       <allListPrint :paramsObj='paramsObj'></allListPrint>
     </el-dialog>
-=======
-
->>>>>>> d3b7e304402742c1d1973613d211171842d623fe
 
 
   </div>