Browse Source

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

XMLWAN 3 years ago
parent
commit
d2a3690b4f

+ 3 - 2
src/xt_pages/dialysis/dialysisDoctorAdvice.vue View File

542
                     projectArr.push(item)
542
                     projectArr.push(item)
543
                   }
543
                   }
544
                 })
544
                 })
545
-
546
               })
545
               })
547
 
546
 
547
+              console.log(projectArr)
548
+
548
               resp.data.hisAdvices.map((item,index) => {
549
               resp.data.hisAdvices.map((item,index) => {
549
-                if(projectArr[index].project.length > 0){
550
+                if(projectArr[index].project && projectArr[index].project.length > 0){
550
                   projectArr[index].project.map(it => {
551
                   projectArr[index].project.map(it => {
551
                     let obj = {
552
                     let obj = {
552
                       advice_doctor: it.doctor,
553
                       advice_doctor: it.doctor,

+ 2 - 2
src/xt_pages/hospitalStation/summary.vue View File

74
                 <!--<template slot-scope="scope"></template>-->
74
                 <!--<template slot-scope="scope"></template>-->
75
                 <!--</el-table-column>-->
75
                 <!--</el-table-column>-->
76
                 <el-table-column align="center" prop="name" label="应收金额">
76
                 <el-table-column align="center" prop="name" label="应收金额">
77
-                    <template slot-scope="scope">{{scope.row.medfee_sumamt}}</template>
77
+                    <template slot-scope="scope">{{scope.row.medfee_sumamt.toFixed(4)}}</template>
78
                 </el-table-column>
78
                 </el-table-column>
79
                 <el-table-column align="center" prop="name" label="实收金额">
79
                 <el-table-column align="center" prop="name" label="实收金额">
80
-                    <template slot-scope="scope">{{scope.row.reality_price}}</template>
80
+                    <template slot-scope="scope">{{scope.row.reality_price.toFixed(4)}}</template>
81
                 </el-table-column>
81
                 </el-table-column>
82
                 <el-table-column align="center" prop="name" label="科室">
82
                 <el-table-column align="center" prop="name" label="科室">
83
                     <template slot-scope="scope">{{scope.row.department_name}}</template>
83
                     <template slot-scope="scope">{{scope.row.department_name}}</template>

+ 7 - 7
src/xt_pages/hospitalStation/summaryDetail.vue View File

56
                             <el-table-column align="center" prop="name" width="60" label="单价">
56
                             <el-table-column align="center" prop="name" width="60" label="单价">
57
                                 <template slot-scope="scope">
57
                                 <template slot-scope="scope">
58
                                     <!--<el-input v-model="scope.row.price" placeholder="" readonly></el-input>-->
58
                                     <!--<el-input v-model="scope.row.price" placeholder="" readonly></el-input>-->
59
-                                    {{scope.row.price}}元
59
+                                    {{scope.row.price.toFixed(4)}}元
60
 
60
 
61
                                 </template>
61
                                 </template>
62
                             </el-table-column>
62
                             </el-table-column>
64
                             <el-table-column align="center" prop="name" width="60" label="总价">
64
                             <el-table-column align="center" prop="name" width="60" label="总价">
65
                                 <template slot-scope="scope">
65
                                 <template slot-scope="scope">
66
                                     <!--<el-input v-model="scope.row.price" placeholder="" readonly></el-input>-->
66
                                     <!--<el-input v-model="scope.row.price" placeholder="" readonly></el-input>-->
67
-                                    {{scope.row.price}}元
67
+                                    {{scope.row.price.toFixed(4)}}元
68
 
68
 
69
                                 </template>
69
                                 </template>
70
                             </el-table-column>
70
                             </el-table-column>
112
                     </ul>
112
                     </ul>
113
                     <p class="centerRightTitle" style="margin-top:10px;">收费信息</p>
113
                     <p class="centerRightTitle" style="margin-top:10px;">收费信息</p>
114
                     <ul class="basicUl">
114
                     <ul class="basicUl">
115
-                        <li style="width:50%;">应收金额:{{order.medfee_sumamt }}元</li>
116
-                        <li style="width:50%;">实收金额:{{order.reality_price}}元</li>
117
-                        <li style="width:50%;">舍入金额:{{order.medfee_sumamt - order.reality_price}}元</li>
118
-                        <li style="width:50%;">优惠金额:{{order.preferential_price}}元</li>
115
+                        <li style="width:50%;">应收金额:{{order.medfee_sumamt.toFixed(4) }}元</li>
116
+                        <li style="width:50%;">实收金额:{{order.reality_price.toFixed(4)}}元</li>
117
+                        <li style="width:50%;">舍入金额:{{order.medfee_sumamt.toFixed(4) - order.reality_price.toFixed(4)}}元</li>
118
+                        <li style="width:50%;">优惠金额:{{order.preferential_price.toFixed(4)}}元</li>
119
                         <li style="width:50%;">总金额</li>
119
                         <li style="width:50%;">总金额</li>
120
-                        <li style="width:50%;">{{order.medfee_sumamt}}元</li>
120
+                        <li style="width:50%;">{{order.medfee_sumamt.toFixed(4)}}元</li>
121
                     </ul>
121
                     </ul>
122
                     <!--<p class="centerRightTitle">发票费用</p>-->
122
                     <!--<p class="centerRightTitle">发票费用</p>-->
123
                     <!--<ul class="basicUl">-->
123
                     <!--<ul class="basicUl">-->

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

28
                 <td style="width:10%">{{item.med_chrgitm_type}}</td>
28
                 <td style="width:10%">{{item.med_chrgitm_type}}</td>
29
                 <td style="width:31%">{{item.name}}</td>
29
                 <td style="width:31%">{{item.name}}</td>
30
                 <td style="width:14%">{{item.spec}}</td>
30
                 <td style="width:14%">{{item.spec}}</td>
31
-                <td style="width:10%">{{(item.price).toFixed(2)}}</td>
31
+                <td style="width:10%">{{(item.price).toFixed(4)}}</td>
32
                 <td style="width:6%">{{item.count}}{{item.unit}}</td>
32
                 <td style="width:6%">{{item.count}}{{item.unit}}</td>
33
-                <td style="width:10%">{{(item.price * item.count).toFixed(2)}}</td>
33
+                <td style="width:10%">{{(item.price * item.count).toFixed(4)}}</td>
34
             </tr>
34
             </tr>
35
         </table>
35
         </table>
36
         <div class="tableBottom">
36
         <div class="tableBottom">

+ 6 - 6
src/xt_pages/outpatientCharges/outpatientChargesManagement.vue View File

162
                                                 <span>当前处方总费用:<span style="color:red;">{{items.total}}元</span></span>
162
                                                 <span>当前处方总费用:<span style="color:red;">{{items.total}}元</span></span>
163
 
163
 
164
 
164
 
165
-                                                <span>医疗费总额:<span style="color:red;">{{ items.curPrescriptions.order.medfee_sumamt ?  items.curPrescriptions.order.medfee_sumamt:getTotalFour(items.prescriptions)?getTotalFour(items.prescriptions):'' }}元</span></span>
166
-                                                <span>基金支付金额:<span style="color:red;">{{ items.curPrescriptions.order.hifp_pay?items.curPrescriptions.order.hifp_pay:''}}元</span></span>
167
-                                                <span>个人账户支付金额:<span style="color:red;">{{ items.curPrescriptions.order.acct_pay?items.curPrescriptions.order.acct_pay:''}}元</span></span>
165
+                                                <span>医疗费总额:<span style="color:red;">{{ items.curPrescriptions.order.medfee_sumamt ?  items.curPrescriptions.order.medfee_sumamt.toFixed(4):getTotalFour(items.prescriptions)?getTotalFour(items.prescriptions):'' }}元</span></span>
166
+                                                <span>基金支付金额:<span style="color:red;">{{ items.curPrescriptions.order.hifp_pay?items.curPrescriptions.order.hifp_pay.toFixed(4):''}}元</span></span>
167
+                                                <span>个人账户支付金额:<span style="color:red;">{{ items.curPrescriptions.order.acct_pay?items.curPrescriptions.order.acct_pay.toFixed(4):''}}元</span></span>
168
                                                 <span v-if="hisPatientInfo.balance_accounts_type != 2">个人支付金额:<span
168
                                                 <span v-if="hisPatientInfo.balance_accounts_type != 2">个人支付金额:<span
169
-                                                        style="color:red;">{{ items.curPrescriptions.order.psn_cash_pay?items.curPrescriptions.order.psn_cash_pay:''}}元</span></span>
169
+                                                        style="color:red;">{{ items.curPrescriptions.order.psn_cash_pay?items.curPrescriptions.order.psn_cash_pay.toFixed(4):''}}元</span></span>
170
                                                 <span v-if="hisPatientInfo.balance_accounts_type == 2">个人支付金额:<span
170
                                                 <span v-if="hisPatientInfo.balance_accounts_type == 2">个人支付金额:<span
171
-                                                        style="color:red;">{{ items.curPrescriptions.order.medfee_sumamt}}元</span></span>
171
+                                                        style="color:red;">{{ items.curPrescriptions.order.medfee_sumamt.toFixed(4)}}元</span></span>
172
 
172
 
173
-                                                <span>个人账户金额:<span style="color:red;">{{ items.curPrescriptions.order.balc?items.curPrescriptions.order.balc:''}}元</span></span>
173
+                                                <span>个人账户金额:<span style="color:red;">{{ items.curPrescriptions.order.balc?items.curPrescriptions.order.balc.toFixed(4):''}}元</span></span>
174
 
174
 
175
                                                 <span v-if="items.curPrescriptions.order_status  == 1">待结算</span>
175
                                                 <span v-if="items.curPrescriptions.order_status  == 1">待结算</span>
176
                                                 <span v-if="items.curPrescriptions.order_status  == 2">已结算</span>
176
                                                 <span v-if="items.curPrescriptions.order_status  == 2">已结算</span>

+ 28 - 14
src/xt_pages/outpatientCharges/statementPrint.vue View File

328
               }
328
               }
329
               let num = 0
329
               let num = 0
330
 
330
 
331
-              // let obj4 = {
332
-              //   type:4,
333
-              //   details: [],
334
-              //   total: 0
335
-              // }
331
+              let obj4 = {
332
+                type:4,
333
+                details: [],
334
+                total: 0
335
+              }
336
               this.balanceAccounts.order_info.map(item => {
336
               this.balanceAccounts.order_info.map(item => {
337
                 if(item.advice_id > 0){
337
                 if(item.advice_id > 0){
338
                   obj.details.push(item)
338
                   obj.details.push(item)
350
                   }
350
                   }
351
                 }
351
                 }
352
               })
352
               })
353
-              // this.balanceAccounts.new_order_info.map(item => {
354
-              //       obj4.total = item.Total
355
-              //        obj4.details.push(item)
356
-              //        num++
357
-              //
358
-              //
359
-              // })
353
+              this.balanceAccounts.new_order_info.map(item => {
354
+                    obj4.total = item.Total
355
+                     obj4.details.push(item)
356
+                     num++
357
+
358
+
359
+              })
360
 
360
 
361
               this.balanceAccounts.new_detail_list = []
361
               this.balanceAccounts.new_detail_list = []
362
               this.balanceAccounts.new_detail_list.push(obj)
362
               this.balanceAccounts.new_detail_list.push(obj)
363
               this.balanceAccounts.new_detail_list.push(obj2)
363
               this.balanceAccounts.new_detail_list.push(obj2)
364
               this.balanceAccounts.new_detail_list.push(obj3)
364
               this.balanceAccounts.new_detail_list.push(obj3)
365
-              // this.balanceAccounts.new_detail_list.push(obj4)
365
+              this.balanceAccounts.new_detail_list.push(obj4)
366
 
366
 
367
               console.log(111,this.balanceAccounts)
367
               console.log(111,this.balanceAccounts)
368
               this.num = num
368
               this.num = num
515
                 details: [],
515
                 details: [],
516
                 total: 0
516
                 total: 0
517
               }
517
               }
518
+
519
+              let obj4 = {
520
+                type:4,
521
+                details: [],
522
+                total: 0
523
+              }
518
               let num = 0
524
               let num = 0
519
               that.info.order_infos.map(item => {
525
               that.info.order_infos.map(item => {
520
                 if(item.advice_id > 0){
526
                 if(item.advice_id > 0){
534
                 }
540
                 }
535
               })
541
               })
536
 
542
 
543
+              this.info.order_infos.map(item => {
544
+                obj4.total = item.Total
545
+                obj4.details.push(item)
546
+                num++
547
+
548
+              })
549
+
537
               that.info.new_detail_list = []
550
               that.info.new_detail_list = []
538
               that.info.new_detail_list.push(obj)
551
               that.info.new_detail_list.push(obj)
539
               that.info.new_detail_list.push(obj2)
552
               that.info.new_detail_list.push(obj2)
540
               that.info.new_detail_list.push(obj3)
553
               that.info.new_detail_list.push(obj3)
541
-              console.log('123',that.info.new_detail_list)
554
+              that.info.new_detail_list.push(obj4)
555
+
542
               that.num = num
556
               that.num = num
543
 
557
 
544
               if(that.paramsObj.settle_type != 1){
558
               if(that.paramsObj.settle_type != 1){

+ 21 - 21
src/xt_pages/outpatientCharges/statementTemplate/printThree.vue View File

48
                                 <span v-if="item.type == 1">药品费</span>
48
                                 <span v-if="item.type == 1">药品费</span>
49
                                 <span v-if="item.type == 2">治疗费</span>
49
                                 <span v-if="item.type == 2">治疗费</span>
50
                                 <span v-if="item.type == 3">耗材费</span>
50
                                 <span v-if="item.type == 3">耗材费</span>
51
-                                <!--<span v-if="item.type == 4">检验费</span>-->
51
+                                <span v-if="item.type == 4">检验费</span>
52
 
52
 
53
                             </td>
53
                             </td>
54
                             <td>
54
                             <td>
55
                                 <span v-if="item.type == 1">{{ subItem.advice.advice_name }}</span>
55
                                 <span v-if="item.type == 1">{{ subItem.advice.advice_name }}</span>
56
                                 <span v-if="item.type == 2">{{ subItem.project.project.project_name }}</span>
56
                                 <span v-if="item.type == 2">{{ subItem.project.project.project_name }}</span>
57
                                 <span v-if="item.type == 3">{{ subItem.project.good_info.good_name }}</span>
57
                                 <span v-if="item.type == 3">{{ subItem.project.good_info.good_name }}</span>
58
-                                <!--<span v-if="item.type == 4">{{ subItem.project.project.team_name }}</span>-->
58
+                                <span v-if="item.type == 4">{{ subItem.project.project.team_name }}</span>
59
 
59
 
60
                             </td>
60
                             </td>
61
                             <td>
61
                             <td>
63
                                         v-if="subItem.advice.drug.min_unit != subItem.advice.drug.dose_unit">{{subItem.advice.drug.dose}}{{subItem.advice.drug.dose_unit}}&nbsp;* &nbsp;</span>{{subItem.advice.drug.min_number}}{{subItem.advice.drug.min_unit}}/{{subItem.advice.drug.max_unit}}</span>
63
                                         v-if="subItem.advice.drug.min_unit != subItem.advice.drug.dose_unit">{{subItem.advice.drug.dose}}{{subItem.advice.drug.dose_unit}}&nbsp;* &nbsp;</span>{{subItem.advice.drug.min_number}}{{subItem.advice.drug.min_unit}}/{{subItem.advice.drug.max_unit}}</span>
64
                                 <span v-if="item.type == 2"></span>
64
                                 <span v-if="item.type == 2"></span>
65
                                 <span v-if="item.type == 3">{{ subItem.project.good_info.specification_name }}</span>
65
                                 <span v-if="item.type == 3">{{ subItem.project.good_info.specification_name }}</span>
66
-                                <!--<span v-if="item.type == 4"></span>-->
66
+                                <span v-if="item.type == 4"></span>
67
 
67
 
68
                             </td>
68
                             </td>
69
                             <td>
69
                             <td>
70
                                 <span v-if="item.type == 1">{{ subItem.advice.drug.prescribing_number_unit }}</span>
70
                                 <span v-if="item.type == 1">{{ subItem.advice.drug.prescribing_number_unit }}</span>
71
                                 <span v-if="item.type == 2">{{ subItem.project.unit }}</span>
71
                                 <span v-if="item.type == 2">{{ subItem.project.unit }}</span>
72
                                 <span v-if="item.type == 3">{{ subItem.project.unit }}</span>
72
                                 <span v-if="item.type == 3">{{ subItem.project.unit }}</span>
73
-                                <!--<span v-if="item.type == 4"></span>-->
73
+                                <span v-if="item.type == 4"></span>
74
 
74
 
75
                             </td>
75
                             </td>
76
                             <td>
76
                             <td>
77
                                 <span v-if="item.type == 1">{{ subItem.advice.prescribing_number }}</span>
77
                                 <span v-if="item.type == 1">{{ subItem.advice.prescribing_number }}</span>
78
                                 <span v-if="item.type == 2">{{ subItem.project.count }}</span>
78
                                 <span v-if="item.type == 2">{{ subItem.project.count }}</span>
79
                                 <span v-if="item.type == 3">{{ subItem.project.count }}</span>
79
                                 <span v-if="item.type == 3">{{ subItem.project.count }}</span>
80
-                                <!--<span v-if="item.type == 4"></span>-->
80
+                                <span v-if="item.type == 4"></span>
81
 
81
 
82
                             </td>
82
                             </td>
83
                             <td>
83
                             <td>
84
                                 <span v-if="item.type == 1">{{ subItem.pric }}</span>
84
                                 <span v-if="item.type == 1">{{ subItem.pric }}</span>
85
                                 <span v-if="item.type == 2">{{ subItem.pric }}</span>
85
                                 <span v-if="item.type == 2">{{ subItem.pric }}</span>
86
                                 <span v-if="item.type == 3">{{ subItem.pric }}</span>
86
                                 <span v-if="item.type == 3">{{ subItem.pric }}</span>
87
-                                <!--<span v-if="item.type == 4"></span>-->
87
+                                <span v-if="item.type == 4"></span>
88
 
88
 
89
                             </td>
89
                             </td>
90
                             <td>
90
                             <td>
182
                                 <span v-if="item.type == 1">药品费</span>
182
                                 <span v-if="item.type == 1">药品费</span>
183
                                 <span v-if="item.type == 2">治疗费</span>
183
                                 <span v-if="item.type == 2">治疗费</span>
184
                                 <span v-if="item.type == 3">耗材费</span>
184
                                 <span v-if="item.type == 3">耗材费</span>
185
-                                <!--<span v-if="item.type == 4">检验费</span>-->
185
+                                <span v-if="item.type == 4">检验费</span>
186
 
186
 
187
                             </td>
187
                             </td>
188
                             <td>
188
                             <td>
189
                                 <span v-if="item.type == 1">{{ subItem.advice.advice_name }}</span>
189
                                 <span v-if="item.type == 1">{{ subItem.advice.advice_name }}</span>
190
                                 <span v-if="item.type == 2">{{ subItem.project.project.project_name }}</span>
190
                                 <span v-if="item.type == 2">{{ subItem.project.project.project_name }}</span>
191
                                 <span v-if="item.type == 3">{{ subItem.project.good_info.good_name }}</span>
191
                                 <span v-if="item.type == 3">{{ subItem.project.good_info.good_name }}</span>
192
-                                <!--<span v-if="item.type == 4">{{ subItem.Name }}</span>-->
192
+                                <span v-if="item.type == 4">{{ subItem.Name }}</span>
193
 
193
 
194
                             </td>
194
                             </td>
195
                             <td>
195
                             <td>
197
                                         v-if="subItem.advice.drug.min_unit != subItem.advice.drug.dose_unit">{{subItem.advice.drug.dose}}{{subItem.advice.drug.dose_unit}}&nbsp;* &nbsp;</span>{{subItem.advice.drug.min_number}}{{subItem.advice.drug.min_unit}}/{{subItem.advice.drug.max_unit}}</span>
197
                                         v-if="subItem.advice.drug.min_unit != subItem.advice.drug.dose_unit">{{subItem.advice.drug.dose}}{{subItem.advice.drug.dose_unit}}&nbsp;* &nbsp;</span>{{subItem.advice.drug.min_number}}{{subItem.advice.drug.min_unit}}/{{subItem.advice.drug.max_unit}}</span>
198
                                 <span v-if="item.type == 2"></span>
198
                                 <span v-if="item.type == 2"></span>
199
                                 <span v-if="item.type == 3">{{ subItem.project.good_info.specification_name }}</span>
199
                                 <span v-if="item.type == 3">{{ subItem.project.good_info.specification_name }}</span>
200
-                                <!--<span v-if="item.type == 4"></span>-->
200
+                                <span v-if="item.type == 4"></span>
201
 
201
 
202
                             </td>
202
                             </td>
203
                             <td>
203
                             <td>
204
                                 <span v-if="item.type == 1">{{ subItem.advice.drug.prescribing_number_unit }}</span>
204
                                 <span v-if="item.type == 1">{{ subItem.advice.drug.prescribing_number_unit }}</span>
205
                                 <span v-if="item.type == 2">{{ subItem.project.unit }}</span>
205
                                 <span v-if="item.type == 2">{{ subItem.project.unit }}</span>
206
                                 <span v-if="item.type == 3">{{ subItem.project.unit }}</span>
206
                                 <span v-if="item.type == 3">{{ subItem.project.unit }}</span>
207
-                                <!--<span v-if="item.type == 4"></span>-->
207
+                                <span v-if="item.type == 4"></span>
208
 
208
 
209
                             </td>
209
                             </td>
210
                             <td>
210
                             <td>
211
                                 <span v-if="item.type == 1">{{ subItem.advice.prescribing_number }}</span>
211
                                 <span v-if="item.type == 1">{{ subItem.advice.prescribing_number }}</span>
212
                                 <span v-if="item.type == 2">{{ subItem.project.count }}</span>
212
                                 <span v-if="item.type == 2">{{ subItem.project.count }}</span>
213
                                 <span v-if="item.type == 3">{{ subItem.project.count }}</span>
213
                                 <span v-if="item.type == 3">{{ subItem.project.count }}</span>
214
-                                <!--<span v-if="item.type == 4">1</span>-->
214
+                                <span v-if="item.type == 4">1</span>
215
 
215
 
216
                             </td>
216
                             </td>
217
                             <td>
217
                             <td>
218
                                 <span v-if="item.type == 1">{{ subItem.pric }}</span>
218
                                 <span v-if="item.type == 1">{{ subItem.pric }}</span>
219
                                 <span v-if="item.type == 2">{{ subItem.pric }}</span>
219
                                 <span v-if="item.type == 2">{{ subItem.pric }}</span>
220
                                 <span v-if="item.type == 3">{{ subItem.pric }}</span>
220
                                 <span v-if="item.type == 3">{{ subItem.pric }}</span>
221
-                                <!--<span v-if="item.type == 4">{{subItem.Total}}</span>-->
221
+                                <span v-if="item.type == 4">{{subItem.Total}}</span>
222
 
222
 
223
                             </td>
223
                             </td>
224
                             <td>
224
                             <td>
225
-                                <span v-if="item.type == 1">{{ (subItem.advice.prescribing_number * subItem.pric).toFixed(2) }}</span>
226
-                                <span v-if="item.type == 2">{{ (subItem.project.count * subItem.pric).toFixed(2) }}</span>
227
-                                <span v-if="item.type == 3">{{ (subItem.project.count * subItem.pric).toFixed(2) }}</span>
228
-                                <!--<span v-if="item.type == 4">{{subItem.Total}}</span>-->
225
+                                <span v-if="item.type == 1">{{ (subItem.advice.prescribing_number * subItem.pric).toFixed(4) }}</span>
226
+                                <span v-if="item.type == 2">{{ (subItem.project.count * subItem.pric).toFixed(4) }}</span>
227
+                                <span v-if="item.type == 3">{{ (subItem.project.count * subItem.pric).toFixed(4) }}</span>
228
+                                <span v-if="item.type == 4">{{subItem.Total}}</span>
229
 
229
 
230
                             </td>
230
                             </td>
231
                             <td :rowspan="item.details.length" v-if="index == 0"
231
                             <td :rowspan="item.details.length" v-if="index == 0"
232
-                                style="vertical-align: middle;text-align: center;">{{ item.total.toFixed(2) }}
232
+                                style="vertical-align: middle;text-align: center;">{{ item.total.toFixed(4) }}
233
                             </td>
233
                             </td>
234
                         </tr>
234
                         </tr>
235
                     </div>
235
                     </div>
238
                             <div style="display:flex;flez-wrap:wrap;">
238
                             <div style="display:flex;flez-wrap:wrap;">
239
                                 <div style="width:33%;" v-for="(item,index) in balanceAccounts.new_detail_list"
239
                                 <div style="width:33%;" v-for="(item,index) in balanceAccounts.new_detail_list"
240
                                      :key="index">
240
                                      :key="index">
241
-                                    <span v-if="item.type == 1">药品费: {{ item.total.toFixed(2) }}</span>
242
-                                    <span v-if="item.type == 2">治疗费: {{ item.total.toFixed(2) }}</span>
243
-                                    <span v-if="item.type == 3">耗材费: {{ item.total.toFixed(2) }}</span>
244
-                                    <!--<span v-if="item.type == 4">检验费: {{ item.total.toFixed(2) }}</span>-->
241
+                                    <span v-if="item.type == 1">药品费: {{ item.total.toFixed(4) }}</span>
242
+                                    <span v-if="item.type == 2">治疗费: {{ item.total.toFixed(4) }}</span>
243
+                                    <span v-if="item.type == 3">耗材费: {{ item.total.toFixed(4) }}</span>
244
+                                    <span v-if="item.type == 4">检验费: {{ item.total.toFixed(4) }}</span>
245
 
245
 
246
                                 </div>
246
                                 </div>
247
                             </div>
247
                             </div>

+ 2 - 2
src/xt_pages/outpatientCharges/summary.vue View File

81
                 <!--</el-table-column>-->
81
                 <!--</el-table-column>-->
82
 
82
 
83
                 <el-table-column align="center" width="90" prop="name" label="应收金额">
83
                 <el-table-column align="center" width="90" prop="name" label="应收金额">
84
-                    <template slot-scope="scope">{{scope.row.medfee_sumamt}}</template>
84
+                    <template slot-scope="scope">{{scope.row.medfee_sumamt.toFixed(4)}}</template>
85
                 </el-table-column>
85
                 </el-table-column>
86
                 <el-table-column align="center" width="90" prop="name" label="实收金额">
86
                 <el-table-column align="center" width="90" prop="name" label="实收金额">
87
-                    <template slot-scope="scope">{{scope.row.reality_price}}</template>
87
+                    <template slot-scope="scope">{{scope.row.reality_price.toFixed(4)}}</template>
88
                 </el-table-column>
88
                 </el-table-column>
89
                 <el-table-column align="center" width="90" prop="name" label="科室">
89
                 <el-table-column align="center" width="90" prop="name" label="科室">
90
                     <template slot-scope="scope">{{scope.row.department_name}}</template>
90
                     <template slot-scope="scope">{{scope.row.department_name}}</template>

+ 7 - 7
src/xt_pages/outpatientCharges/summaryDetail.vue View File

64
                           <el-table-column align="center" prop="name" width="60" label="总价">
64
                           <el-table-column align="center" prop="name" width="60" label="总价">
65
                               <template slot-scope="scope">
65
                               <template slot-scope="scope">
66
                                   <!--<el-input v-model="scope.row.price" placeholder="" readonly></el-input>-->
66
                                   <!--<el-input v-model="scope.row.price" placeholder="" readonly></el-input>-->
67
-                                  {{scope.row.price}}元
67
+                                  {{scope.row.price.toFixed(4)}}元
68
 
68
 
69
                               </template>
69
                               </template>
70
                           </el-table-column>
70
                           </el-table-column>
92
 
92
 
93
                     </div>
93
                     </div>
94
                     <div class="costBox">
94
                     <div class="costBox">
95
-                      <span>当前处方总费用:<span style="color:red;">{{ order.medfee_sumamt}}元</span></span>
95
+                      <span>当前处方总费用:<span style="color:red;">{{ order.medfee_sumamt.toFixed(4)}}元</span></span>
96
                       <span v-if="order.order_status == 1">待结算</span>
96
                       <span v-if="order.order_status == 1">待结算</span>
97
                       <span v-if="order.order_status == 2">已结算</span>
97
                       <span v-if="order.order_status == 2">已结算</span>
98
                       <span v-if="order.order_status == 3">已退费</span>
98
                       <span v-if="order.order_status == 3">已退费</span>
112
                     </ul>
112
                     </ul>
113
                     <p class="centerRightTitle" style="margin-top:10px;">收费信息</p>
113
                     <p class="centerRightTitle" style="margin-top:10px;">收费信息</p>
114
                     <ul class="basicUl">
114
                     <ul class="basicUl">
115
-                        <li style="width:50%;">应收金额:{{order.medfee_sumamt }}元</li>
116
-                        <li style="width:50%;">实收金额:{{order.reality_price}}元</li>
117
-                        <li style="width:50%;">舍入金额:{{order.medfee_sumamt - order.reality_price}}元</li>
118
-                        <li style="width:50%;">优惠金额:{{order.preferential_price}}元</li>
115
+                        <li style="width:50%;">应收金额:{{order.medfee_sumamt.toFixed(4) }}元</li>
116
+                        <li style="width:50%;">实收金额:{{order.reality_price.toFixed(4)}}元</li>
117
+                        <li style="width:50%;">舍入金额:{{order.medfee_sumamt.toFixed(4) - order.reality_price.toFixed(4)}}元</li>
118
+                        <li style="width:50%;">优惠金额:{{order.preferential_price.toFixed(4)}}元</li>
119
                         <li style="width:50%;">总金额</li>
119
                         <li style="width:50%;">总金额</li>
120
-                        <li style="width:50%;">{{order.medfee_sumamt}}元</li>
120
+                        <li style="width:50%;">{{order.medfee_sumamt.toFixed(4)}}元</li>
121
                     </ul>
121
                     </ul>
122
                     <!--<p class="centerRightTitle">发票费用</p>-->
122
                     <!--<p class="centerRightTitle">发票费用</p>-->
123
                     <!--<ul class="basicUl">-->
123
                     <!--<ul class="basicUl">-->

+ 5 - 5
src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue View File

1640
                 total = total + this.month_prescriptions[i].addition[b].price * this.month_prescriptions[i].addition[b].count
1640
                 total = total + this.month_prescriptions[i].addition[b].price * this.month_prescriptions[i].addition[b].count
1641
               }
1641
               }
1642
             }
1642
             }
1643
-            total = Math.floor(total * 100) / 100
1643
+            total = total.toFixed(4)
1644
           }
1644
           }
1645
         }
1645
         }
