see999 4 lat temu
rodzic
commit
bf63e09234
1 zmienionych plików z 0 dodań i 8 usunięć
  1. 0 8
      src/xt_pages/outpatientCharges/summary.vue

+ 0 - 8
src/xt_pages/outpatientCharges/summary.vue Wyświetl plik

40
           <!--<el-radio v-model="radio" label="2">汇总</el-radio>-->
40
           <!--<el-radio v-model="radio" label="2">汇总</el-radio>-->
41
         </div>
41
         </div>
42
         <div>
42
         <div>
43
-<<<<<<< HEAD
44
           <el-popover
43
           <el-popover
45
-=======
46
-        <el-popover
47
->>>>>>> d3b7e304402742c1d1973613d211171842d623fe
48
             placement="bottom"
44
             placement="bottom"
49
             width="210"
45
             width="210"
50
             trigger="click">
46
             trigger="click">
126
       <!--<statementPrint ref="print" :paramsObj='orderObj'></statementPrint>-->
122
       <!--<statementPrint ref="print" :paramsObj='orderObj'></statementPrint>-->
127
     <new-statement-print ref="print" :paramsObj='orderObj'></new-statement-print>
123
     <new-statement-print ref="print" :paramsObj='orderObj'></new-statement-print>
128
     </el-dialog>
124
     </el-dialog>
129
-<<<<<<< HEAD
130
     <el-dialog
125
     <el-dialog
131
       class="centerDialog"
126
       class="centerDialog"
132
       width="900px"
127
       width="900px"
141
       :visible.sync="allListVisible">
136
       :visible.sync="allListVisible">
142
       <allListPrint :paramsObj='paramsObj'></allListPrint>
137
       <allListPrint :paramsObj='paramsObj'></allListPrint>
143
     </el-dialog>
138
     </el-dialog>
144
-=======
145
-
146
->>>>>>> d3b7e304402742c1d1973613d211171842d623fe
147
 
139
 
148
 
140
 
149
   </div>
141
   </div>