|
@@ -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 {
|