1646
         return total
1646
         return total
1653
           for (let a = 0; a < this.curPrescriptions.advices.length; a++) {
1653
           for (let a = 0; a < this.curPrescriptions.advices.length; a++) {
1654
             total = total + this.curPrescriptions.advices[a].retail_price * this.curPrescriptions.advices[a].prescribing_number
1654
             total = total + this.curPrescriptions.advices[a].retail_price * this.curPrescriptions.advices[a].prescribing_number
1655
           }
1655
           }
1656
-          return Math.floor(total * 100) / 100
1656
+          return total.toFixed(4)
1657
         } else {
1657
         } else {
1658
           for (let a = 0; a < this.curPrescriptions.project.length; a++) {
1658
           for (let a = 0; a < this.curPrescriptions.project.length; a++) {
1659
             total = total + this.curPrescriptions.project[a].price * this.curPrescriptions.project[a].total
1659
             total = total + this.curPrescriptions.project[a].price * this.curPrescriptions.project[a].total
1660
           }
1660
           }
1661
-          return Math.floor(total * 100) / 100
1661
+          return total.toFixed(4)
1662
         }
1662
         }
1663
 
1663
 
1664
       },
1664
       },
1683
           }
1683
           }
1684
         }
1684
         }
1685
 
1685
 
1686
-        return Math.floor(total * 100) / 100
1686
+        return total.toFixed(4)
1687
       }, getMonthTotal() {
1687
       }, getMonthTotal() {
1688
         var total = 0
1688
         var total = 0
1689
         for (let i = 0; i < this.month_prescriptions.length; i++) {
1689
         for (let i = 0; i < this.month_prescriptions.length; i++) {
1705
           }
1705
           }
1706
         }
