Browse Source

新功能

test_user 2 years ago
parent
commit
4149e27a10

+ 4 - 4
src/xt_pages/outpatientCharges/listPrint.vue View File

@@ -14,11 +14,11 @@
14 14
     </template>
15 15
 
16 16
     <div class='dialysisPage' style="padding-top:40px;">
17
-      <printOne v-if="org_id != 0 && org_id != 10106&&org_id != 10215&&org_id != 10265 && org_id!=9675" :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
17
+      <printOne v-if=" org_id != 10106&&org_id != 10215&&org_id != 10265 && org_id!=9675" :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
18 18
       <printTwo v-if="org_id == 10106 && this.paramsObj.balance_accounts_type != 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></printTwo>
19 19
       <print-three v-if="org_id == 10106 && this.paramsObj.balance_accounts_type == 2" :info="info" :order_infos="order_infos" :p_admin="p_admin" :charge_admin="charge_admin"></print-three>
20 20
 <!--      <list-print-two v-if="org_id == 10215 || org_id==9675" :list="list" :patient="patient" :order="order" :admin="admin"></list-print-two>-->
21
-     <list-print-three v-if="org_id == 0 || org_id == 10215 || org_id==9675" :list="list" :patient="patient" :order="order" :admin="admin"></list-print-three>
21
+     <list-print-three v-if="org_id == 10215 || org_id==9675" :list="list" :patient="patient" :order="order" :admin="admin"></list-print-three>
22 22
       <print-two10265  v-if="org_id == 10265  " :list="list" :patient="patient" :order="order" :admin="admin" :hospital_record="hospital_record"></print-two10265>
23 23
     </div>
24 24
   </div>
@@ -576,7 +576,7 @@
576 576
 
577 577
       printThisPage() {
578 578
         if(this.org_id != 10106){
579
-          if(this.org_id == 10215 || this.org_id == 0|| this.org_id == 9675){
579
+          if(this.org_id == 10215 || this.org_id == 9675){
580 580
             const style =
581 581
               '@media print {.allListTitle{font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.allListInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .listTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;}  .listTable tr td {padding: 0 5px;}.tableBottom{font-size: 16px;display: flex;margin-top: 10px;}.tableBottomOne{margin-right: 40px;} .allListTable{border: none;width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;} .allListTable tr{page-break-inside:avoid;} .allListTable tr td {padding: 0 5px;border: 1px solid #000;}.tableBottom{font-size: 16px;display: flex;margin-top: 20px;}.tableBottomOne{margin-right: 40px;}}'
582 582
             printJS({
@@ -589,7 +589,7 @@
589 589
 
590 590
           }else {
591 591
             const style =
592
-              '@media print {.listTitle{font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.listInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .listTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;}.listTable tr td {padding: 0 5px;}.tableBottom{font-size: 16px;display: flex;margin-top: 10px;}.tableBottomOne{margin-right: 40px;}}'
592
+              '@media print {.listTitle{font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.listInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .listTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;}.listTable tr td {padding: 0 5px;}.tableBottom{font-size: 12px;display: flex;margin-top: 10px;}.tableBottomOne{margin-right: 20px;}}'
593 593
             printJS({
594 594
               printable: 'list-print',
595 595
               type: 'html',

+ 18 - 10
src/xt_pages/outpatientCharges/listTemplate/printOne.vue View File

@@ -5,8 +5,10 @@
5 5
         <div class="listInfo">
6 6
 
7 7
             <div>患者姓名:{{patient.name}}</div>
8
-            <div>透析号:{{patient.dialysis_no}}</div>
9
-            <div>性别:{{patient.gender == 1 ? '男': '女'}}</div>
8
+            <div v-if="$store.getters.xt_user.org.id != 10191">透析号:{{patient.dialysis_no}}</div>
9
+          <div v-if="$store.getters.xt_user.org.id == 10191">身份证号:{{patient.id_card_no}}</div>
10
+
11
+          <div>性别:{{patient.gender == 1 ? '男': '女'}}</div>
10 12
             <div>年龄:{{patient.age}}  岁</div>
11 13
             <div v-if="order.settle_type == 1">收费日期:{{getTimes(order.settle_accounts_date)}}</div>
12 14
             <div v-if="order.settle_type == 2">收费日期:{{getTimes(order.settle_start_time)}} 至 {{getTimes(order.settle_end_time)}}</div>
@@ -39,6 +41,12 @@
39 41
             <div class="tableBottomOne">制表人:{{admin.user_name}}</div>
40 42
             <div class="tableBottomOne">制表日期:{{ getNowTime()}}</div>
41 43
             <div class="tableBottomOne">总费用:{{order.medfee_sumamt}}元</div>
44
+          <div class="tableBottomOne">基金总额:{{order.fund_pay_sumamt}}元</div>
45
+          <div class="tableBottomOne">统筹支付:{{order.hifp_pay}}元</div>
46
+          <div class="tableBottomOne">医疗救助:{{order.maf_pay}}元</div>
47
+          <div class="tableBottomOne">医保报销:{{order.fund_pay_sumamt}}元</div>
48
+          <div class="tableBottomOne">个人支付:{{order.psn_cash_pay}}元</div>
49
+
42 50
         </div>
43 51
         </div>
44 52
     </div>
@@ -94,21 +102,21 @@
94 102
         let ss = new Date().getSeconds() < 10 ? '0' + new Date().getSeconds()
95 103
           :
96 104
           new Date().getSeconds()
97
-        dateTime = yy + '-' + mm + '-' + dd + ' ' + hh + ':' + mf + ':' + ss
105
+        dateTime = yy + '-' + mm + '-' + dd
98 106
         return dateTime
99 107
       },
100 108
       getTimes(time) {
101 109
         return uParseTime(time, '{y}-{m}-{d}')
102 110
       },
103 111
       getPage(){
104
-        if(this.list.length <= 13){
112
+        if(this.list.length <= 15){
105 113
             this.page = 1
106 114
             this.pageArr.push(this.list.length)
107
-        }else if(this.list.length > 13){
108
-            this.page = parseInt(this.list.length / 13)
109
-            let num = this.list.length % 13
115
+        }else if(this.list.length > 15){
116
+            this.page = parseInt(this.list.length / 15)
117
+            let num = this.list.length % 15
110 118
             for (var i=0;i<this.page;i++){
111
-                this.pageArr.push(13)
119
+                this.pageArr.push(15)
112 120
             }
113 121
             if(num != 0){
114 122
                 this.pageArr.push(num)
@@ -164,11 +172,11 @@
164 172
     padding: 0 5px;
165 173
 }
166 174
 .tableBottom{
167
-    font-size: 16px;
175
+    font-size: 12px;
168 176
     display: flex;
169 177
     margin-top: 20px;
170 178
 }
171 179
 .tableBottomOne{
172
-    margin-right: 40px;
180
+    margin-right: 20px;
173 181
 }
174 182
 </style>

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

@@ -110,7 +110,7 @@
110 110
             <div>费用总计:{{info.medfee_sumamt}}</div>
111 111
             <div>统筹支付:{{info.fund_pay_sumamt}}</div>
112 112
             <div>账户支付:{{info.acct_pay}}</div>
113
-            <div>个人现金支付:{{info.cash_payamt}}</div>
113
+            <div>个人现金支付:{{info.new_order.psn_cash_pay}}</div>
114 114
             <div>其他支付:{{info.oth_pay}}</div>
115 115
             <div>减免金额:</div>
116 116
           </td>