浏览代码

Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

csx 3 年前
父节点
当前提交
36b4f0a123

+ 1 - 1
src/xt_pages/dialysis/template/DialysisPrintOrderTwentyNine.vue 查看文件

@@ -246,7 +246,7 @@
246 246
                         <td width="30"></td>
247 247
                         <td width='70'>体重增加:</td>
248 248
                         <td width="50">
249
-                            <div class="under-line">&nbsp;{{ afterdialysis.weight_after ? afterdialysis.weight_after : "" }}</div>
249
+                            <div class="under-line">&nbsp;{{ (predialysis.weight_before - assessmentafter.weight_after).toFixed(1) }}</div>
250 250
                         </td>
251 251
                         <td width="10">Kg</td>
252 252
                         <td width="30"></td>

+ 3 - 1
src/xt_pages/outpatientCharges/newTreatTemplate/printTwo.vue 查看文件

@@ -102,7 +102,8 @@
102 102
       }
103 103
     },
104 104
     props: {
105
-      paramsObj: Object
105
+      paramsObj: Object,
106
+      info: Object
106 107
     },
107 108
     methods: {
108 109
       getName(list) {
@@ -315,6 +316,7 @@
315 316
     mounted() {
316 317
       this.org_id = this.$store.getters.xt_user.org_id
317 318
       if (this.org_id == 9504 || this.org_id == 10028 || this.org_id == 10138) {
319
+        var xtuser = this.$store.getters.xt_user
318 320
         this.orgname = xtuser.org.org_name
319 321
         var form = {
320 322
           'order_id': this.paramsObj.order_id,

+ 112 - 99
src/xt_pages/outpatientCharges/outpatientChargesManagement.vue 查看文件

@@ -170,21 +170,23 @@
170 170
                         <el-tab-pane label="日结" name="first">
171 171
                             <div style="display:flex;height:100%;">
172 172
                                 <div class="centerLeft">
173
+                                  <div>
173 174
                                     <div class="tabsBox" v-for="items,index in big_prescriptions" :key="index">
175
+                                      <div style="height: calc(100% - 60px);">
174 176
 
175 177
 
176 178
 
177 179
 
178
-                                        <el-tabs class="preTabs" v-model="editableTabsValue" type="border-card"
179
-                                                 @tab-click="tabclickEvent">
180
-                                            <!--<el-radio-group v-model="med_radio">-->
181
-                                            <el-tab-pane
182
-                                                    v-for="(item, index) in items.prescriptions"
183
-                                                    :key="index"
184
-                                                    :label="item.name"
185
-                                                    :name="item.name"
186
-                                            >
187
-                                            </el-tab-pane>
180
+                                          <el-tabs class="preTabs" v-model="editableTabsValue" type="border-card"
181
+                                                  @tab-click="tabclickEvent">
182
+                                              <!--<el-radio-group v-model="med_radio">-->
183
+                                              <el-tab-pane
184
+                                                      v-for="(item, index) in items.prescriptions"
185
+                                                      :key="index"
186
+                                                      :label="item.name"
187
+                                                      :name="item.name"
188
+                                              >
189
+                                              </el-tab-pane>
188 190
 
189 191
                                             <div style="margin-bottom:10px;float: right">
190 192
 
@@ -250,7 +252,7 @@
250 252
                                                                 :prescription="items.curPrescriptions"></prescription-table>
251 253
                                             <!--</el-radio-group>-->
252 254
                                         </el-tabs>
253
-
255
+                                      </div>
254 256
                                         <div class="costBox">
255 257
                                             <span>当前处方总费用:<span style="color:red;">{{items.total}}元</span></span>
256 258
                                             <!--<span>总费用:<span style="color:red;">{{ items.curPrescriptions.order.medfee_sumamt ?  items.curPrescriptions.order.medfee_sumamt:getTotalFour(items.prescriptions)?getTotalFour(items.prescriptions):'' }}元</span></span>-->
@@ -271,6 +273,7 @@
271 273
                                             <span v-if="items.curPrescriptions.order_status  == 3">已退费</span>
272 274
                                         </div>
273 275
                                     </div>
276
+                                  </div>
274 277
 
275 278
 
276 279
                                 </div>
@@ -388,44 +391,46 @@
388 391
                                                 value-format="yyyy-MM-dd">
389 392
                                         </el-date-picker>
390 393
                                     </div>
391
-                                    <div class="tabsBox" v-for="items, index in big_month_prescriptions">
392
-
393
-                                        <!--<el-radio v-model="month_check" label="11" style="margin:10px 0;"-->
394
-                                        <!--v-if="items.med_type == 11">{{'普通门诊处方'}}-->
395
-                                        <!--</el-radio>-->
396
-                                        <!--<el-radio v-model="month_check" label="12" style="margin:10px 0;"-->
397
-                                        <!--v-if="items.med_type == 12">{{'门诊挂号'}}-->
398
-                                        <!--</el-radio>-->
399
-                                        <!--<el-radio v-model="month_check" label="13" style="margin:10px 0;"-->
400
-                                        <!--v-if="items.med_type == 13">{{'急诊'}}-->
401
-                                        <!--</el-radio>-->
402
-                                        <!--<el-radio v-model="month_check" label="14" style="margin:10px 0;"-->
403
-                                        <!--v-if="items.med_type == 14">{{'门诊特殊病'}}-->
404
-                                        <!--</el-radio>-->
405
-                                        <!--<el-radio v-model="month_check" label="15" style="margin:10px 0;"-->
406
-                                        <!--v-if="items.med_type == 15">{{'门诊统筹'}}-->
407
-                                        <!--</el-radio>-->
408
-                                        <!--<el-radio v-model="month_check" label="16" style="margin:10px 0;"-->
409
-                                        <!--v-if="items.med_type == 16">{{'门诊慢性病'}}-->
410
-                                        <!--</el-radio>-->
411
-                                        <!--<el-radio v-model="month_check" label="21" style="margin:10px 0;"-->
412
-                                        <!--v-if="items.med_type == 21">{{'普通住院'}}-->
413
-                                        <!--</el-radio>-->
414
-
415
-                                        <!-- <el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button> -->
416
-                                        <el-tabs class="preTabs" v-model="editableTabsValue" type="border-card"
417
-                                                 @tab-click="tabclickEventTwo">
418
-
419
-                                            <el-tab-pane
420
-                                                    v-for="(item, index) in items.month_prescriptions"
421
-                                                    :key="index"
422
-                                                    :label="item.name"
423
-                                                    :name="item.name">
424
-
425
-
426
-                                            </el-tab-pane>
427
-                                            <div style="margin-bottom:10px;float: right">
428
-                                                <div v-if="org_id == 9504 || org_id == 10028 || org_id == 10138">
394
+                                    <div>
395
+                                      <div class="tabsBox" v-for="items, index in big_month_prescriptions">
396
+                                        <div  style="height: calc(100% - 60px);">
397
+
398
+                                            <!--<el-radio v-model="month_check" label="11" style="margin:10px 0;"-->
399
+                                            <!--v-if="items.med_type == 11">{{'普通门诊处方'}}-->
400
+                                            <!--</el-radio>-->
401
+                                            <!--<el-radio v-model="month_check" label="12" style="margin:10px 0;"-->
402
+                                            <!--v-if="items.med_type == 12">{{'门诊挂号'}}-->
403
+                                            <!--</el-radio>-->
404
+                                            <!--<el-radio v-model="month_check" label="13" style="margin:10px 0;"-->
405
+                                            <!--v-if="items.med_type == 13">{{'急诊'}}-->
406
+                                            <!--</el-radio>-->
407
+                                            <!--<el-radio v-model="month_check" label="14" style="margin:10px 0;"-->
408
+                                            <!--v-if="items.med_type == 14">{{'门诊特殊病'}}-->
409
+                                            <!--</el-radio>-->
410
+                                            <!--<el-radio v-model="month_check" label="15" style="margin:10px 0;"-->
411
+                                            <!--v-if="items.med_type == 15">{{'门诊统筹'}}-->
412
+                                            <!--</el-radio>-->
413
+                                            <!--<el-radio v-model="month_check" label="16" style="margin:10px 0;"-->
414
+                                            <!--v-if="items.med_type == 16">{{'门诊慢性病'}}-->
415
+                                            <!--</el-radio>-->
416
+                                            <!--<el-radio v-model="month_check" label="21" style="margin:10px 0;"-->
417
+                                            <!--v-if="items.med_type == 21">{{'普通住院'}}-->
418
+                                            <!--</el-radio>-->
419
+
420
+                                            <!-- <el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button> -->
421
+                                            <el-tabs class="preTabs" v-model="editableTabsValue" type="border-card"
422
+                                                    @tab-click="tabclickEventTwo">
423
+
424
+                                                <el-tab-pane
425
+                                                        v-for="(item, index) in items.month_prescriptions"
426
+                                                        :key="index"
427
+                                                        :label="item.name"
428
+                                                        :name="item.name">
429
+
430
+
431
+                                                </el-tab-pane>
432
+                                                <div style="margin-bottom:10px;float: right">
433
+                                                    <div v-if="org_id == 9504 || org_id == 10028 || org_id == 10138">
429 434
 
430 435
                                                     <el-button
431 436
                                                             v-if="(hisPatientInfo.id > 0 && items.curMonthPrescriptions.order.id == 0) "
@@ -436,61 +441,67 @@
436 441
                                                     >预结算
437 442
                                                     </el-button>
438 443
 
439
-                                                    <el-button
440
-                                                            v-if="order.order_status == 1"
441
-                                                            size="small"
442
-                                                            @click="sz_open(7,items.med_type,items.curMonthPrescriptions.order, items.month_prescriptions)"
443
-                                                            type="primary"
444
-                                                    >撤销明细
445
-                                                    </el-button>
446
-
447
-                                                    <el-button
448
-                                                            v-if="(hisPatientInfo.id > 0 && items.curMonthPrescriptions.order.id == 0) || items.curMonthPrescriptions.order.order_status == 1"
449
-                                                            size="small"
450
-                                                            @click="sz_open(3,items.med_type,items.curMonthPrescriptions.order, items.month_prescriptions)"
451
-                                                            type="primary">收费
452
-                                                    </el-button>
453
-
454
-
444
+                                                        <el-button
445
+                                                                v-if="order.order_status == 1"
446
+                                                                size="small"
447
+                                                                @click="sz_open(7,items.med_type,items.curMonthPrescriptions.order, items.month_prescriptions)"
448
+                                                                type="primary"
449
+                                                        >撤销明细
450
+                                                        </el-button>
451
+
452
+                                                        <el-button
453
+                                                                v-if="(hisPatientInfo.id > 0 && items.curMonthPrescriptions.order.id == 0) || items.curMonthPrescriptions.order.order_status == 1"
454
+                                                                size="small"
455
+                                                                @click="sz_open(3,items.med_type,items.curMonthPrescriptions.order, items.month_prescriptions)"
456
+                                                                type="primary">收费
457
+                                                        </el-button>
458
+
459
+
460
+                                                    </div>
461
+                                                    <div v-if="org_id != 9504 && org_id != 10028 &&org_id != 10138">
462
+
463
+                                                        <!--<el-button-->
464
+                                                                <!--v-if="(hisPatientInfo.id > 0 && items.curMonthPrescriptions.order.id == 0) "-->
465
+                                                                <!--size="small"-->
466
+                                                                <!--@click="open(8,items.med_type,items.curMonthPrescriptions.order)"-->
467
+                                                                <!--type="primary"-->
468
+                                                        <!--&gt;预结算-->
469
+                                                        <!--</el-button>-->
470
+
471
+
472
+                                                        <el-button v-loading="loadingtwo"
473
+                                                                  v-if="(hisPatientInfo.id > 0 && items.curMonthPrescriptions.order.id == 0) || items.curMonthPrescriptions.order.order_status == 1 ||  items.curMonthPrescriptions.order.order_status == 3"
474
+                                                                  size="small"
475
+                                                                  @click="open(4,items.med_type,items.curMonthPrescriptions.order,items.month_prescriptions)"
476
+                                                                  type="primary">收费
477
+                                                        </el-button>
478
+
479
+
480
+                                                        <!--<el-button-->
481
+                                                        <!--v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919  || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 9674   || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990"-->
482
+                                                        <!--size="small" @click="open(11)" type="primary"-->
483
+                                                        <!--&gt;撤销明细-->
484
+                                                        <!--</el-button>-->
485
+
486
+                                                    </div>
455 487
                                                 </div>
456
-                                                <div v-if="org_id != 9504 && org_id != 10028 &&org_id != 10138">
457
-
458
-                                                    <!--<el-button-->
459
-                                                            <!--v-if="(hisPatientInfo.id > 0 && items.curMonthPrescriptions.order.id == 0) "-->
460
-                                                            <!--size="small"-->
461
-                                                            <!--@click="open(8,items.med_type,items.curMonthPrescriptions.order)"-->
462
-                                                            <!--type="primary"-->
463
-                                                    <!--&gt;预结算-->
464
-                                                    <!--</el-button>-->
465 488
 
466
-
467
-                                                    <el-button v-loading="loadingtwo"
468
-                                                               v-if="(hisPatientInfo.id > 0 && items.curMonthPrescriptions.order.id == 0) || items.curMonthPrescriptions.order.order_status == 1 ||  items.curMonthPrescriptions.order.order_status == 3"
469
-                                                               size="small"
470
-                                                               @click="open(4,items.med_type,items.curMonthPrescriptions.order,items.month_prescriptions)"
471
-                                                               type="primary">收费
472
-                                                    </el-button>
489
+                                                <!--<prescription-table :preTableData='preTableData'></prescription-table>-->
490
+                                                <!--<month-prescription-table ref="prescription_tables"-->
491
+                                                <!--:activeType="activeType"  :prescription="curMonthPrescriptions"></month-prescription-table>-->
492
+                                                <charge-month-prescription-table
493
+                                                        :prescription="items.curMonthPrescriptions"></charge-month-prescription-table>
473 494
 
474 495
 
475
-                                                    <!--<el-button-->
476
-                                                    <!--v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919  || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 9674   || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990"-->
477
-                                                    <!--size="small" @click="open(11)" type="primary"-->
478
-                                                    <!--&gt;撤销明细-->
479
-                                                    <!--</el-button>-->
480 496
 
481
-                                                </div>
482
-                                            </div>
483 497
 
484
-                                            <!--<prescription-table :preTableData='preTableData'></prescription-table>-->
485
-                                            <!--<month-prescription-table ref="prescription_tables"-->
486
-                                            <!--:activeType="activeType"  :prescription="curMonthPrescriptions"></month-prescription-table>-->
487
-                                            <charge-month-prescription-table
488
-                                                    :prescription="items.curMonthPrescriptions"></charge-month-prescription-table>
498
+                                            </el-tabs>
489 499
 
490 500
 
491
-                                            <div class="costBox">
492
-                                                <span>当前处方总费用:<span
493
-                                                        style="color:red;">{{ items.month_total }}元</span></span>
501
+                                        </div>
502
+                                        <div class="costBox">
503
+                                          <span>当前处方总费用:<span
504
+                                                  style="color:red;">{{ items.month_total }}元</span></span>
494 505
 
495 506
                                                 <span>医疗费总额:<span style="color:red;">{{ items.curMonthPrescriptions.order.medfee_sumamt ?  items.curMonthPrescriptions.order.medfee_sumamt:getTotalFour(items.month_prescriptions)?getTotalFour(items.month_prescriptions):'' }}元</span></span>
496 507
                                                 <span>基金支付金额:<span style="color:red;">{{ items.curMonthPrescriptions.order.fund_pay_sumamt?items.curMonthPrescriptions.order.fund_pay_sumamt:''}}元</span></span>
@@ -500,7 +511,7 @@
500 511
 
501 512
                                             </div>
502 513
 
503
-                                        </el-tabs>
514
+                                      </div>
504 515
 
505 516
 
506 517
                                     </div>
@@ -4472,9 +4483,10 @@
4472 4483
     }
4473 4484
     .tabsBox {
4474 4485
         position: relative;
4475
-        height: 90%;
4486
+        // height: 90%;
4476 4487
         overflow-y: auto;
4477
-        margin-bottom: 60px;
4488
+        height: 350px;
4489
+        // margin-bottom: 60px;
4478 4490
 
4479 4491
     .el-tabs__item {
4480 4492
         padding: 0 10px;
@@ -4510,6 +4522,7 @@
4510 4522
         display: flex;
4511 4523
         flex-direction: column;
4512 4524
         position: relative;
4525
+        overflow-y: auto;
4513 4526
     }
4514 4527
 
4515 4528
     .preTabs {