1706
         }
1707
 
1707
 
1708
-        return Math.floor(total * 100) / 100
1708
+        return total.toFixed(4)
1709
       },
1709
       },
1710
       createFilter(queryString) {
1710
       createFilter(queryString) {
1711
         return (restaurant) => {
1711
         return (restaurant) => {

+ 1 - 1
src/xt_pages/outpatientDoctorStation/template/printFour.vue View File

35
                   <div style="margin-left:100px;"><span>{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.count}}{{unit}}</span></div>
35
                   <div style="margin-left:100px;"><span>{{it.single_dose}}{{it.single_dose_unit}}&nbsp;×&nbsp; {{it.count}}{{unit}}</span></div>
36
               </div>
36
               </div>
37
               <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
37
               <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
38
-                <div class="drugsOne">{{it.project_id?it.project_id:""}}:&nbsp;{{it.price}}元/{{it.count}}次</div>
38
+                <div class="drugsOne">{{it.project_id?it.project_id:""}}:&nbsp;{{it.price.toFixed(4)}}元/{{it.count}}次</div>
39
                </div>
39
                </div>
40
                <div style="text-align:center;" >(以下空白)</div>
40
                <div style="text-align:center;" >(以下空白)</div>
41
 
41
 

+ 1 - 1
src/xt_pages/outpatientDoctorStation/template/printOne.vue View File

35
                   <div style="margin-left:100px;"><span>用法:{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.delivery_way}}</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
35
                   <div style="margin-left:100px;"><span>用法:{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.delivery_way}}</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
36
               </div>
36
               </div>
37
               <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
37
               <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
38
-                <div class="drugsOne">{{it.project_id?it.project_id:""}}:&nbsp;{{it.price}}元/{{it.count}}次</div>
38
+                <div class="drugsOne">{{it.project_id?it.project_id:""}}:&nbsp;{{it.price.toFixed(4)}}元/{{it.count}}次</div>
39
                </div>
39
                </div>
40
                <div style="text-align:center;" >(以下空白)</div>
40
                <div style="text-align:center;" >(以下空白)</div>
41
 
41
 

+ 2 - 2
src/xt_pages/outpatientDoctorStation/template/printThree.vue View File

43
                   <div style="margin-left:100px;"><span>用法:{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.execution_frequency}}&nbsp;{{it.delivery_way}}&nbsp;</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
