yq1 1 year ago
parent
commit
e1281f3267

+ 3 - 1
src/xt_pages/outpatientCharges/components/prescriptionTable.vue View File

@@ -4,13 +4,14 @@
4 4
       v-if="prescription.type == 1"
5 5
       :data="prescription.advices"
6 6
       border
7
+      height="370"
7 8
       style="width: 99%"
8 9
       :row-style="changColor"
9 10
       :header-cell-style="{
10 11
         color: '#606266',
11 12
       }"
12 13
       highlight-current-row
13
-      min-height="200px"
14
+      
14 15
     >
15 16
     <!-- max-height=290px -->
16 17
       <el-table-column
@@ -143,6 +144,7 @@
143 144
       v-if="prescription.type == 2"
144 145
       :data="prescription.project"
145 146
       border
147
+      height="370"
146 148
       style="width: 99%"
147 149
       :row-style="changColor"
148 150
       :header-cell-style="{

+ 8 - 23
src/xt_pages/outpatientCharges/outpatientChargesManagement.vue View File

@@ -198,14 +198,9 @@
198 198
             <el-tab-pane label="日结" name="first">
199 199
               <div style="display:flex;height:100%;">
200 200
                 <div class="centerLeft">
201
-                  <div>
202 201
                     <div class="tabsBox" v-for="items,index in big_prescriptions" :key="index">
203
-                      <div style="height: calc(100% - 60px);">
204
-
205
-
206 202
                         <el-tabs class="preTabs" v-model="editableTabsValue" type="border-card"
207 203
                                  @tab-click="tabclickEvent">
208
-                          <!--<el-radio-group v-model="med_radio">-->
209 204
                           <el-tab-pane
210 205
                             v-for="(item, index) in items.prescriptions"
211 206
                             :key="index"
@@ -245,25 +240,21 @@
245 240
                                   type="primary"
246 241
                                 >撤销明细
247 242
                                 </el-button>
248
-                                <!--<div>{{ items.curPrescriptions.order.order_status}}</div>-->
249
-                                <!--<div>{{ items.prescriptions[0].order.order_status}}</div>-->
250 243
                                 <el-button v-loading="loadingtwo"
251 244
                                            v-if="((hisPatientInfo.id > 0 && items.curPrescriptions.order.id == 0) || items.curPrescriptions.order.order_status == 1 ||  items.curPrescriptions.order.order_status == 3) && org_id != 10340"
252 245
                                            size="small"
253 246
                                            @click="open(4,items.med_type,items.curPrescriptions.order,items.prescriptions)"
254
-                                           type="primary">收费<!--修改的地方-->
247
+                                           type="primary">收费  
255 248
                                 </el-button>
256 249
                               </div>
257 250
                             </div>
258 251
                           </el-tab-pane>
259
-
260
-
261
-                          <prescription-table ref="prescription_tables"
252
+                            <prescription-table ref="prescription_tables"
262 253
                                               :prescription="items.curPrescriptions"
263 254
                                               :manufacturers="manufacturers"></prescription-table>
264
-                          <!--</el-radio-group>-->
255
+                          
265 256
                         </el-tabs>
266
-                      </div>
257
+
267 258
                       <div class="costBox">
268 259
                         <span>当前处方总费用:<span style="color:red;">{{ items.total }}元</span></span>
269 260
 
@@ -326,12 +317,7 @@
326 317
 
327 318
                       </div>
328 319
 
329
-
330 320
                     </div>
331
-                  </div>
332
-
333
-
334
-
335 321
                 </div>
336 322
                 <div class="centerRight">
337 323
                   <p class="centerRightTitle" style="padding-top: 10px;">就诊信息</p>
@@ -5727,9 +5713,8 @@ export default {
5727 5713
 }
5728 5714
 .tabsBox {
5729 5715
   position: relative;
5730
-
5731
-  overflow-y: auto;
5732
-  height: 450px;
5716
+  // overflow-y: auto;
5717
+  height: 560px;
5733 5718
 
5734 5719
 
5735 5720
 .el-tabs__item {
@@ -5763,7 +5748,7 @@ export default {
5763 5748
 
5764 5749
 .centerLeft {
5765 5750
   flex: 1;
5766
-  display: flex;
5751
+  // display: flex;
5767 5752
   flex-direction: column;
5768 5753
   position: relative;
5769 5754
   overflow-y: auto;
@@ -5771,7 +5756,7 @@ export default {
5771 5756
 
5772 5757
 .preTabs {
5773 5758
   height: 100%;
5774
-  display: flex;
5759
+  // display: flex;
5775 5760
   flex-direction: column;
5776 5761
 
5777 5762
 .el-tab-pane {

+ 1 - 1
src/xt_pages/outpatientCharges/statementTemplate/printeEleven.vue View File

@@ -107,7 +107,7 @@
107 107
           <td colspan="2" >医院盖章:</td>
108 108
         </tr>
109 109
         <tr>
110
-          <td colspan="8" style="padding-top: 20px;">医师签名:</td>
110
+          <td colspan="8" style="padding-top: 40px;">医师签名:</td>
111 111
         </tr>
112 112
       </table>
113 113
     </div>