2 Commits ba1f934da0 ... 2ff4b2c9d6

Author SHA1 Message Date
  陈少旭 2ff4b2c9d6 Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch 6 days ago
  陈少旭 dab885ca10 1111 6 days ago

+ 3 - 1
src/xt_pages/outpatientCharges/outpatientChargesManagement.vue View File

@@ -1199,6 +1199,7 @@ export default {
1199 1199
         { value: '1111', label: '精一' },
1200 1200
         { value: '1112', label: '精二' },
1201 1201
         { value: '1112', label: '精二' },
1202
+        { value: '999999', label: '自费' },
1202 1203
         { value: '118801', label: '118801' },
1203 1204
 
1204 1205
 
@@ -1249,7 +1250,8 @@ export default {
1249 1250
         { value: '1402', label: '门诊特殊病(1402)' },
1250 1251
         { value: '1401', label: '门诊慢性病(1401)' },
1251 1252
         { value: '2302', label: '异地就医(2302)' },
1252
-        { value: '0', label: '自费' },
1253
+        // { value: '0', label: '自费' },
1254
+        { value: '999999', label: '自费' },
1253 1255
         { value: '118801', label: '118801' },
1254 1256
 
1255 1257
 

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

@@ -134,7 +134,8 @@
134 134
               </div>
135 135
               <div class="actionBar">
136 136
                   <div>收费员:{{info.charge_admin.user_name}}</div>
137
-                  <div>日期:{{info.setl_time ? info.setl_time.split(' ')[0] : ''}}</div>
137
+<!--                  <div>日期:{{info.setl_time ? info.setl_time.split(' ')[0] : ''}}</div>-->
138
+                 <div>日期:{{getTime(balanceAccounts.order.settle_accounts_date,"{y}-{m}-{d}")?getTime(balanceAccounts.order.settle_accounts_date,"{y}-{m}-{d}"):""}}</div>
138 139
               </div>
139 140
           </div>
140 141
 

+ 5 - 3
src/xt_pages/outpatientCharges/summary.vue View File

@@ -206,7 +206,7 @@
206 206
         </el-table-column>
207 207
         <el-table-column align="center" width="80" prop="name" label="实收金额">
208 208
           <template slot-scope="scope">{{
209
-              scope.row.medfee_sumamt.toFixed(2)
209
+              scope.row.medfee_sumamt.toFixed(2) - scope.row.discount_price.toFixed(2) -     scope.row.preferential_price.toFixed(2)
210 210
             }}
211 211
           </template>
212 212
         </el-table-column>
@@ -3524,7 +3524,9 @@ export default {
3524 3524
               参保号: order.his_patient.id_card_no,
3525 3525
               属地名称: insuplc_admdvs_name,
3526 3526
               应收金额: order.medfee_sumamt,
3527
-              实收金额: order.medfee_sumamt,
3527
+              // scope.row.medfee_sumamt.toFixed(2) - scope.row.discount_price.toFixed(2) -     scope.row.preferential_price.toFixed(2)
3528
+
3529
+              实收金额: order.medfee_sumamt - order.discount_price -  order.preferential_price,
3528 3530
               医保统筹金额: order.hifp_pay,
3529 3531
               大额基金金额: order.hifob_pay,
3530 3532
               大病基金金额: order.hifmi_pay,
@@ -3557,7 +3559,7 @@ export default {
3557 3559
               参保所属医保区划: order.his_patient.insuplc_admdvs,
3558 3560
               参保号: order.his_patient.id_card_no,
3559 3561
               应收金额: order.medfee_sumamt,
3560
-              实收金额: order.medfee_sumamt,
3562
+              实收金额: order.medfee_sumamt - order.discount_price -  order.preferential_price,
3561 3563
               医保统筹金额: order.hifp_pay,
3562 3564
               大额基金金额: order.hifob_pay,
3563 3565
               大病基金金额: order.hifmi_pay,