43
                   <div style="margin-left:100px;"><span>用法:{{it.single_dose}}{{it.single_dose_unit}}</span>&nbsp;&nbsp;<span>{{it.execution_frequency}}&nbsp;{{it.delivery_way}}&nbsp;</span>&nbsp;&nbsp;<span>{{it.advice_desc}}</span></div>
44
               </div>
44
               </div>
45
               <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
45
               <div class="drugsBox" v-for="(it,i) in item.additionalcharge" :key="i">
46
-                <div class="drugsOne">{{it.item_name?it.item_name:""}}:&nbsp;{{it.price}}元/{{it.count}}次</div>
46
+                <div class="drugsOne">{{it.item_name?it.item_name:""}}:&nbsp;{{it.price.toFixed(4)}}元/{{it.count}}次</div>
47
               </div>
47
               </div>
48
 
48
 
49
               <!-- <div class="drugsBox" v-for="(it,index) in item.project" :key="index">
49
               <!-- <div class="drugsBox" v-for="(it,index) in item.project" :key="index">
129
       //   age++
129
       //   age++
130
       // }
130
       // }
131
       // return age
131
       // return age
132
-      var nowTime = new Date().getTime(); 
132
+      var nowTime = new Date().getTime();
133
       //一年毫秒数(365 * 86400000 = 31536000000)
