Преглед изворни кода

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

csx пре 2 година
родитељ
комит
0056ed2da1

+ 39 - 18
src/xt_pages/hospitalStation/settlementTemplate/hospitalSettlePrint.vue Прегледај датотеку

@@ -555,8 +555,8 @@
555 555
               <tr>
556 556
                 <td>床位费</td>
557 557
                 <td>&nbsp;{{info.bed_cost_total?info.bed_cost_total:''}}</td>
558
-                <td>&nbsp;</td>
559
-                <td>&nbsp;</td>
558
+                <td>&nbsp;getJiaTotal('床位费')</td>
559
+                <td>&nbsp;getYiTotal('床位费')</td>
560 560
                 <td>&nbsp;{{info.bed_cost_self_total?info.bed_cost_self_total:''}}</td>
561 561
                 <td>&nbsp;</td>
562 562
               </tr>
@@ -571,32 +571,32 @@
571 571
               <tr>
572 572
                 <td>检查费</td>
573 573
                 <td>&nbsp;{{info.check_cost_total?info.check_cost_total:''}}</td>
574
-                <td>&nbsp;</td>
575
-                <td>&nbsp;</td>
574
+                <td>&nbsp;getJiaTotal('检查费')</td>
575
+                <td>&nbsp;getYiTotal('检查费')</td>
576 576
                 <td>&nbsp;{{info.check_cost_self_total?info.check_cost_self_total:""}}</td>
577 577
                 <td>&nbsp;</td>
578 578
               </tr>
579 579
               <tr>
580 580
                 <td>化验费</td>
581 581
                 <td>&nbsp;{{info.laboratory_cost_total?info.laboratory_cost_total:''}}</td>
582
-                <td>&nbsp;</td>
583
-                <td>&nbsp;</td>
582
+                <td>&nbsp;getJiaTotal('化验费')</td>
583
+                <td>&nbsp;getYiTotal('化验费')</td>
584 584
                 <td>&nbsp;{{info.laboratory_cost_self_total?info.laboratory_cost_self_total:''}}</td>
585 585
                 <td>&nbsp;</td>
586 586
               </tr>
587 587
               <tr>
588 588
                 <td>治疗费</td>
589 589
                 <td>&nbsp;{{info.treat_cost_total?info.treat_cost_total:''}}</td>
590
-                <td>&nbsp;</td>
591
-                <td>&nbsp;</td>
590
+                <td>&nbsp;getJiaTotal('治疗费')</td>
591
+                <td>&nbsp;getYiTotal('治疗费')</td>
592 592
                 <td>&nbsp;{{info.treat_cost_self_total?info.treat_cost_self_total:''}}</td>
593 593
                 <td>&nbsp;</td>
594 594
               </tr>
595 595
               <tr>
596 596
                 <td>手术费</td>
597 597
                 <td>&nbsp;{{info.operation_cost_total?info.operation_cost_total:''}}</td>
598
-                <td>&nbsp;</td>
599
-                <td>&nbsp;</td>
598
+                <td>&nbsp;getJiaTotal('手术费')</td>
599
+                <td>&nbsp;getYiTotal('手术费')</td>
600 600
                 <td>&nbsp;{{info.operation_cost_self_total?info.operation_cost_self_total:""}}</td>
601 601
                 <td>&nbsp;</td>
602 602
               </tr>
@@ -611,16 +611,16 @@
611 611
               <tr>
612 612
                 <td>卫生材料费</td>
613 613
                 <td>&nbsp;{{info.material_cost_total?info.material_cost_total:""}}</td>
614
-                <td>&nbsp;</td>
615
-                <td>&nbsp;</td>
614
+                <td>&nbsp;getJiaTotal('卫生材料费')</td>
615
+                <td>&nbsp;getYiTotal('卫生材料费')</td>
616 616
                 <td>&nbsp;{{info.material_cost_self_total?info.material_cost_self_total:""}}</td>
617 617
                 <td>&nbsp;</td>
618 618
               </tr>
619 619
               <tr>
620 620
                 <td>西药费</td>
621 621
                 <td>&nbsp;{{info.western_medicine_cost_total?info.western_medicine_cost_total:""}}</td>
622
-                <td>&nbsp;</td>
623
-                <td>&nbsp;</td>
622
+                <td>&nbsp;getJiaTotal('西药费')</td>
623
+                <td>&nbsp;getYiTotal('西药费')</td>
624 624
                 <td>&nbsp;{{info.western_medicine_cost_self_total?info.western_medicine_cost_self_total:""}}</td>
625 625
                 <td>&nbsp;</td>
626 626
               </tr>
@@ -635,8 +635,8 @@
635 635
               <tr>
636 636
                 <td>中成药费</td>
637 637
                 <td>&nbsp;{{info.chinese_traditional_medicine_cost_total?info.chinese_traditional_medicine_cost_total:""}}</td>
638
-                <td>&nbsp;</td>
639
-                <td>&nbsp;</td>
638
+                <td>&nbsp;getJiaTotal('中成药费')</td>
639
+                <td>&nbsp;getYiTotal('中成药费')</td>
640 640
                 <td>&nbsp;{{info.chinese_traditional_medicine_cost_self_total?info.chinese_traditional_medicine_cost_self_total:""}}</td>
641 641
                 <td>&nbsp;</td>
642 642
               </tr>
@@ -659,8 +659,8 @@
659 659
               <tr>
660 660
                 <td>其他费</td>
