Ana Sayfa Keşfet Yardım
Üye Ol Giriş Yap
elizebath
/
elizebeth
şundan çatallanmış csx/Vue_New
İzle 1
Yıldızla 0
Çatalla 0
Kod Sorunlar 0 Değişiklik İstekleri 0 Sürümler 0 Wiki Activity
Kaynağa Gözat

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

XMLWAN 3 yıl önce
ebeveyn
7d529a0292 eaecd04c3e
işleme
8f871cde59
2 değiştirilmiş dosya ile 63 ekleme ve 63 silme
Görünümü Böl Farklılık Durumunu Göster
  1. 3 3
      src/xt_pages/outpatientCharges/invoicePrint.vue
  2. 60 60
      src/xt_pages/outpatientCharges/invoiceTemplate/printFour.vue

+ 3 - 3
src/xt_pages/outpatientCharges/invoicePrint.vue Dosyayı Görüntüle 

@@ -13,12 +13,12 @@
13 13 
     </template>
14 14 
     <div class="app-container" style="padding-top:40px;">
15 15 
         <div class='dialysisPage'>
16 
-          <div v-if="org_id != 10106 && org_id != 10215" >
16 
+          <div v-if="org_id != 10106 && org_id != 10215 && org_id != 4" >
17 17 
             <printOne v-if="org_id != 10088" :paramsObj="invoiceParams"></printOne>
18 18 
             <printThree v-if="org_id == 10088" :paramsObj="invoiceParams"></printThree>
19 19 
           </div>
20 20 
           <printTwo v-if="org_id == 10106" :paramsObj="invoiceParams"></printTwo>
21 
-          <printFour v-if="org_id == 10215" :paramsObj="invoiceParams"></printFour>
21 
+          <printFour v-if="org_id == 10215 || org_id == 4" :paramsObj="invoiceParams"></printFour>
22 22 
         </div>
23 23 
     </div>
24 24 
   </div>
 
@@ -74,7 +74,7 @@ export default {
74 74 
     },