133
       //一年毫秒数(365 * 86400000 = 31536000000)
134
       return Math.ceil((nowTime-(birthday * 1000))/31536000000);
134
       return Math.ceil((nowTime-(birthday * 1000))/31536000000);
135
     },
135
     },

+ 1 - 1
src/xt_pages/outpatientDoctorStation/template/printTwo.vue View File

35
             <p>配对:</p>
35
             <p>配对:</p>
36
             <p>核对:{{getDoctor(advicePrint[0].checker)?getDoctor(advicePrint[0].checker):""}}</p>
36
             <p>核对:{{getDoctor(advicePrint[0].checker)?getDoctor(advicePrint[0].checker):""}}</p>
37
             <p>发药:{{getDoctor(advicePrint[0].execution_staff)?getDoctor(advicePrint[0].execution_staff):""}}</p>
37
             <p>发药:{{getDoctor(advicePrint[0].execution_staff)?getDoctor(advicePrint[0].execution_staff):""}}</p>
38
-            <p>药费:{{advicePrint[0].price?advicePrint[0].price:""}}</p>
38
+            <p>药费:{{advicePrint[0].price.toFixed(4)?advicePrint[0].price.toFixed(4):""}}</p>
39
         </div>
39
         </div>
40
     </div>
40
     </div>
