Commit 611ffd12 authored by 英思-陈欢's avatar 英思-陈欢

fix bug

parent de6c9b58
<template> <template>
<view class="container"> <view class="container">
<view class="content"> <view class="content">
<view class="list" v-for="(item, index) in list" :key="index"> <view class="list">
<view class="list-item u-flex u-flex-between u-flex-items-center"> <view class="list-item u-flex u-flex-between u-flex-items-center">
<text>个人账户支付</text> <text>个人账户支付</text>
<view class="u-flex u-flex-center u-flex-items-center"> <view class="u-flex u-flex-center u-flex-items-center">
{{ item.acctPaySumAmt }} {{ detail.acctPaySumAmt || 0}}
</view> </view>
</view> </view>
<view class="list-item u-flex u-flex-between u-flex-items-center"> <view class="list-item u-flex u-flex-between u-flex-items-center">
<text>统筹基金支付</text> <text>统筹基金支付</text>
<view class="u-flex u-flex-center u-flex-items-center"> <view class="u-flex u-flex-center u-flex-items-center">
{{ item.hifpPaySumAmt }} {{ detail.hifpPaySumAmt || 0 }}
</view> </view>
</view> </view>
<view class="list-item u-flex u-flex-between u-flex-items-center"> <view class="list-item u-flex u-flex-between u-flex-items-center">
<text>现金支付</text> <text>现金支付</text>
<view class="u-flex u-flex-center u-flex-items-center"> <view class="u-flex u-flex-center u-flex-items-center">
{{ item.cashPaySumAmt }} {{ detail.cashPaySumAmt || 0 }}
</view> </view>
</view> </view>
<view class="list-item u-flex u-flex-between u-flex-items-center"> <view class="list-item u-flex u-flex-between u-flex-items-center">
<text>公务员基金支付</text> <text>公务员基金支付</text>
<view class="u-flex u-flex-center u-flex-items-center"> <view class="u-flex u-flex-center u-flex-items-center">
{{ item.cvlservPaySumAmt }} {{ detail.cvlservPaySumAmt || 0 }}
</view> </view>
</view> </view>
<view class="list-item u-flex u-flex-between u-flex-items-center"> <view class="list-item u-flex u-flex-between u-flex-items-center">
<text>补充医疗保险基金支出</text> <text>补充医疗保险基金支出</text>
<view class="u-flex u-flex-center u-flex-items-center"> <view class="u-flex u-flex-center u-flex-items-center">
{{ item.hifesPaySumAmt }} {{ detail.hifesPaySumAmt || 0 }}
</view> </view>
</view> </view>
<view class="list-item u-flex u-flex-between u-flex-items-center"> <view class="list-item u-flex u-flex-between u-flex-items-center">
<text>大病补充医疗保险基金支出</text> <text>大病补充医疗保险基金支出</text>
<view class="u-flex u-flex-center u-flex-items-center"> <view class="u-flex u-flex-center u-flex-items-center">
{{ item.hifmiPaySumAmt }} {{ detail.hifmiPaySumAmt || 0 }}
</view> </view>
</view> </view>
<view class="list-item u-flex u-flex-between u-flex-items-center"> <view class="list-item u-flex u-flex-between u-flex-items-center">
<text>大额医疗补助基金支出</text> <text>大额医疗补助基金支出</text>
<view class="u-flex u-flex-center u-flex-items-center"> <view class="u-flex u-flex-center u-flex-items-center">
{{ item.hifobPaySumAmt }} {{ detail.hifobPaySumAmt || 0 }}
</view> </view>
</view> </view>
<view class="list-item u-flex u-flex-between u-flex-items-center"> <view class="list-item u-flex u-flex-between u-flex-items-center">
<text>伤残人员医疗保障基金支出</text> <text>伤残人员医疗保障基金支出</text>
<view class="u-flex u-flex-center u-flex-items-center"> <view class="u-flex u-flex-center u-flex-items-center">
{{ item.hifdmPaySumAmt }} {{ detail.hifdmPaySumAmt || 0 }}
</view> </view>
</view> </view>
<view class="list-item u-flex u-flex-between u-flex-items-center"> <view class="list-item u-flex u-flex-between u-flex-items-center">
<text>医疗救助基金支出</text> <text>医疗救助基金支出</text>
<view class="u-flex u-flex-center u-flex-items-center"> <view class="u-flex u-flex-center u-flex-items-center">
{{ item.mafPaySumAmt }} {{ detail.mafPaySumAmt || 0 }}
</view> </view>
</view> </view>
<view class="list-item u-flex u-flex-between u-flex-items-center"> <view class="list-item u-flex u-flex-between u-flex-items-center">
<text>符合范围</text> <text>符合范围</text>
<view class="u-flex u-flex-center u-flex-items-center"> <view class="u-flex u-flex-center u-flex-items-center">
{{ item.inscpAmt }} {{ detail.inscpAmt || 0 }}
</view> </view>
</view> </view>
<view class="list-item u-flex u-flex-between u-flex-items-center"> <view class="list-item u-flex u-flex-between u-flex-items-center">
<text>医疗费用总额</text> <text>医疗费用总额</text>
<view class="u-flex u-flex-center u-flex-items-center"> <view class="u-flex u-flex-center u-flex-items-center">
{{ item.medfeeSumamt }} {{ detail.medfeeSumamt || 0 }}
</view> </view>
</view> </view>
<view class="list-item u-flex u-flex-between u-flex-items-center"> <view class="list-item u-flex u-flex-between u-flex-items-center">
<text>基金支付金额</text> <text>基金支付金额</text>
<view class="u-flex u-flex-center u-flex-items-center"> <view class="u-flex u-flex-center u-flex-items-center">
{{ item.fundPaySumamt }} {{ detail.fundPaySumamt || 0 }}
</view> </view>
</view> </view>
<view class="list-item u-flex u-flex-between u-flex-items-center"> <view class="list-item u-flex u-flex-between u-flex-items-center">
<text>个人自付金额</text> <text>个人自付金额</text>
<view class="u-flex u-flex-center u-flex-items-center"> <view class="u-flex u-flex-center u-flex-items-center">
{{ item.personPaySumamt }} {{ detail.personPaySumamt || 0 }}
</view> </view>
</view> </view>
</view> </view>
...@@ -93,8 +93,7 @@ ...@@ -93,8 +93,7 @@
data() { data() {
return { return {
form: {} as any, form: {} as any,
list: [], detail: {} as any,
total: 0
} }
}, },
onLoad(options: any) { onLoad(options: any) {
...@@ -102,11 +101,11 @@ ...@@ -102,11 +101,11 @@
this.getList(); this.getList();
}, },
methods: { methods: {
getList(type = '') { getList() {
Api.foo.queryYearsBill(this.form).then((res: any) => { Api.foo.queryYearsBill(this.form).then((res: any) => {
if (type == 'loadmore') { if (res) {
this.list = [...this.list, ...res.list] as any; this.detail = res;
} else if (!res || res.list.length == 0) { } else {
xma.showModal({ xma.showModal({
title: '暂无数据', title: '暂无数据',
showCancel: false, showCancel: false,
...@@ -117,19 +116,10 @@ ...@@ -117,19 +116,10 @@
}) })
} }
}) })
} else {
this.list = res.list;
} }
this.total = res.totalCount;
}) })
}, },
}, },
onReachBottom() {
if (this.total > this.list.length) {
this.form.pageNum += 1;
this.getList('loadmore');
}
}
}); });
</script> </script>
......
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import Api from '@/services/index'; import Api from '@/services/index';
import { getKeyValue, getAreaName } from '@/common/util.js' import { getKeyValue, getAreaName, formatTime } from '@/common/util.js'
export default Vue.extend({ export default Vue.extend({
data() { data() {
...@@ -110,10 +110,10 @@ ...@@ -110,10 +110,10 @@
methods: { methods: {
getList(type = '') { getList(type = '') {
Api.foo.drugCatalog(this.form).then((res: any) => { Api.foo.drugCatalog(this.form).then((res: any) => {
// res.list.forEach((item: any) => { res.list.forEach((item: any) => {
// item.begntime = item.begntime?formatTime(item.begntime) : item.begntime; item.begndate = item.begndate?formatTime(item.begndate) : item.begndate;
// item.endtime = item.endtime?formatTime(item.endtime) : item.endtime; item.enddate = item.enddate?formatTime(item.enddate) : item.enddate;
// }) })
if (type == 'loadmore') { if (type == 'loadmore') {
this.list = [...this.list, ...res.list] as any; this.list = [...this.list, ...res.list] as any;
} else if (!res || res.list.length == 0) { } else if (!res || res.list.length == 0) {
......
...@@ -69,7 +69,6 @@ ...@@ -69,7 +69,6 @@
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
}, },
list: [1, 2],
} }
}, },
onLoad() { onLoad() {
......
...@@ -146,7 +146,7 @@ ...@@ -146,7 +146,7 @@
this.getList(); this.getList();
}, },
methods: { methods: {
getList(type = '') { getList() {
Api.foo.paymentProgress(this.form).then((res: any) => { Api.foo.paymentProgress(this.form).then((res: any) => {
if (!res || res.length == 0) { if (!res || res.length == 0) {
xma.showModal({ xma.showModal({
......
...@@ -56,7 +56,6 @@ ...@@ -56,7 +56,6 @@
insutype: '', insutype: '',
insuAdmdvs: '', insuAdmdvs: '',
}, },
list: [1, 2],
} }
}, },
onLoad() { onLoad() {
......
...@@ -51,7 +51,6 @@ ...@@ -51,7 +51,6 @@
year: '', year: '',
}, },
identTypeOptions: getApp().globalData!.certTypeOptions, identTypeOptions: getApp().globalData!.certTypeOptions,
list: [],
} }
}, },
onLoad() { onLoad() {
......
<template> <template>
<view class="container"> <view class="container">
<view class="content"> <view class="content">
<view class="list" v-for="(item, index) in list" :key="index"> <view class="list">
<view class="name list-item u-flex u-flex-items-center"> <!-- <view class="name list-item u-flex u-flex-items-center">
<image src="@/static/images/tax.png"></image> <image src="@/static/images/tax.png"></image>
<!-- <text>9009900000000</text> --> <text>9009900000000</text>
</view> </view> -->
<view class="list-item u-flex u-flex-between u-flex-items-center"> <view class="list-item u-flex u-flex-between u-flex-items-center">
<text>个人账户支付</text> <text>个人账户支付</text>
<view class="u-flex u-flex-center u-flex-items-center"> <view class="u-flex u-flex-center u-flex-items-center">
{{ item.acctPaySumAmt }} {{ detail.acctPaySumAmt }}
</view> </view>
</view> </view>
<view class="list-item u-flex u-flex-between u-flex-items-center"> <view class="list-item u-flex u-flex-between u-flex-items-center">
<text>统筹基金支付</text> <text>统筹基金支付</text>
<view class="u-flex u-flex-center u-flex-items-center" style="margin-right: 23rpx"> <view class="u-flex u-flex-center u-flex-items-center" style="margin-right: 23rpx">
{{ item.hifpPaySumAmt }} {{ detail.hifpPaySumAmt }}
</view> </view>
</view> </view>
<view class="list-item u-flex u-flex-between u-flex-items-center"> <view class="list-item u-flex u-flex-between u-flex-items-center">
<text>现金支付</text> <text>现金支付</text>
<view class="u-flex u-flex-center u-flex-items-center" style="margin-right: 23rpx"> <view class="u-flex u-flex-center u-flex-items-center" style="margin-right: 23rpx">
{{ item.cashPaySumAmt }} {{ detail.cashPaySumAmt }}
</view> </view>
</view> </view>
<view class="list-item u-flex u-flex-between u-flex-items-center"> <view class="list-item u-flex u-flex-between u-flex-items-center">
<text>公务员基金支付</text> <text>公务员基金支付</text>
<view class="u-flex u-flex-center u-flex-items-center" style="margin-right: 23rpx"> <view class="u-flex u-flex-center u-flex-items-center" style="margin-right: 23rpx">
{{ item.cvlservPaySumAmt }} {{ detail.cvlservPaySumAmt }}
</view> </view>
</view> </view>
<view class="list-item u-flex u-flex-between u-flex-items-center"> <view class="list-item u-flex u-flex-between u-flex-items-center">
<text>补充医疗保险基金支出</text> <text>补充医疗保险基金支出</text>
<view class="u-flex u-flex-center u-flex-items-center" style="margin-right: 23rpx"> <view class="u-flex u-flex-center u-flex-items-center" style="margin-right: 23rpx">
{{ item.hifesPaySumAmt }} {{ detail.hifesPaySumAmt }}
</view> </view>
</view> </view>
<view class="list-item u-flex u-flex-between u-flex-items-center"> <view class="list-item u-flex u-flex-between u-flex-items-center">
<text>大病补充医疗保险基金支出</text> <text>大病补充医疗保险基金支出</text>
<view class="u-flex u-flex-center u-flex-items-center"> <view class="u-flex u-flex-center u-flex-items-center">
{{ item.hifmiPaySumAmt }} {{ detail.hifmiPaySumAmt }}
</view> </view>
</view> </view>
<view class="list-item u-flex u-flex-between u-flex-items-center"> <view class="list-item u-flex u-flex-between u-flex-items-center">
<text>大额医疗补助基金支出</text> <text>大额医疗补助基金支出</text>
<view class="u-flex u-flex-center u-flex-items-center"> <view class="u-flex u-flex-center u-flex-items-center">
{{ item.hifobPaySumAmt }} {{ detail.hifobPaySumAmt }}
</view> </view>
</view> </view>
<view class="list-item u-flex u-flex-between u-flex-items-center"> <view class="list-item u-flex u-flex-between u-flex-items-center">
<text>伤残人员医疗保障基金支出</text> <text>伤残人员医疗保障基金支出</text>
<view class="u-flex u-flex-center u-flex-items-center"> <view class="u-flex u-flex-center u-flex-items-center">
{{ item.hifdmPaySumAmt }} {{ detail.hifdmPaySumAmt }}
</view> </view>
</view> </view>
<view class="list-item u-flex u-flex-between u-flex-items-center"> <view class="list-item u-flex u-flex-between u-flex-items-center">
<text>医疗救助基金支出</text> <text>医疗救助基金支出</text>
<view class="u-flex u-flex-center u-flex-items-center"> <view class="u-flex u-flex-center u-flex-items-center">
{{ item.mafPaySumAmt }} {{ detail.mafPaySumAmt }}
</view> </view>
</view> </view>
<view class="list-item u-flex u-flex-between u-flex-items-center"> <view class="list-item u-flex u-flex-between u-flex-items-center">
<text>符合范围</text> <text>符合范围</text>
<view class="u-flex u-flex-center u-flex-items-center"> <view class="u-flex u-flex-center u-flex-items-center">
{{ item.inscpAmt }} {{ detail.inscpAmt }}
</view> </view>
</view> </view>
<view class="list-item u-flex u-flex-between u-flex-items-center"> <view class="list-item u-flex u-flex-between u-flex-items-center">
<text>医疗费用总额</text> <text>医疗费用总额</text>
<view class="u-flex u-flex-center u-flex-items-center"> <view class="u-flex u-flex-center u-flex-items-center">
{{ item.medfeeSumamt }} {{ detail.medfeeSumamt }}
</view> </view>
</view> </view>
<view class="list-item u-flex u-flex-between u-flex-items-center"> <view class="list-item u-flex u-flex-between u-flex-items-center">
<text>基金支付金额</text> <text>基金支付金额</text>
<view class="u-flex u-flex-center u-flex-items-center"> <view class="u-flex u-flex-center u-flex-items-center">
{{ item.fundPaySumamt }} {{ detail.fundPaySumamt }}
</view> </view>
</view> </view>
<view class="list-item u-flex u-flex-between u-flex-items-center"> <view class="list-item u-flex u-flex-between u-flex-items-center">
<text>个人自付金额</text> <text>个人自付金额</text>
<view class="u-flex u-flex-center u-flex-items-center"> <view class="u-flex u-flex-center u-flex-items-center">
{{ item.personPaySumamt }} {{ detail.personPaySumamt }}
</view> </view>
</view> </view>
</view> </view>
...@@ -97,8 +97,7 @@ export default Vue.extend({ ...@@ -97,8 +97,7 @@ export default Vue.extend({
data() { data() {
return { return {
form: {} as any, form: {} as any,
list: [], detail: {} as any,
total: 0
} }
}, },
onLoad(options: any) { onLoad(options: any) {
...@@ -109,7 +108,7 @@ export default Vue.extend({ ...@@ -109,7 +108,7 @@ export default Vue.extend({
getList(type = '') { getList(type = '') {
Api.foo.queryYearsBill(this.form).then((res: any) => { Api.foo.queryYearsBill(this.form).then((res: any) => {
if (res) { if (res) {
this.list = [res] as any this.detail = res
} else { } else {
xma.showModal({ xma.showModal({
title: '暂无数据', title: '暂无数据',
...@@ -122,22 +121,9 @@ export default Vue.extend({ ...@@ -122,22 +121,9 @@ export default Vue.extend({
} }
}) })
} }
// console.log(this.list)
// if (type == 'loadmore') {
// this.list = [...this.list, ...res.list] as any;
// } else {
// this.list = res.list;
// }
// this.total = res.recordCounts;
}) })
} }
}, },
onReachBottom() {
// if (this.total > this.list.length) {
// this.form.pageNum += 1
// this.getList('loadmore')
// }
}
}) })
</script> </script>
......
...@@ -75,11 +75,11 @@ ...@@ -75,11 +75,11 @@
methods: { methods: {
getList(type = '') { getList(type = '') {
Api.foo.medicalOrgQuery(this.form).then((res: any) => { Api.foo.medicalOrgQuery(this.form).then((res: any) => {
res.list.forEach((item: any) => {
item.begntime = item.begntime?formatTime(item.begntime) : item.begntime;
item.endtime = item.endtime?formatTime(item.endtime) : item.endtime;
})
if (type == 'loadmore') { if (type == 'loadmore') {
res.list.forEach((item: any) => {
item.begntime = item.begntime?formatTime(item.begntime) : item.begntime;
item.endtime = item.endtime?formatTime(item.endtime) : item.endtime;
})
this.list = [...this.list, ...res.list] as any; this.list = [...this.list, ...res.list] as any;
} else if (!res || res.list.length == 0) { } else if (!res || res.list.length == 0) {
xma.showModal({ xma.showModal({
...@@ -93,6 +93,10 @@ ...@@ -93,6 +93,10 @@
} }
}) })
} else { } else {
res.list.forEach((item: any) => {
item.begntime = item.begntime?formatTime(item.begntime) : item.begntime;
item.endtime = item.endtime?formatTime(item.endtime) : item.endtime;
})
this.list = res.list; this.list = res.list;
} }
this.total = res.totalCount; this.total = res.totalCount;
......
...@@ -64,10 +64,10 @@ ...@@ -64,10 +64,10 @@
methods: { methods: {
getList(type = '') { getList(type = '') {
Api.foo.residentPaymentProgress(this.form).then((res: any) => { Api.foo.residentPaymentProgress(this.form).then((res: any) => {
res.list.forEach((item: any) => {
item.clctTime = formatTime(item.clctTime)
})
if (type == 'loadmore') { if (type == 'loadmore') {
res.list.forEach((item: any) => {
item.clctTime = item.clctTime ? formatTime(item.clctTime) : item.clctTime;
})
this.list = [...this.list, ...res.list] as any; this.list = [...this.list, ...res.list] as any;
} else if (!res || res.list.length == 0) { } else if (!res || res.list.length == 0) {
xma.showModal({ xma.showModal({
...@@ -81,6 +81,9 @@ ...@@ -81,6 +81,9 @@
} }
}) })
} else { } else {
res.list.forEach((item: any) => {
item.clctTime = item.clctTime ? formatTime(item.clctTime) : item.clctTime;
})
this.list = res.list; this.list = res.list;
} }
this.total = res.totalCount; this.total = res.totalCount;
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
export default Vue.extend({ export default Vue.extend({
data() { data() {
return { return {
str: '1212121212232344', str: '',
strr: '', strr: '',
strr2: '', strr2: '',
form: { form: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment