4 Commits 2f59b857ee ... 8c5ae64e67

Author SHA1 Message Date
  陈少旭 8c5ae64e67 Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch 1 month ago
  陈少旭 82b8689f09 1111 1 month ago
  陈少旭 57a66f323d Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch 1 month ago
  陈少旭 3664d421c6 1111 1 month ago

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

@@ -296,7 +296,7 @@
296 296
             <div v-if="scope.row.order_status == 3">已退费</div>
297 297
           </template>
298 298
         </el-table-column>
299
-        <el-table-column align="center" width="" prop="name" label="操作">
299
+        <el-table-column align="center" width="" prop="name" label="操作"  fixed="right">
300 300
           <template slot-scope="scope">
301 301
             <el-button class="butt_1" size="mini" type="primary" @click="toDetail(scope.row)"
302 302
             >详情
@@ -2073,7 +2073,7 @@ export default {
2073 2073
           var tarList = []
2074 2074
           for (let i = 0; i < list.length; i++) {
2075 2075
             let obj = {
2076
-              '周期': '2024年第季度',
2076
+              '周期': '2024年第季度',
2077 2077
               '类别': '门诊',
2078 2078
               '医保目录编码': list[i].code,
2079 2079
               '医保目录名称': list[i].name,

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

@@ -117,6 +117,7 @@
117 117
                   <div v-if="scope.row.med_type == '11'">普通门诊</div>
118 118
                   <div v-if="scope.row.med_type == '1112'">普通门诊</div>
119 119
                   <div v-if="scope.row.med_type == '140104'">城乡门诊特殊病(140104)</div>
120
+                <div v-if="scope.row.med_type == '140201'">门诊特病(140201)</div>
120 121
                   <div v-if="scope.row.med_type == '992102'">单病种(992102)</div>
121 122
               </template>
122 123
           </el-table-column>
@@ -297,7 +298,9 @@
297 298
           <div v-if="scope.row.med_type == '14'">门诊特殊病</div>
298 299
           <div v-if="scope.row.med_type == '11'">普通门诊</div>
299 300
           <div v-if="scope.row.med_type == '1112'">普通门诊</div>
300
-
301
+          <div v-if="scope.row.med_type == '140104'">门诊特殊病(140104)</div>
302
+          <div v-if="scope.row.med_type == '140201'">门诊特病(140201)</div>
303
+          <div v-if="scope.row.med_type == '992102'">单病种(992102)</div>
301 304
         </template>
302 305
       </el-table-column>
303 306
       <el-table-column align="center" prop="medfee_sumamt" label="医疗费总额">
@@ -689,11 +692,11 @@ import { uParseTime } from '@/utils/tools'
689 692
             return
690 693
           }
691 694
           const values = data.map(item => Number(item[column.property]))
692
-          if (column.property === 'total' || column.property === 'medfee_sumamt'  || column.property === 'fund_pay_sumamt'  || 
693
-              column.property === 'acct_pay'  || column.property === 'maf_pay'  || column.property === 'psn_cash_pay'  || 
694
-              column.property === 'hifp_pay'  || column.property === 'hifob_pay' ||  column.property === 'hifes_pay' || 
695
-              column.property === 'hifmi_pay' || column.property === 'oth_pay' || column.property === 'cvlserv_pay' || 
696
-              column.property === 'wechat_pay' || column.property === 'ali_pay' || column.property === 'band_card_pay' || 
695
+          if (column.property === 'total' || column.property === 'medfee_sumamt'  || column.property === 'fund_pay_sumamt'  ||
696
+              column.property === 'acct_pay'  || column.property === 'maf_pay'  || column.property === 'psn_cash_pay'  ||
697
+              column.property === 'hifp_pay'  || column.property === 'hifob_pay' ||  column.property === 'hifes_pay' ||
698
+              column.property === 'hifmi_pay' || column.property === 'oth_pay' || column.property === 'cvlserv_pay' ||
699
+              column.property === 'wechat_pay' || column.property === 'ali_pay' || column.property === 'band_card_pay' ||
697 700
               column.property === 'jifen_pay' || column.property === 'cash_pay' || column.property ==='card_desc'
698 701
           ) {
699 702
             sums[index] = values.reduce((prev, curr) => {