41
 </template>
41
 </template>

+ 2 - 2
src/xt_pages/outpatientDoctorStation/treatTemplate/printOne.vue View File

54
                         <td>{{it.type == 2 ? it.project.project_name : it.good_info.good_name}}</td>
54
                         <td>{{it.type == 2 ? it.project.project_name : it.good_info.good_name}}</td>
55
                         <td>{{it.count}}</td>
55
                         <td>{{it.count}}</td>
56
                         <td>{{getUnit(it.unit)}}</td>
56
                         <td>{{getUnit(it.unit)}}</td>
57
-                        <td>{{it.price}}</td>
57
+                        <td>{{it.price.toFixed(4)}}</td>
58
                         <td></td>
58
                         <td></td>
59
                         <td>{{it.remark}}</td>
59
                         <td>{{it.remark}}</td>
60
                         <td>{{it.day}}</td>
60
                         <td>{{it.day}}</td>
66
                         <td>{{it.advice_name?it.advice_name:''}}</td>
66
                         <td>{{it.advice_name?it.advice_name:''}}</td>
67
                         <td>{{it.single_dose?it.single_dose:''}}</td>
67
                         <td>{{it.single_dose?it.single_dose:''}}</td>
68
                         <td>{{it.single_dose_unit?it.single_dose_unit:''}}</td>
