Browse Source

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

csx 2 years ago
parent
commit
c5f7981073

+ 17 - 3
src/xt_pages/outpatientCharges/allListPrint.vue View File

@@ -13,8 +13,8 @@
13 13
     </template>
14 14
 
15 15
     <div class='dialysisPage' style="padding-top:40px;">
16
-      <printOne  v-if="org_id != 10215 && org_id != 0 && org_id !=9671" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></printOne>
17
-      <summary-print v-if="org_id == 10215|| org_id == 0 || org_id ==9671" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></summary-print>
16
+      <printOne  v-if="org_id != 10215 && org_id != 0 && org_id !=9671&&org_id !=9675" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></printOne>
17
+      <summary-print v-if="org_id == 10215|| org_id == 0 || org_id ==9671 ||org_id ==9675" :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></summary-print>
18 18
 
19 19
 <!--      <list-print-two :list="list" :patient="patient" :order="order" :admin="admin" :hospital="his_hospital"></list-print-two>-->
20 20
     </div>
@@ -358,15 +358,29 @@
358 358
 
359 359
       },
360 360
       printThisPage() {
361
-
362 361
         const style =
363 362
           '@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;} .allListTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;}.allListTable tr td {padding: 0 5px;}.tableBottom{font-size: 16px;display: flex;margin-top: 20px;}.tableBottomOne{margin-right: 40px;}}'
363
+         const style1 =
364
+          '@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;} .allListTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;} .allListTable tr td {padding: 0 5px;} .allListTable .allListTable_1{border: none;width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;} .allListTable_1 tr{page-break-inside:avoid;} .allListTable_1 tr td {padding: 0 5px;border: 1px solid #000;} .tableBottom{font-size: 16px;display: flex;margin-top: 20px;}.tableBottomOne{margin-right: 40px;}}'
365
+        
366
+        if(this.org_id == 10215 || this.org_id == 0 ||this.org_id == 9675){
367
+          printJS({
368
+          printable: 'allList-print',
369
+          type: 'html',
370
+          style: style1,
371
+          scanStyles: false
372
+        })
373
+        }else{
364 374
         printJS({
365 375
           printable: 'allList-print',
366 376
           type: 'html',
367 377
           style: style,
368 378
           scanStyles: false
369 379
         })
380
+        }
381
+
382
+        
383
+        
370 384
 
371 385
         // if (this.org_template_info.template_id == 1) {
372 386
         //   printJS({

+ 187 - 152
src/xt_pages/outpatientCharges/allListTemplate/summaryPrint.vue View File

@@ -1,157 +1,178 @@
1 1
 <template>
2 2
   <div id="allList-print" class="allList-print">
3
-    <div class="allListTitle">
4
-      {{ $store.getters.xt_user.org.org_name }}汇总清单
5
-    </div>
6
-    <div class="allListInfo" style="border-top: 1px solid;">
7
-      <div>科别:门诊</div>
8
-      <div>床号:</div>
9
-      <div>门诊号:{{ order.mdtrt_id }}</div>
10
-      <div>姓名:{{ patient.name }}</div>
11
-    </div>
12
-
13
-    <div class="allListInfo" style="border-bottom: 1px solid;">
14
-      <div>预交款:</div>
15
-      <div>总费用:{{ order.medfee_sumamt }}</div>
16
-      <div>门诊日期:{{ hospital.in_hosptial_time? hospital.in_hosptial_time.split(' ')[0]:''}}</div>
17
-    </div>
18
-
19
-    <div class="allListInfo">
20
-      <div>
21
-        西药:&nbsp;&nbsp;&nbsp;{{
22
-          order.westernMedicineCostTotal? order.westernMedicineCostTotal.toFixed(2)  : ""
23
-        }}
24
-      </div>
25
-      <div>
26
-        中成药:{{
27
-          order.chineseTraditionalMedicineCostTotal
28
-            ? order.chineseTraditionalMedicineCostTotal.toFixed(2)
29
-              : ""
30
-        }}
31
-      </div>
32
-      <div>中草药:</div>
33
-    </div>
34
-
35
-    <div class="allListInfo">
36
-      <div>检查费:{{ order.checkCostTotal ? order.checkCostTotal.toFixed(2)  : "" }}</div>
37
-      <div>输氧费:</div>
38
-      <div>
39
-        手术费:{{ order.operationCostTotal ? order.operationCostTotal.toFixed(2)  : "" }}
40
-      </div>
41
-    </div>
42
-
43
-    <div class="allListInfo">
44
-      <div>
45
-        化验费:{{ order.laboratoryCostTotal ? order.laboratoryCostTotal.toFixed(2)  : "" }}
46
-      </div>
47
-      <div>输血费:</div>
48
-      <div>
49
-        诊察费:{{ order.zhenChaCostTotal ? order.zhenChaCostTotal.toFixed(2)  : "" }}
50
-      </div>
51
-    </div>
52
-
53
-    <div class="allListInfo">
54
-      <div>治疗费:{{ order.treatCostTotal ? order.treatCostTotal.toFixed(2)  : "" }}</div>
55
-      <div>护理费:</div>
56
-      <div>床位费:{{ order.bedCostTotal ? order.bedCostTotal.toFixed(2)  : "" }}</div>
57
-    </div>
58
-    <div class="allListInfo">
59
-      <div>麻醉费:</div>
60
-      <div>
61
-        材料费:{{ order.materialCostTotal ? order.materialCostTotal.toFixed(2)  : "" }}
62
-      </div>
63
-      <div>其他:{{ order.otherCostTotal ? order.otherCostTotal.toFixed(2)  : "" }}</div>
64
-    </div>
65
-    <!--    <div style="display:flex;justify-content: space-between;">-->
66
-    <!--          <div style="position: absolute;top:160px;left:40px">西药</div>-->
67
-    <!--          <div style="position: absolute;top:160px;left:110px">{{ list.westernMedicineCostTotal }}</div>-->
68
-    <!--          <div style="position: absolute;top:160px;left:180px">检查费</div>-->
69
-    <!--          <div style="position: absolute;top:160px;left:260px">{{ list.checkCostTotal }}</div>-->
70
-    <!--          <div style="position: absolute;top:160px;left:340px">化验费</div>-->
71
-    <!--          <div style="position: absolute;top:160px;left:420px">{{ list.treatCostTotal }}</div>-->
72
-    <!--          <div style="position: absolute;top:160px;left:500px">治疗费</div>-->
73
-    <!--          <div style="position: absolute;top:160px;left:580px">{{ list.bedCostTotal }}</div>-->
74
-    <!--          <div style="position: absolute;top:160px;left:500px">麻醉费</div>-->
75
-    <!--          <div style="position: absolute;top:160px;left:580px">{{ list.bedCostTotal }}</div>-->
76
-    <!--    </div>-->
77
-    <!--    <div style="display:flex;justify-content: space-between;">-->
78
-    <!--      <div style="position: absolute;top:190px;left:40px">中成药</div>-->
79
-    <!--      <div style="position: absolute;top:190px;left:110px">{{ list.chineseTraditionalMedicineCostTotal }}</div>-->
80
-    <!--      <div style="position: absolute;top:190px;left:180px">输氧费</div>-->
81
-    <!--      <div style="position: absolute;top:190px;left:260px">{{ list.laboratoryCostTotal }}</div>-->
82
-    <!--      <div style="position: absolute;top:190px;left:340px">输血费</div>-->
83
-    <!--      <div style="position: absolute;top:190px;left:420px">{{ list.operationCostTotal }}</div>-->
84
-    <!--      <div style="position: absolute;top:190px;left:500px">护理费</div>-->
85
-    <!--      <div style="position: absolute;top:190px;left:580px">{{ list.otherCostTotal }}</div>-->
86
-
87
-    <!--      <div style="position: absolute;top:160px;left:500px">材料费</div>-->
88
-    <!--      <div style="position: absolute;top:160px;left:580px">{{ list.bedCostTotal }}</div>-->
89
-    <!--    </div>-->
90
-    <!--    <div style="display:flex;justify-content: space-between;">-->
91
-    <!--      <div style="position: absolute;top:210px;left:40px">中草药</div>-->
92
-    <!--      <div style="position: absolute;top:210px;left:110px"></div>-->
93
-    <!--      <div style="position: absolute;top:210px;left:180px">手术费</div>-->
94
-    <!--      <div style="position: absolute;top:210px;left:260px"></div>-->
95
-    <!--      <div style="position: absolute;top:210px;left:340px">诊察费</div>-->
96
-    <!--      <div style="position: absolute;top:210px;left:420px">{{ list.materialCostTotal }}</div>-->
97
-    <!--      <div style="position: absolute;top:210px;left:500px">床位费</div>-->
98
-    <!--      <div style="position: absolute;top:210px;left:580px"></div>-->
99
-    <!--      <div style="position: absolute;top:160px;left:500px">其他</div>-->
100
-    <!--      <div style="position: absolute;top:160px;left:580px">{{ list.bedCostTotal }}</div>-->
101
-    <!--    </div>-->
102
-
103
-    <table class="allListTable" border="1">
104
-      <tr>
105
-        <td style="width: 10%">费用类别</td>
106
-        <td style="width: 35%">项目名称</td>
107
-        <td style="width: 5%">单位</td>
108
-        <td style="width: 10%">数量</td>
109
-        <td style="width: 10%">单价</td>
110
-        <td style="width: 10%">金额</td>
111
-        <td style="width: 10%">医保类型</td>
112
-      </tr>
113
-      <template v-for="(item, index) in list">
114
-        <tr v-if="item.is_total == 2">
115
-          <td style="width: 10%">{{ item.med_chrgitm_type }}</td>
116
-          <td
117
-            style="
118
-              width: 35%;
119
-              white-space: nowrap;
120
-              overflow: hidden;
121
-              text-overflow: ellipsis;
122
-            "
3
+    <table
4
+      class="allListTable"
5
+      border="0"
6
+      cellspacing="0"
7
+      style="font-size: 14px"
8
+      align="center"
9
+    >
10
+      <THEAD
11
+        style="
12
+          display: table-header-group;
13
+          font-weight: bold;
14
+        "
15
+      >
16
+        <TR style="border-bottom: 1px solid">
17
+          <TD colspan="4" align="center" style="font-size: 20px">
18
+            {{ $store.getters.xt_user.org.org_name }}汇总清单
19
+          </TD>
20
+        </TR>
21
+        <TR>
22
+          <TD colspan="1">科别:门诊</TD>
23
+          <TD width="130">床号:</TD>
24
+          <TD>门诊号:{{ order.mdtrt_id }}</TD>
25
+          <TD>姓名:{{ patient.name }}</TD>
26
+        </TR>
27
+        <TR style="border-bottom: 1px solid">
28
+          <TD colspan="2"> 预交款:</TD>
29
+          <TD>总费用:{{ order.medfee_sumamt }} </TD>
30
+          <TD
31
+            >门诊日期:{{
32
+              hospital.in_hosptial_time
33
+                ? hospital.in_hosptial_time.split(" ")[0]
34
+                : ""
35
+            }}</TD
36
+          >
37
+        </TR>
38
+        <TR>
39
+          <TD colspan="2">
40
+            西药:&nbsp;&nbsp;&nbsp;{{
41
+              order.westernMedicineCostTotal
42
+                ? order.westernMedicineCostTotal.toFixed(2)
43
+                : ""
44
+            }}</TD
45
+          >
46
+          <TD
47
+            >中成药:{{
48
+              order.chineseTraditionalMedicineCostTotal
49
+                ? order.chineseTraditionalMedicineCostTotal.toFixed(2)
50
+                : ""
51
+            }}</TD
52
+          >
53
+          <TD>中草药:</TD>
54
+        </TR>
55
+        <TR>
56
+          <TD colspan="2">
57
+            检查费:{{
58
+              order.checkCostTotal ? order.checkCostTotal.toFixed(2) : ""
59
+            }}</TD
60
+          >
61
+          <TD>输氧费:</TD>
62
+          <TD
63
+            >手术费:{{
64
+              order.operationCostTotal
65
+                ? order.operationCostTotal.toFixed(2)
66
+                : ""
67
+            }}</TD
68
+          >
69
+        </TR>
70
+        <TR>
71
+          <TD colspan="2"
72
+            >化验费:{{
73
+              order.laboratoryCostTotal
74
+                ? order.laboratoryCostTotal.toFixed(2)
75
+                : ""
76
+            }}</TD
77
+          >
78
+          <TD>输血费:</TD>
79
+          <TD
80
+            >诊察费:{{
81
+              order.zhenChaCostTotal ? order.zhenChaCostTotal.toFixed(2) : ""
82
+            }}</TD
83
+          >
84
+        </TR>
85
+        <TR>
86
+          <TD colspan="2"
87
+            >治疗费:{{
88
+              order.treatCostTotal ? order.treatCostTotal.toFixed(2) : ""
89
+            }}</TD
90
+          >
91
+          <TD>护理费:</TD>
92
+          <TD
93
+            >床位费:{{
94
+              order.bedCostTotal ? order.bedCostTotal.toFixed(2) : ""
95
+            }}</TD
123 96
           >
124
-            {{ item.name }}{{ item.spec }}
125
-          </td>
126
-          <td style="width: 5%">{{ item.unit }}</td>
127
-          <td style="width: 10%; text-align: right">{{ item.count }}</td>
128
-          <td style="width: 10%; text-align: right">
129
-            {{ item.price.toFixed(4) }}
130
-          </td>
131
-          <td style="width: 10%; text-align: right">
132
-            {{ (item.price * item.count).toFixed(2) }}
133
-          </td>
134
-          <td style="width: 10%">{{ item.medicine_insurance_kind }}</td>
135
-        </tr>
136
-        <tr v-if="item.is_total == 1">
137
-          <td style="width: 10%"></td>
138
-          <td
139
-            style="
140
-              width: 35%;
141
-              white-space: nowrap;
142
-              overflow: hidden;
143
-              text-overflow: ellipsis;
144
-            "
97
+        </TR>
98
+        <TR>
99
+          <TD colspan="2">麻醉费:</TD>
100
+          <TD
101
+            >材料费:{{
102
+              order.materialCostTotal ? order.materialCostTotal.toFixed(2) : ""
103
+            }}</TD
145 104
           >
146
-            合计
147
-          </td>
148
-          <td style="width: 5%"></td>
149
-          <td style="width: 10%; text-align: right"></td>
150
-          <td style="width: 10%; text-align: right"></td>
151
-          <td style="width: 10%; text-align: right">{{ item.total }}</td>
152
-          <td style="width: 10%"></td>
153
-        </tr>
154
-      </template>
105
+          <TD
106
+            >其他:{{
107
+              order.otherCostTotal ? order.otherCostTotal.toFixed(2) : ""
108
+            }}</TD
109
+          >
110
+        </TR>
111
+      </THEAD>
112
+
113
+      <TBODY style="text-align: center">
114
+        <TR>
115
+          <TD colspan="4">
116
+            <Table class="allListTable_1" border="1">
117
+              <TR>
118
+                <TH width="70"> 费用类别 </TH>
119
+                <TH width="70"> 项目名称 </TH>
120
+                <TH width="70">单位</TH>
121
+                <TH width="70">数量</TH>
122
+                <TH width="70">单价</TH>
123
+                <TH width="70">金额</TH>
124
+                <TH width="70">医保类型</TH>
125
+              </TR>
126
+              <template v-for="(item, index) in list">
127
+                <tr v-if="item.is_total == 2">
128
+                  <td style="width: 10%">{{ item.med_chrgitm_type }}</td>
129
+                  <td
130
+                    style="
131
+                      width: 35%;
132
+                      white-space: nowrap;
133
+                      overflow: hidden;
134
+                      text-overflow: ellipsis;
135
+                    "
136
+                  >
137
+                    {{ item.name }}{{ item.spec }}
138
+                  </td>
139
+                  <td style="width: 5%">{{ item.unit }}</td>
140
+                  <td style="width: 10%; text-align: right">
141
+                    {{ item.count }}
142
+                  </td>
143
+                  <td style="width: 10%; text-align: right">
144
+                    {{ item.price.toFixed(4) }}
145
+                  </td>
146
+                  <td style="width: 10%; text-align: right">
147
+                    {{ (item.price * item.count).toFixed(2) }}
148
+                  </td>
149
+                  <td style="width: 10%">{{ item.medicine_insurance_kind }}</td>
150
+                </tr>
151
+                <tr v-if="item.is_total == 1">
152
+                  <td style="width: 10%"></td>
153
+                  <td
154
+                    style="
155
+                      width: 35%;
156
+                      white-space: nowrap;
157
+                      overflow: hidden;
158
+                      text-overflow: ellipsis;
159
+                    "
160
+                  >
161
+                    合计
162
+                  </td>
163
+                  <td style="width: 5%"></td>
164
+                  <td style="width: 10%; text-align: right"></td>
165
+                  <td style="width: 10%; text-align: right"></td>
166
+                  <td style="width: 10%; text-align: right">
167
+                    {{ item.total }}
168
+                  </td>
169
+                  <td style="width: 10%"></td>
170
+                </tr>
171
+              </template>
172
+            </Table>
173
+          </TD>
174
+        </TR>
175
+      </TBODY>
155 176
     </table>
156 177
   </div>
157 178
 </template>
@@ -229,7 +250,6 @@ export default {
229 250
   },
230 251
   watch: {
231 252
     list: {
232
-     
233 253
       handler(newVal) {
234 254
         this.getPage();
235 255
       },
@@ -264,7 +284,7 @@ export default {
264 284
   margin: 10px 0;
265 285
 }
266 286
 
267
-.allListInfo div{
287
+.allListInfo div {
268 288
   min-width: 200px;
269 289
 }
270 290
 
@@ -282,6 +302,20 @@ export default {
282 302
   padding: 0 5px;
283 303
 }
284 304
 
305
+.allListTable_1 {
306
+  width: 100%;
307
+  text-align: center;
308
+  border-collapse: collapse;
309
+  line-height: 20px;
310
+  font-size: 14px;
311
+  border-color: #000;
312
+  text-align: left;
313
+}
314
+
315
+.allListTable_1 tr td {
316
+  padding: 0 5px;
317
+}
318
+
285 319
 .tableBottom {
286 320
   font-size: 16px;
287 321
   display: flex;
@@ -291,4 +325,5 @@ export default {
291 325
 .tableBottomOne {
292 326
   margin-right: 40px;
293 327
 }
328
+
294 329
 </style>

+ 7 - 7
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 != 10106&&org_id != 10215&&org_id != 10265 && org_id != 0" :list="list" :patient="patient" :order="order" :admin="admin"></printOne>
17
+      <printOne v-if="org_id != 10106&&org_id != 10215&&org_id != 10265 && org_id != 0 && 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
-      <list-print-two v-if="org_id == 10215 " :list="list" :patient="patient" :order="order" :admin="admin"></list-print-two>
21
-      <print-two10265  v-if="org_id == 10265 || org_id == 0" :list="list" :patient="patient" :order="order" :admin="admin" :hospital_record="hospital_record"></print-two10265>
20
+      <list-print-two v-if="org_id == 10215 || org_id == 0 || org_id==9675" :list="list" :patient="patient" :order="order" :admin="admin"></list-print-two>
21
+      <print-two10265  v-if="org_id == 10265 " :list="list" :patient="patient" :order="order" :admin="admin" :hospital_record="hospital_record"></print-two10265>
22 22
     </div>
23 23
   </div>
24 24
 </template>
@@ -152,7 +152,7 @@
152 152
               }
153 153
 
154 154
               this.list.sort((a,b) => a.sort < b.sort ? 1 : a.sort > b.sort ? -1 : 0)
155
-              console.log(this.list)
155
+              console.log(this.list,'sssss')
156 156
 
157 157
             }else{
158 158
               this.order = response.data.data.order
@@ -567,9 +567,9 @@
567 567
 
568 568
       printThisPage() {
569 569
         if(this.org_id != 10106){
570
-          if(this.org_id == 10215){
570
+          if(this.org_id == 10215 || this.org_id == 0|| this.org_id == 9675){
571 571
             const style =
572
-                '@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;} .allListTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;}.allListTable tr td {padding: 0 5px;}.tableBottom{font-size: 16px;display: flex;margin-top: 20px;}.tableBottomOne{margin-right: 40px;}}'
572
+                '@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;}}'
573 573
             printJS({
574 574
               printable: 'allList-print',
575 575
               type: 'html',
@@ -583,7 +583,7 @@
583 583
                 '@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;}}'
584 584
             printJS({
585 585
               printable: 'list-print',
586
-              type: 'html',
586
+              type: 'html', 
587 587
               style: style,
588 588
               scanStyles: false
589 589
             })

+ 135 - 49
src/xt_pages/outpatientCharges/listTemplate/listPrintTwo.vue View File

@@ -1,9 +1,106 @@
1 1
 <template>
2 2
   <div id="allList-print" class="allList-print">
3
-    <div class="allListTitle">
4
-      {{ $store.getters.xt_user.org.org_name }}费用清单
5
-    </div>
6
-    <div class="allListInfo">
3
+    <table
4
+      class="listTable"
5
+      border="0"
6
+      cellspacing="0"
7
+      style="font-size: 14px"
8
+      align="center"
9
+    >
10
+      <THEAD
11
+        style="
12
+          display: table-header-group;
13
+          font-weight: bold;
14
+        "
15
+      >
16
+        <TR>
17
+          <TD colspan="3" align="center" style="font-size: 20px">
18
+            {{ $store.getters.xt_user.org.org_name }}费用清单
19
+          </TD>
20
+        </TR>
21
+        <TR>
22
+          <TD colspan="1">患者姓名:{{ patient.name }}</TD>
23
+          <TD>性别:{{ patient.gender == 1 ? "男" : "女" }}</TD>
24
+          <TD
25
+            >结算类型:{{
26
+              order.is_medicine_insurance == 1 ? "医保" : "自费"
27
+            }}</TD
28
+          >
29
+        </TR>
30
+        <TR>
31
+          <TD> 住院/门诊号:{{ order.mdtrt_id }} </TD>
32
+          <TD>科室:血透 </TD>
33
+          <TD>就诊流水号:{{ order.mdtrt_id }}</TD>
34
+        </TR>
35
+        <TR>
36
+          <TD> 总费用:{{ order.medfee_sumamt }} </TD>
37
+          <TD>个人支付:{{ order.psn_part_amt }} </TD>
38
+          <TD>基金支付记账:{{ order.fund_pay_sumamt }}</TD>
39
+        </TR>
40
+        <TR>
41
+          <TD>补充医疗支付记账:0.00</TD>
42
+          <TD>救助支付金额:{{ order.maf_pay }}</TD>
43
+          <TD></TD>
44
+        </TR>
45
+      </THEAD>
46
+
47
+      <TBODY style="text-align: center">
48
+        <TR>
49
+          <TD colspan="3">
50
+            <Table class="allListTable" border="1">
51
+              <TR>
52
+                <TD style="width: 5%">序号</TD>
53
+                <TD style="width: 15%">处方日期</TD>
54
+                <TD style="width: 10%">费用编号</TD>
55
+                <TD style="width: 40%">费用名称</TD>
56
+                <TD style="width: 5%">单位</TD>
57
+                <TD style="width: 5%">数量</TD>
58
+                <TD style="width: 10%">单价</TD>
59
+                <TD style="width: 10%">金额</TD>
60
+              </TR>
61
+              <template v-for="(item, index) in list">
62
+                <tr v-if="item.is_total == 0">
63
+                  <td style="width: 5%">{{ index + 1 }}</td>
64
+                  <td style="width: 15%">{{ item.p_time }}</td>
65
+                  <td style="width: 10%">
66
+                    {{ item.feedetl_sn.split("-")[2] }}
67
+                  </td>
68
+                  <td style="width: 30%; white-space: nowrap; overflow: hidden">
69
+                    {{ item.name }}{{ item.spec }}
70
+                  </td>
71
+                  <td style="width: 5%">{{ item.unit }}</td>
72
+                  <td style="width: 5%; text-align: right">{{ item.count }}</td>
73
+                  <td style="width: 10%; text-align: right">
74
+                    {{ item.price }}
75
+                  </td>
76
+                  <td style="width: 10%; text-align: right">
77
+                    {{ (item.price * item.count).toFixed(2) }}
78
+                  </td>
79
+                </tr>
80
+                <tr v-if="item.is_total == 1">
81
+                  <td style="width: 5%"></td>
82
+                  <td style="width: 15%"></td>
83
+                  <td style="width: 10%"></td>
84
+                  <td style="width: 30%; white-space: nowrap; overflow: hidden">
85
+                    {{ item.name }}
86
+                  </td>
87
+                  <td style="width: 5%"></td>
88
+                  <td style="width: 5%"></td>
89
+                  <td style="width: 10%; text-align: right"></td>
90
+                  <td style="width: 10%; text-align: right">
91
+                    {{ item.price }}
92
+                  </td>
93
+                </tr>
94
+              </template>
95
+            </Table>
96
+          </TD>
97
+        </TR>
98
+      </TBODY>
99
+    </table>
100
+    <!-- <div class="allListTitle">
101
+      
102
+    </div> -->
103
+    <!-- <div class="allListInfo">
7 104
       <div style="text-align: left">患者姓名:{{ patient.name }}</div>
8 105
       <div style="text-align: left; padding-left: -20px">
9 106
         性别:{{ patient.gender == 1 ? "男" : "女" }}
@@ -11,10 +108,9 @@
11 108
       <div style="text-align: left">
12 109
         结算类型:{{ order.is_medicine_insurance == 1 ? "医保" : "自费" }}
13 110
       </div>
14
-      <!--        <div>发票号码:</div>-->
15
-    </div>
111
+    </div> 
16 112
 
17
-    <div class="allListInfo">
113
+     <div class="allListInfo">
18 114
       <div style="text-align: left">住院/门诊号:{{ order.mdtrt_id }}</div>
19 115
       <div style="text-align: left">科室:血透</div>
20 116
       <div style="text-align: left">就诊流水号:{{ order.mdtrt_id }}</div>
@@ -26,53 +122,13 @@
26 122
       <div style="text-align: left">
27 123
         基金支付记账:{{ order.fund_pay_sumamt }}
28 124
       </div>
29
-    </div>
125
+    </div> 
30 126
 
31 127
     <div class="allListInfo">
32 128
       <div style="text-align: left">补充医疗支付记账:0.00</div>
33 129
       <div style="text-align: left">救助支付金额:{{ order.maf_pay }}</div>
34 130
       <div></div>
35
-    </div>
36
-    <table class="allListTable" border="1">
37
-      <tr>
38
-        <td style="width: 5%">序号</td>
39
-        <td style="width: 15%">处方日期</td>
40
-        <td style="width: 10%">费用编号</td>
41
-        <td style="width: 40%">费用名称</td>
42
-        <td style="width: 5%">单位</td>
43
-        <td style="width: 5%">数量</td>
44
-        <td style="width: 10%">单价</td>
45
-        <td style="width: 10%">金额</td>
46
-      </tr>
47
-      <template v-for="(item, index) in list">
48
-        <tr v-if="item.is_total == 0">
49
-          <td style="width: 5%">{{ index + 1 }}</td>
50
-          <td style="width: 15%">{{ item.p_time }}</td>
51
-          <td style="width: 10%">{{ item.feedetl_sn.split("-")[2] }}</td>
52
-          <td style="width: 30%; white-space: nowrap; overflow: hidden">
53
-            {{ item.name }}{{ item.spec }}
54
-          </td>
55
-          <td style="width: 5%">{{ item.unit }}</td>
56
-          <td style="width: 5%; text-align: right">{{ item.count }}</td>
57
-          <td style="width: 10%; text-align: right">{{ item.price }}</td>
58
-          <td style="width: 10%; text-align: right">
59
-            {{ (item.price * item.count).toFixed(2) }}
60
-          </td>
61
-        </tr>
62
-        <tr v-if="item.is_total == 1">
63
-          <td style="width: 5%"></td>
64
-          <td style="width: 15%"></td>
65
-          <td style="width: 10%"></td>
66
-          <td style="width: 30%; white-space: nowrap; overflow: hidden">
67
-            {{ item.name }}
68
-          </td>
69
-          <td style="width: 5%"></td>
70
-          <td style="width: 5%"></td>
71
-          <td style="width: 10%; text-align: right"></td>
72
-          <td style="width: 10%; text-align: right">{{ item.price }}</td>
73
-        </tr>
74
-      </template>
75
-    </table>
131
+    </div>-->
76 132
   </div>
77 133
 </template>
78 134
 
@@ -207,6 +263,36 @@ export default {
207 263
   margin-top: 20px;
208 264
 }
209 265
 
266
+.tableBottomOne {
267
+  margin-right: 40px;
268
+}
269
+
270
+.listTable {
271
+  width: 100%;
272
+  text-align: center;
273
+  border-collapse: collapse;
274
+  line-height: 40px;
275
+  font-size: 14px;
276
+  border-color: #000;
277
+  text-align: left;
278
+}
279
+.listTable thead {
280
+  width: 100%;
281
+  text-align: center;
282
+  border-collapse: collapse;
283
+  line-height: 40px;
284
+  font-size: 14px;
285
+  border-color: #000;
286
+  text-align: left;
287
+}
288
+.listTable thead tr td {
289
+  padding: 0 5px;
290
+}
291
+.tableBottom {
292
+  font-size: 16px;
293
+  display: flex;
294
+  margin-top: 20px;
295
+}
210 296
 .tableBottomOne {
211 297
   margin-right: 40px;
212 298
 }

+ 2 - 2
src/xt_pages/outpatientCharges/listTemplate/printTwo10265.vue View File

@@ -12,8 +12,8 @@
12 12
           <TR
13 13
             ><TD colspan="4" align="center" style="font-size: 20px"
14 14
               >{{ $store.getters.xt_user.org.org_name }}费用清单</TD
15
-            ></TR
16
-          >
15
+            ></TR>
16
+          
17 17
           <TR>
18 18
             <TD colspan="1">个人编码:{{ order.psn_no }}</TD>
19 19
             <TD>住院号:{{ order.mdtrt_id }}</TD>

+ 1 - 1
src/xt_pages/stock/drugs/drugStockInOrderDetailPrint.vue View File

@@ -51,7 +51,7 @@
51 51
                    <span>{{ item.warehousing_count }}</span>
52 52
               </td>
53 53
               <td style="line-height: 18px">
54
-                <span>{{item.max_unit}}</span>
54
+                <span>{{item.limax_unit}}</span>
55 55
               </td>
56 56
               <td style="line-height:18px">
57 57
                   <span>{{(item.warehousing_count * item.price).toFixed(2)}}</span>