Sfoglia il codice sorgente

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

28169 11 mesi fa
parent
commit
ddf6450c47

+ 2 - 1
src/xt_pages/outpatientCharges/allListTemplate/printOne.vue Vedi File

@@ -7,7 +7,8 @@
7 7
         <div>透析号:{{ patient.dialysis_no }}</div>
8 8
         <div>性别:{{ patient.gender == 1 ? '男' : '女' }}</div>
9 9
         <div>年龄:{{ patient.age }} 岁</div>
10
-        <div v-if="$store.getters.xt_user.org_id  == 10644">开方日期:{{ gettime(order.setl_time) }}
10
+        <div v-if="$store.getters.xt_user.org_id  == 10644 || 
11
+              $store.getters.xt_user.org_id  == 0">开方日期:{{ getTimes(order.settle_accounts_date) }}
11 12
           <!-- {{ hospital.in_hosptial_time }} 至
12 13
           {{ hospital.out_hosptial_time }} -->
13 14
         </div>

+ 9 - 9
src/xt_pages/outpatientCharges/invoiceTemplate/printtwelve.vue Vedi File

@@ -1,14 +1,14 @@
1 1
 <template>
2 2
   <div id='invoice-print' style="position: relative;">
3 3
     <div>
4
-      <div style="position: absolute;top:60px;left:30px">
4
+      <div style="position: absolute;top:50px;left:30px">
5 5
         阜阳经沃血液透析中心
6 6
       </div>
7 7
       <div style="display: flex;">
8
-        <div :style="{position: 'absolute',top:'80px',left:'30px'}">
8
+        <div :style="{position: 'absolute',top:'70px',left:'30px'}">
9 9
           {{paramsObj.name}}
10 10
         </div>
11
-        <div :style="{position: 'absolute',top:'80px',left:'200px'}">
11
+        <div :style="{position: 'absolute',top:'70px',left:'200px'}">
12 12
           {{list.order.fa_piao_number}}
13 13
         </div>
14 14
       </div>
@@ -19,7 +19,7 @@
19 19
         <div :style="{position: 'absolute',top:'100px',left:'190px'}">
20 20
           
21 21
         </div>
22
-        <div :style="{position: 'absolute',top:'100px',left:'300px'}">
22
+        <div :style="{position: 'absolute',top:'90px',left:'300px'}">
23 23
         {{printDate}}
24 24
         </div>
25 25
       </div>
@@ -62,12 +62,12 @@
62 62
       </div>
63 63
     <!--金额 -->
64 64
     <div style="display: flex;">
65
-      <div :style="{position: 'absolute',top:'310px',left:'146px',}">{{list.order.medfee_sumamt}}</div>
66
-      <div :style="{position: 'absolute',top:'310px',left:'270px'}">个人支付:{{list.order.psn_cash_pay}}</div>
65
+      <div :style="{position: 'absolute',top:'300px',left:'146px',}">{{list.order.medfee_sumamt}}</div>
66
+      <div :style="{position: 'absolute',top:'300px',left:'270px'}">个人支付:{{list.order.psn_cash_pay}}</div>
67 67
     </div>
68
-    <div :style="{position: 'absolute',top:'330px',left:'190px'}">{{zhongwen}}</div>
69
-    <div :style="{position: 'absolute',top:'350px',left:'190px'}">{{'统筹支付:' + list.order.hifp_pay}}</div>
70
-    <div :style="{position: 'absolute',top:'370px',left:'300px'}">{{list.order.acct_pay}}</div>
68
+    <div :style="{position: 'absolute',top:'320px',left:'190px'}">{{zhongwen}}</div>
69
+    <div :style="{position: 'absolute',top:'340px',left:'190px'}">{{'统筹支付:' + list.order.hifp_pay}}</div>
70
+    <div :style="{position: 'absolute',top:'360px',left:'300px'}">{{list.order.acct_pay}}</div>
71 71
     <div style="display: flex;">
72 72
       <div :style="{position: 'absolute',top:'390px',left:'106px'}">{{list.admin_user_name}}</div>
73 73
       <div :style="{position: 'absolute',top:'390px',left:'300px'}">{{list.order_number}}</div>

+ 1 - 1
src/xt_pages/outpatientCharges/statementPrint.vue Vedi File

@@ -30,7 +30,7 @@
30 30
           :info="info"
31 31
           :paramsObj="paramsObj"
32 32
           :balanceAccounts="balanceAccounts"
33
-          v-if="org_id == 10138 || org_id == 10278 || org_id ==10610 || org_id==10537"
33
+          v-if="org_id == 10138 || org_id == 10278 || org_id ==10610 || org_id==10537 || org_id == 0"
34 34
         ></printThree>
35 35
         <printFour
36 36
           v-if="org_id == 9504 || org_id == 10028 || org_id == 10088 || org_id == 0"

+ 1 - 0
src/xt_pages/outpatientCharges/statementTemplate/printfivetheen.vue Vedi File

@@ -445,6 +445,7 @@
445 445
   </div>
446 446
 </template>
447 447
 <script>
448
+ import { uParseTime } from '@/utils/tools'
448 449
   export default {
449 450
     props: {
450 451
       info: {