68
                         <td>{{it.single_dose_unit?it.single_dose_unit:''}}</td>
69
-                        <td>{{it.price}}</td>
69
+                        <td>{{it.price.toFixed(4)}}</td>
70
                         <td></td>
70
                         <td></td>
71
                         <td>{{it.remark}}</td>
71
                         <td>{{it.remark}}</td>
72
                         <td>{{it.day}}</td>
72
                         <td>{{it.day}}</td>

+ 4 - 1
src/xt_pages/outpatientTool/components/detail.vue View File

231
                   if (orders[b].order_info[c].advice_id == 0 && orders[b].order_info[c].project_id > 0) {
231
                   if (orders[b].order_info[c].advice_id == 0 && orders[b].order_info[c].project_id > 0) {
232
                     newObj['type'] = 2
232
                     newObj['type'] = 2
233
                     newObj['item_id'] = orders[b].order_info[c].project.project_id
233
                     newObj['item_id'] = orders[b].order_info[c].project.project_id
234
-                    newObj['item_name'] = orders[b].order_info[c].project.project.project_name
235
 
234
 
236
                     if (orders[b].order_info[c].project.type == 2) {
235
                     if (orders[b].order_info[c].project.type == 2) {
237
                       newObj['item_spec'] =""
236
                       newObj['item_spec'] =""
237
+                      newObj['item_name'] = orders[b].order_info[c].project.project.project_name
238
+
238
 
239
 
239
                     } else if (orders[b].order_info[c].project.type == 3) {
240
                     } else if (orders[b].order_info[c].project.type == 3) {
240
                       newObj['item_spec'] =    orders[b].order_info[c].project.good_info.specification_name
241
                       newObj['item_spec'] =    orders[b].order_info[c].project.good_info.specification_name
242
+                      newObj['item_name'] = orders[b].order_info[c].project.good_info.good_name
243
+
241
 
244
 
242
                     }
245
                     }
243
                   }
246
                   }