661 661
                 <td>&nbsp;{{info.other_cost_total?info.other_cost_total:""}}</td>
662
-                <td>&nbsp;</td>
663
-                <td>&nbsp;</td>
662
+                <td>&nbsp;getJiaTotal('其他费')</td>
663
+                <td>&nbsp;getYiTotal('其他费')</td>
664 664
                 <td>&nbsp;{{info.other_cost_self_total?info.other_cost_self_total:""}}</td>
665 665
                 <td>&nbsp;</td>
666 666
               </tr>
@@ -829,6 +829,27 @@ export default {
829 829
     }
830 830
   },
831 831
   methods:{
832
+    getJiaTotal(name){
833
+      let total = 0.00
834
+      for(let i = 0; i  < this.list.length; i++){
835
+        if(name == this.list[i].med_chrgitm_name){
836
+          total = this.list[i].jiaTotal
837
+
838
+        }
839
+      }
840
+      return total
841
+    },
842
+    getYiTotal(name){
843
+      let total = 0.00
844
+      for(let i = 0; i  < this.list.length; i++){
845
+        if(name == this.list[i].med_chrgitm_name){
846
+          total = this.list[i].yiTotal
847
+
848
+        }
849
+      }
850
+      return total
851
+
852
+    },
832 853
     getNaty(naty){
833 854
       switch (naty){
834 855
         case "1":

+ 40 - 0
src/xt_pages/hospitalStation/statementPrint.vue Прегледај датотеку

@@ -287,6 +287,46 @@ export default {
287 287
             that.info['order_infos'] = response.data.data.order_infos
288 288
             that.info['diagnosis'] = response.data.data.diagnosis
289 289
 
290
+            //获取所有项目类型进行去重
291
+            let med_chrgitm_types = []
292
+            for (let i = 0; i < response.data.data.order_infos.length; i++) {
293
+              med_chrgitm_types.push(response.data.data.order_infos[i].med_chrgitm_type)
294
+            }
295
+            const obj = {}
296
+            med_chrgitm_types = med_chrgitm_types.reduce((cur, next) => {
297
+              obj[next] ? '' : obj[next] = true && cur.push(next)
298
+              return cur
299
+            }, []) // 设置cur默认类型为数组,并且初始值为空的数组
300
+            let tempOrderInfo = []
301
+            for (let i = 0; i < med_chrgitm_types.length; i++) {
302
+              let obj = {
303
+                details: [],
304
+                med_chrgitm_name: this.getType(med_chrgitm_types[i]),
305
+                jiaTotal: 0,
306
+                total: 0,
307
+                yiTotal: 0,
308
+                noMedicineTotal: 0,
309
+                bingTotal: 0,
310
+                otherTotal: 0,
311
+              }
312
+
313
+              let tempDetails = []
314
+              for (let b = 0; b < response.data.data.order_infos.length; b++) {
315
+                if (med_chrgitm_types[i] == response.data.data.order_infos[b].med_chrgitm_type) {
316
+                  tempDetails.push(response.data.data.order_info[b])
317
+                }
318
+              }
319
+              obj.total = this.getTotal(tempDetails)
320
+              obj.jiaTotal = this.getJiaTotal(tempDetails)
321
+              obj.yiTotal = this.getYiTotal(tempDetails)
322
+              obj.noMedicineTotal = this.getNoMedicineTotal(tempDetails)
323
+              obj.bingTotal = this.getBingTotal(tempDetails)
324
+              obj.otherTotal = this.getOtherTotal(tempDetails)
325
+
326
+              obj.details = this.setNewData(tempDetails)
327
+              this.list.push(obj)
328
+
329
+            }
290 330
           }
291 331
         })
292 332
 

+ 4 - 4
src/xt_pages/outpatientCharges/listTemplate/printTwo10265.vue Прегледај датотеку

@@ -38,7 +38,7 @@
38 38
       >
39 39
         <tr style="border: 1px solid" >
40 40
           <td style="width: 19%">账单名称:{{item.med_chrgitm_name}}</td>
41
-          <td style="width: 25%">费用名称</td>
41
+          <td style="width: 21%">费用名称</td>
42 42
           <td style="width: 14%">规格</td>
43 43
           <td style="width: 10%">类别</td>
44 44
           <td style="width: 10%">单价(元)</td>
@@ -46,8 +46,8 @@
46 46
           <td style="width: 20%">金额(元)</td>
47 47
         </tr>
48 48
         <tr v-for="subItem in item.details">
49
-          <td style="width: 20%">{{subItem.name}}</td>
50
-          <td style="width: 25%"></td>
49
+          <td style="width: 19%">{{subItem.name}}</td>
50
+          <td style="width: 21%"></td>
51 51
           <td style="width: 14%">{{ subItem.spec }}</td>
52 52
           <td style="width: 10%">{{ subItem.medicine_insurance_kind }}</td>
53 53
           <td style="width: 10%">{{ subItem.price.toFixed(2) }}</td>
@@ -61,8 +61,8 @@
61 61
           <td style="width: 5%">非药品:{{0.00}}</td>
62 62
           <td style="width: 5%">丙类:{{item.bingTotal}}</td>
63 63
           <td style="width: 5%">其他:{{0.00}}</td>
64
-          <td style="width: 20%">小计:{{item.total}}</td>
65 64
           <td></td>
65
+          <td style="width: 20%">小计:{{item.total}}</td>
66 66
 
67 67
         </tr>
68 68
       </table>