75 75 
     printThisPage() {
76 76 
         const style =
77 
-        '@media print {#invoice-print{font-size:12px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoMain{display: flex;flex-wrap: wrap;padding:0 10px;margin-top:10px;}.infoMain .infoP{width: 33%;}.chargeBox{border: 1px solid #000;}.chargeUl{display:flex;justify-content: space-between;text-align: center;}.chargeUl p{line-height: 1px;}.chargeP{line-height: 1px;padding-bottom:16px;}.moneyBox{display: flex;justify-content: space-between;padding: 0 10px;background: #eeeeee;-webkit-print-color-adjust:exact;-moz-print-color-adjust:exact;-ms-print-color-adjust:exact;print-color-adjust:exact;height: 40px;align-items: center;border:1px solid #000; border-top:none}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar div{width:150px;}}';
77 
+        '@media print {#invoice-print{font-size:14px;}.printTitle{font-size: 22px;text-align: center;font-weight: bold;}.infoMain{display: flex;flex-wrap: wrap;padding:0 10px;margin-top:10px;}.infoMain .infoP{width: 33%;}.chargeBox{border: 1px solid #000;}.chargeUl{display:flex;justify-content: space-between;text-align: center;}.chargeUl p{line-height: 1px;}.chargeP{line-height: 1px;padding-bottom:16px;}.moneyBox{display: flex;justify-content: space-between;padding: 0 10px;background: #eeeeee;-webkit-print-color-adjust:exact;-moz-print-color-adjust:exact;-ms-print-color-adjust:exact;print-color-adjust:exact;height: 40px;align-items: center;border:1px solid #000; border-top:none}.actionBar{display: flex;justify-content: space-between; line-height: 24px;padding:0 10px;}.actionBar div{width:150px;}}';
78 78 
         printJS({
79 79 
             printable: "invoice-print",
80 80 
             type: "html",

+ 60 - 60
src/xt_pages/outpatientCharges/invoiceTemplate/printFour.vue Dosyayı Görüntüle 

@@ -1,141 +1,141 @@
1 1 
 <template>
2 
-    <div id='invoice-print' style="font-size:16px;">
2 
+    <div id='invoice-print' style="font-size:14px;">
3 3 
         <div style="display:flex;">
4 
-            <div style="position: absolute;top:80px;left:70px;">{{ list.order_number }}</div>
4 
+            <div style="position: absolute;top:65px;left:60px;">{{ list.order_number }}</div>
5 5 
             <!-- <div>{{ list.id_card_no }}</div> -->
6 6 
         </div>
7 7 
         <div style="display:flex;justify-content: space-between;">
8 8 
             <!-- <div>{{ list.department_name }}</div> -->
9 
-            <div  style="position: absolute;top:80px;left:320px">{{ list.id_card_no }}</div>
9 
+            <div  style="position: absolute;top:65px;left:280px">{{ list.id_card_no }}</div>
10 10 
             <div></div>
11 11 
         </div>
12 12 
         <div style="display:flex;justify-content: space-between;">
13 13 
             <!-- <div>{{ list.department_name }}</div> -->
14 
-            <div  style="position: absolute;top:110px;left:70px">门诊</div>
14 
+            <div  style="position: absolute;top:85px;left:90px">门诊</div>
15 15 
             <div></div>
16 
-            <div  style="position: absolute;top:110px;left:300px">{{ list.number }}</div>
17 
-            <div  style="position: absolute;left:650px;top:110px;">
16 
+            <div  style="position: absolute;top:85px;left:240px">{{ list.number }}</div>
17 
+            <div  style="position: absolute;left:480px;top:85px;">
18 18 
                 <span>{{ printDate.slice(0,4) }}</span>
19 19 
             </div>
20 
-            <div  style="position: absolute;left:700px;top:110px;">
20 
+            <div  style="position: absolute;left:530px;top:85px;">
21 21 
                 <span>{{ printDate.slice(5,7) }}</span>
22 22 
             </div>
23 
-            <div  style="position: absolute;left:720px;top:110px;">
23 
+            <div  style="position: absolute;left:580px;top:85px;">
24 24 
                 <span>{{ printDate.slice(8,11) }}</span>
25 25 
             </div>
26 26 
         </div>
27 27 
         <div style="display:flex;justify-content: space-between;">
28 
-            <div style="position: absolute;top:130px;left:120px;"> {{ paramsObj.name }}</div>
29 
-            <div style="position: absolute;top:130px;left:240px;">√</div>
28 
+            <div style="position: absolute;top:100px;left:120px;"> {{ paramsObj.name }}</div>
29 
+            <div style="position: absolute;top:100px;left:200px;">√</div>
30 30 
             <!-- <div>{{ list.pay_way }}</div> -->
31 
-            <div style="position: absolute;top:130px;left:620px;">{{ paramsObj.setl_time.split(' ')[0] }}</div>
32 
-            <div style="position: absolute;top:130px;left:720px;">{{ paramsObj.setl_time.split(' ')[0] }}</div>
31 
+            <div style="position: absolute;top:100px;left:400px;">{{ paramsObj.setl_time.split(' ')[0] }}</div>
32 
+            <div style="position: absolute;top:100px;left:580px;">{{ paramsObj.setl_time.split(' ')[0] }}</div>
33 33 
         </div>
34 34 
         <div style="display:flex;justify-content: space-between;">
35 35 
             <!-- <div>{{ paramsObj.gend == 1 ? '男' : '女' }}</div> -->
36 
-            <div v-if="paramsObj.gend == 1" style="position: absolute;top:160px;left:80px;">√</div>
37 
-            <div v-else style="position: absolute;top:160px;left:120px;">√</div>
38 
-            <div style="position: absolute;top:160px;left:340px;">{{ totalPrice - list.psn_cash_money }}</div>
39 
-            <div style="position: absolute;top:160px;left:540px;">{{ list.psn_cash_money }}</div>
40 
-            <div style="position: absolute;top:160px;left:720px;">现金</div>
36 
+            <div v-if="paramsObj.gend == 1" style="position: absolute;top:120px;left:60px;">√</div>
37 
+            <div v-else style="position: absolute;top:120px;left:100px;">√</div>
38 
+            <div style="position: absolute;top:130px;left:260px;">{{ totalPrice - list.psn_cash_money }}</div>
39 
+            <div style="position: absolute;top:130px;left:420px;">{{ list.psn_cash_money }}</div>
40 
+            <div style="position: absolute;top:130px;left:580px;">现金</div>
41 41 
         </div>
42 42 
         <div style="display:flex;justify-content: space-between;">
43 
-            <div style="position: absolute;top:220px;left:40px">西药</div>
44 
-            <div style="position: absolute;top:220px;left:130px">{{ list.westernMedicineCostTotal }}</div>
45 
-            <div style="position: absolute;top:220px;left:240px">检查费</div>
46 
-            <div style="position: absolute;top:220px;left:320px">{{ list.checkCostTotal }}</div>
47 
-            <div style="position: absolute;top:220px;left:440px">治疗费</div>
48 
-            <div style="position: absolute;top:220px;left:540px">{{ list.treatCostTotal }}</div>
49 
-            <div style="position: absolute;top:220px;left:620px">床位费</div>
50 
-            <div style="position: absolute;top:220px;left:720px">{{ list.bedCostTotal }}</div>
43 
+            <div style="position: absolute;top:165px;left:50px">西药</div>
44 
+            <div style="position: absolute;top:165px;left:130px">{{ list.westernMedicineCostTotal }}</div>
45 
+            <div style="position: absolute;top:165px;left:210px">检查费</div>
46 
+            <div style="position: absolute;top:165px;left:280px">{{ list.checkCostTotal }}</div>
47 
+            <div style="position: absolute;top:165px;left:340px">治疗费</div>
48 
+            <div style="position: absolute;top:165px;left:420px">{{ list.treatCostTotal }}</div>
49 
+            <div style="position: absolute;top:165px;left:480px">床位费</div>
50 
+            <div style="position: absolute;top:165px;left:580px">{{ list.bedCostTotal }}</div>
51 51 
         </div>
52 52 
         <div style="display:flex;justify-content: space-between;">
53 
-            <div style="position: absolute;top:250px;left:40px">中成药</div>
54 
-            <div style="position: absolute;top:250px;left:130px">{{ list.chineseTraditionalMedicineCostTotal }}</div>
55 
-            <div style="position: absolute;top:250px;left:240px">化验费</div>
56 
-            <div style="position: absolute;top:250px;left:320px">{{ list.laboratoryCostTotal }}</div>
57 
-            <div style="position: absolute;top:250px;left:440px">手术费</div>
58 
-            <div style="position: absolute;top:250px;left:540px">{{ list.operationCostTotal }}</div>
59 
-            <div style="position: absolute;top:250px;left:620px">其他费</div>
60 
-            <div style="position: absolute;top:250px;left:720px">{{ list.otherCostTotal }}</div>
53 
+            <div style="position: absolute;top:185px;left:50px">中成药</div>
54 
+            <div style="position: absolute;top:185px;left:130px">{{ list.chineseTraditionalMedicineCostTotal }}</div>
55 
+            <div style="position: absolute;top:185px;left:210px">化验费</div>
56 
+            <div style="position: absolute;top:185px;left:280px">{{ list.laboratoryCostTotal }}</div>
57 
+            <div style="position: absolute;top:185px;left:340px">手术费</div>
58 
+            <div style="position: absolute;top:185px;left:420px">{{ list.operationCostTotal }}</div>
59 
+            <div style="position: absolute;top:185px;left:480px">其他费</div>
60 
+            <div style="position: absolute;top:185px;left:580px">{{ list.otherCostTotal }}</div>
61 61 
         </div>
62 62 
         <div style="display:flex;justify-content: space-between;">
63 
-            <div style="position: absolute;top:280px;left:40px"></div>
64 
-            <div style="position: absolute;top:280px;left:130px"></div>
65 
-            <div style="position: absolute;top:280px;left:240px"></div>
66 
-            <div style="position: absolute;top:280px;left:320px"></div>
67 
-            <div style="position: absolute;top:280px;left:440px">材料费</div>
68 
-            <div style="position: absolute;top:280px;left:540px">{{ list.materialCostTotal }}</div>
69 
-            <div style="position: absolute;top:280px;left:620px"></div>
70 
-            <div style="position: absolute;top:280px;left:720px"></div>
63 
+            <div style="position: absolute;top:205px;left:50px"></div>
64 
+            <div style="position: absolute;top:205px;left:130px"></div>
65 
+            <div style="position: absolute;top:205px;left:210px"></div>
66 
+            <div style="position: absolute;top:205px;left:280px"></div>
67 
+            <div style="position: absolute;top:205px;left:340px">材料费</div>
68 
+            <div style="position: absolute;top:205px;left:420px">{{ list.materialCostTotal }}</div>
69 
+            <div style="position: absolute;top:205px;left:480px"></div>
70 
+            <div style="position: absolute;top:205px;left:580px"></div>
71 71 
         </div>
72 72 
         <div style="display:flex;justify-content: space-between;">
73 
-            <div style="position: absolute;top:310px;left:40px"></div>
74 
-            <div style="position: absolute;top:310px;left:130px"></div>
75 
-            <div style="position: absolute;top:310px;left:240px">补收</div>
76 
-            <div style="position: absolute;top:310px;left:320px">{{ list.psn_cash_money }}</div>
77 
-            <div style="position: absolute;top:310px;left:440px"></div>
78 
-            <div style="position: absolute;top:310px;left:540px"></div>
79 
-            <div style="position: absolute;top:310px;left:620px"></div>
80 
-            <div style="position: absolute;top:310px;left:720px"></div>
73 
+            <div style="position: absolute;top:225px;left:50px"></div>
74 
+            <div style="position: absolute;top:225px;left:130px"></div>
75 
+            <div style="position: absolute;top:225px;left:210px"></div>
76 
+            <div style="position: absolute;top:225px;left:280px">{{ list.psn_cash_money }}</div>
77 
+            <div style="position: absolute;top:225px;left:340px"></div>
78 
+            <div style="position: absolute;top:225px;left:420px"></div>
79 
+            <div style="position: absolute;top:225px;left:480px"></div>
80 
+            <div style="position: absolute;top:225px;left:580px"></div>
81 81 
         </div>
82 82 
         <div>
83 83 
             <span>
84 
-            <span  style="position: absolute;top:340px;left:220px">
84 
+            <span  style="position: absolute;top:250px;left:200px">
85 85 
                 <span v-if="zhongwen.indexOf('万') > -1 && zhongwen.indexOf('拾') > -1 && zhongwen.indexOf('拾') == 1">
86 86 
                     {{ zhongwen.substring(0,1) }}
87 87 
                 </span>
88 88 
                 <span v-else>零</span>
89 89 
             </span>
90 
-            <span  style="position: absolute;top:340px;left:260px">
90 
+            <span  style="position: absolute;top:250px;left:230px">
91 91 
                 <span v-if="zhongwen.indexOf('万') > -1">
92 92 
                     {{ zhongwen.substring(zhongwen.indexOf('万') - 1,zhongwen.indexOf('万')) }}
93 93 
                 </span>
94 94 
                 <span v-else>零</span>
95 95 
             </span>
96 
-            <span  style="position: absolute;top:340px;left:310px">
96 
+            <span  style="position: absolute;top:250px;left:260px">
97 97 
                 <span v-if="zhongwen.indexOf('仟') > -1">
98 98 
                     {{ zhongwen.substring(zhongwen.indexOf('仟') - 1,zhongwen.indexOf('仟')) }}
99 99 
                 </span>
100 100 
                 <span v-else>零</span>
101 101 
             </span>
102 
-            <span  style="position: absolute;top:340px;left:360px">
102 
+            <span  style="position: absolute;top:250px;left:300px">
103 103 
                 <span v-if="zhongwen.indexOf('佰') > -1">
104 104 
                     {{ zhongwen.substring(zhongwen.indexOf('佰') - 1,zhongwen.indexOf('佰')) }}
105 105 
                 </span>
106 106 
                 <span v-else>零</span>
107 107 
             </span>
108 
-            <span style="position: absolute;top:340px;left:410px">
108 
+            <span style="position: absolute;top:250px;left:330px">
109 109 
                 <span v-if="zhongwen.indexOf('拾') > -1">
110 110 
                     {{ zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) }}
111 111 
                 </span>
112 112 
                 <span v-else>零</span>
113 113 
             </span>
114 
-            <span  style="position: absolute;top:340px;left:460px">
114 
+            <span  style="position: absolute;top:250px;left:370px">
115 115 
                 <span v-if="zhongwen.indexOf('元') > -1 && zhongwen.substring(zhongwen.indexOf('元') - 1,zhongwen.indexOf('元')) != '拾'">
116 116 
                     {{ zhongwen.substring(zhongwen.indexOf('元') - 1,zhongwen.indexOf('元')) }}
117 117 
                 </span>
118 118 
                 <span v-else>零</span>
119 119 
             </span>
120 
-            <span  style="position: absolute;top:340px;left:510px">
120 
+            <span  style="position: absolute;top:250px;left:400px">
121 121 
                 <span v-if="zhongwen.indexOf('角') > -1">
122 122 
                     {{ zhongwen.substring(zhongwen.indexOf('角') - 1,zhongwen.indexOf('角')) }}
123 123 
                 </span>
124 124 
                 <span v-else>零</span>
125 125 
             </span>
126 
-            <span  style="position: absolute;top:340px;left:560px">
126 
+            <span  style="position: absolute;top:250px;left:430px">
127 127 
                 <span v-if="zhongwen.indexOf('分') > -1">
128 128 
                     {{ zhongwen.substring(zhongwen.indexOf('分') - 1,zhongwen.indexOf('分')) }}
129 129 
                 </span>
130 130 
                 <span v-else>零</span>
131 131 
             </span>
132 132 
             </span>
133 
-            <span style="position: absolute;top:340px;left:600px">{{ totalPrice }}</span>
133 
+            <span style="position: absolute;top:250px;left:500px">{{ totalPrice }}</span>
134 134 
         </div>
135 135 
         <!-- <div style="position: absolute;top:300px;left:460px">现金：{{ list.psn_cash_money }}</div> -->
136 136 
         <div>
137 
-            <div style="position: absolute;top:480px;left:160px">{{ org_name }}</div>
138 
-            <div style="position: absolute;top:480px;left:600px">高慧裕</div>
137 
+            <div style="position: absolute;top:320px;left:120px">{{ org_name }}</div>
138 
+            <div style="position: absolute;top:320px;left:460px">高慧裕</div>
139 139 
         </div>
140 140 
     </div>
141 141 
 </template>