+ 4 - 4
src/xt_pages/outpatientTool/components/settle.vue View File

80
               </template>
80
               </template>
81
           </el-table-column>
81
           </el-table-column>
82
           <el-table-column align="center" prop="item_name" label="医疗费总额">
82
           <el-table-column align="center" prop="item_name" label="医疗费总额">
83
-              <template slot-scope="scope">{{scope.row.medfee_sumamt}}</template>
83
+              <template slot-scope="scope">{{scope.row.medfee_sumamt.toFixed(4)}}</template>
84
           </el-table-column>
84
           </el-table-column>
85
           <el-table-column align="center" prop="item_name" label="基金支付金额">
85
           <el-table-column align="center" prop="item_name" label="基金支付金额">
86
-              <template slot-scope="scope">{{scope.row.fund_pay_sumamt}}</template>
86
+              <template slot-scope="scope">{{scope.row.fund_pay_sumamt.toFixed(4)}}</template>
87
           </el-table-column>
87
           </el-table-column>
88
           <el-table-column align="center" prop="item_name" label="个人账户支付金额">
88
           <el-table-column align="center" prop="item_name" label="个人账户支付金额">
89
-              <template slot-scope="scope">{{scope.row.acct_pay}}</template>
89
+              <template slot-scope="scope">{{scope.row.acct_pay.toFixed(4)}}</template>
90
           </el-table-column>
90
           </el-table-column>
91
           <el-table-column align="center" prop="item_name" label="个人支付金额">
91
           <el-table-column align="center" prop="item_name" label="个人支付金额">
92
-              <template slot-scope="scope">{{scope.row.psn_cash_pay}}</template>
92
+              <template slot-scope="scope">{{scope.row.psn_cash_pay.toFixed(4)}}</template>
93
           </el-table-column>
93
           </el-table-column>
94
           <el-table-column align="center" prop="total" label="费用总额">
94
           <el-table-column align="center" prop="total" label="费用总额">
95
               <template slot-scope="scope">
95
               <template slot-scope="scope">