Skip to content

hrs_app_h5 / bill

Go to a project
Commit 2813f70b by 展昭
Options

更改数据显示格式

parent 857efe18
Inline Side-by-side
Showing with 91 additions and 88 deletions
src/router/index.js
...@@ -21,7 +21,6 @@ const router = new VueRouter({ ...@@ -21,7 +21,6 @@ const router = new VueRouter({
path: "/test", path: "/test",
name: "test", name: "test",
component: () => import("@/views/test.vue") component: () => import("@/views/test.vue")
} }
], ],
scrollBehavior(to, from, savedPosition) { scrollBehavior(to, from, savedPosition) {
......
src/utils/filter.js
...@@ -18,3 +18,16 @@ Vue.filter('y-m-d', (e) => { ...@@ -18,3 +18,16 @@ Vue.filter('y-m-d', (e) => {
return ''; return '';
} }
}) })
Vue.filter('moneyNum', (e) => {
e = parseFloat(e);
if (e === 0) {
return '0.00';
}
if (e) {
return e.toFixed(2)
}
else {
return '';
}
})
src/views/Bill/index.vue
...@@ -25,11 +25,11 @@ ...@@ -25,11 +25,11 @@
<div class="header_content"> <div class="header_content">
<div class="fund"> <div class="fund">
<span>账户余额</span> <span>账户余额</span>
<i>{{data.balance}}</i> <i>{{data.balance|moneyNum}}</i>
</div> </div>
<div class="paid"> <div class="paid">
<span>待付金额</span> <span>待付金额</span>
<i class="paid_color">{{data.waitPay}}</i> <i class="paid_color">{{data.waitPay|moneyNum}}</i>
</div> </div>
</div> </div>
<div class="header_info"> <div class="header_info">
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
</div> </div>
<p> <p>
<span>托收金额</span> <span>托收金额</span>
<i>{{data.hosting.amount}}</i> <i>{{data.hosting.amount|moneyNum}}</i>
</p> </p>
</div> </div>
...@@ -66,11 +66,11 @@ ...@@ -66,11 +66,11 @@
</div> </div>
<p> <p>
<span>应付金额</span> <span>应付金额</span>
<i>{{data.socical.total}}</i> <i>{{data.socical.total|moneyNum}}</i>
</p> </p>
<p> <p>
<span>待付金额</span> <span>待付金额</span>
<i>{{data.socical.waitPay}}</i> <i>{{data.socical.waitPay|moneyNum}}</i>
</p> </p>
</div> </div>
<!--公积金代理 accumulation--> <!--公积金代理 accumulation-->
...@@ -81,11 +81,11 @@ ...@@ -81,11 +81,11 @@
</div> </div>
<p> <p>
<span>应付金额</span> <span>应付金额</span>
<i>{{data.fund.total}}</i> <i>{{data.fund.total|moneyNum}}</i>
</p> </p>
<p> <p>
<span>待付金额</span> <span>待付金额</span>
<i>{{data.fund.waitPay}}</i> <i>{{data.fund.waitPay|moneyNum}}</i>
</p> </p>
</div> </div>
<!--个税代理 income--> <!--个税代理 income-->
...@@ -96,11 +96,11 @@ ...@@ -96,11 +96,11 @@
</div> </div>
<p> <p>
<span>应付金额</span> <span>应付金额</span>
<i>{{data.tax.total}}</i> <i>{{data.tax.total|moneyNum}}</i>
</p> </p>
<p> <p>
<span>待付金额</span> <span>待付金额</span>
<i>{{data.tax.waitPay}}</i> <i>{{data.tax.waitPay|moneyNum}}</i>
</p> </p>
</div> </div>
<!--服务费 service--> <!--服务费 service-->
...@@ -111,11 +111,11 @@ ...@@ -111,11 +111,11 @@
</div> </div>
<p> <p>
<span>应付金额</span> <span>应付金额</span>
<i>{{data.service.total}}</i> <i>{{data.service.total|moneyNum}}</i>
</p> </p>
<p> <p>
<span>待付金额</span> <span>待付金额</span>
<i>{{data.service.waitPay}}</i> <i>{{data.service.waitPay|moneyNum}}</i>
</p> </p>
</div> </div>
<!--会员年费 vip--> <!--会员年费 vip-->
...@@ -126,11 +126,11 @@ ...@@ -126,11 +126,11 @@
</div> </div>
<p> <p>
<span>应付金额</span> <span>应付金额</span>
<i>{{data.annual.total}}</i> <i>{{data.annual.total|moneyNum}}</i>
</p> </p>
<p> <p>
<span>待付金额</span> <span>待付金额</span>
<i>{{data.annual.waitPay}}</i> <i>{{data.annual.waitPay|moneyNum}}</i>
</p> </p>
</div> </div>
<!--其他事务办理 general--> <!--其他事务办理 general-->
...@@ -141,11 +141,11 @@ ...@@ -141,11 +141,11 @@
</div> </div>
<p> <p>
<span>应付金额</span> <span>应付金额</span>
<i>{{data.other.total}}</i> <i>{{data.other.total|moneyNum}}</i>
</p> </p>
<p> <p>
<span>待付金额</span> <span>待付金额</span>
<i>{{data.other.waitPay}}</i> <i>{{data.other.waitPay|moneyNum}}</i>
</p> </p>
</div> </div>
</div> </div>
...@@ -155,7 +155,6 @@ ...@@ -155,7 +155,6 @@
</template> </template>
<script> <script>
import { Icon, Loading } from "vant"; import { Icon, Loading } from "vant";
import { TabHeader } from "@/components"; import { TabHeader } from "@/components";
import * as utils from "../../utils/common"; import * as utils from "../../utils/common";
......
src/views/Bill/record.vue
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<div class="list" v-for="(item, index) in dataList" :key="index"> <div class="list" v-for="(item, index) in dataList" :key="index">
<div class="title"> <div class="title">
<div class="title_info">{{ item.feeType }}</div> <div class="title_info">{{ item.feeType }}</div>
<i>{{ item.amount }}</i> <i>{{ item.amount |moneyNum}}</i>
</div> </div>
<p> <p>
<span>{{ item.dateTime }}</span> <span>{{ item.dateTime }}</span>
......
src/views/Bill/sociallist.vue
...@@ -7,11 +7,11 @@ ...@@ -7,11 +7,11 @@
<div class="header"> <div class="header">
<div class="content_left"> <div class="content_left">
<div class="title_info">应付总额</div> <div class="title_info">应付总额</div>
<div class="title_money">{{data.payment}}</div> <div class="title_money">{{data.payment|moneyNum}}</div>
</div> </div>
<div class="content_right"> <div class="content_right">
<div class="title_info">待付金额</div> <div class="title_info">待付金额</div>
<div class="title_money">{{data.waitPayment}}</div> <div class="title_money">{{data.waitPayment|moneyNum}}</div>
</div> </div>
</div> </div>
<div class="box"> <div class="box">
...@@ -22,11 +22,11 @@ ...@@ -22,11 +22,11 @@
</div> </div>
<p> <p>
<span>应付金额</span> <span>应付金额</span>
<i>{{item.payment}}</i> <i>{{item.payment|moneyNum}}</i>
</p> </p>
<p> <p>
<span>待付金额</span> <span>待付金额</span>
<i>{{item.waitPayment}}</i> <i>{{item.waitPayment|moneyNum}}</i>
</p> </p>
</div> </div>
</div> </div>
......
src/views/Bill/socialpayment.vue
...@@ -7,11 +7,11 @@ ...@@ -7,11 +7,11 @@
<div class="header"> <div class="header">
<div class="content_left"> <div class="content_left">
<div class="title_info">应付总额</div> <div class="title_info">应付总额</div>
<div class="title_money">{{data.payment}}</div> <div class="title_money">{{data.payment|moneyNum}}</div>
</div> </div>
<div class="content_right"> <div class="content_right">
<div class="title_info">待付金额</div> <div class="title_info">待付金额</div>
<div class="title_money">{{data.waitPayment}}</div> <div class="title_money">{{data.waitPayment|moneyNum}}</div>
</div> </div>
</div> </div>
<div class="box mt0" v-for="(item,index) in data.list" :key="index"> <div class="box mt0" v-for="(item,index) in data.list" :key="index">
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<div class="list" v-for="(ele,index) in item.list" :key="index"> <div class="list" v-for="(ele,index) in item.list" :key="index">
<div class="list_title"> <div class="list_title">
<div class="title">{{ele.employeeName}}</div> <div class="title">{{ele.employeeName}}</div>
<div class="list_title_money">{{ele.dueAmount}}</div> <div class="list_title_money">{{ele.dueAmount|moneyNum}}</div>
</div> </div>
<p> <p>
<span>{{ele.cityName}}</span> <span>{{ele.cityName}}</span>
......
src/views/More/detail.vue
<template> <template>
<div> <div>
<div class="header"> <div class="header">
<van-nav-bar :title="title" left-arrow/> <van-nav-bar :title="title" left-arrow />
</div> </div>
<div class="container"> <div class="container">
<div class="list" v-for="(item, index) in list" :key="index"> <div class="list" v-for="(item, index) in list" :key="index">
<div class="title"> <div class="title">
<div class="title_info">{{ item.orderName }}</div> <div class="title_info">{{ item.orderName }}</div>
<i>{{ item.dueAmount }}</i> <i>{{ item.dueAmount |moneyNum}}</i>
</div> </div>
<p> <p>
<span>截止扣费日期{{ item.dueDate|y-m-d }}</span> <span>截止扣费日期{{ item.dueDate|y-m-d }}</span>
...@@ -43,8 +43,8 @@ export default { ...@@ -43,8 +43,8 @@ export default {
mounted() { mounted() {
this.globalNavLeftArrowClick(this.navLeftArrowClick); this.globalNavLeftArrowClick(this.navLeftArrowClick);
const index = parseInt(this.$route.query.index); const index = parseInt(this.$route.query.index);
const name=this.$route.query.name; const name = this.$route.query.name;
this.title=name; this.title = name;
this.list = this.getMoreList[index].details; this.list = this.getMoreList[index].details;
} }
}; };
......
src/views/More/index.vue
...@@ -10,11 +10,11 @@ ...@@ -10,11 +10,11 @@
<div class="header_content"> <div class="header_content">
<div class="fund"> <div class="fund">
<span>账户余额</span> <span>账户余额</span>
<i>{{ summary.balance }}</i> <i>{{ summary.balance|moneyNum }}</i>
</div> </div>
<div class="paid"> <div class="paid">
<span>待付金额</span> <span>待付金额</span>
<i class="paid_color">{{ summary.waitPay }}</i> <i class="paid_color">{{ summary.waitPay|moneyNum }}</i>
</div> </div>
</div> </div>
<div class="header_info"> <div class="header_info">
...@@ -37,11 +37,11 @@ ...@@ -37,11 +37,11 @@
</div> </div>
<p> <p>
<span>应付金额</span> <span>应付金额</span>
<i>{{ item.totalAmount }}</i> <i>{{ item.totalAmount|moneyNum }}</i>
</p> </p>
<p> <p>
<span>待付金额</span> <span>待付金额</span>
<i>{{ item.waitPayAmount }}</i> <i>{{ item.waitPayAmount |moneyNum}}</i>
</p> </p>
</div> </div>
</div> </div>
......
src/views/OidcCallback.vue
...@@ -35,7 +35,6 @@ export default { ...@@ -35,7 +35,6 @@ export default {
}; };
let commonPms = GetCommonPms(); let commonPms = GetCommonPms();
let url = `${oidc_config.authority}/connect/token?${commonPms}`; let url = `${oidc_config.authority}/connect/token?${commonPms}`;
console.log("url=", url);
await axios await axios
.post(url, qs.stringify(pms)) .post(url, qs.stringify(pms))
.then( .then(
...@@ -62,11 +61,10 @@ export default { ...@@ -62,11 +61,10 @@ export default {
this.oidcSignInCallback() this.oidcSignInCallback()
.then(redirectPath => { .then(redirectPath => {
this.getOidcUser() this.getOidcUser()
.then(res => { .then(user => {
let urlsearch = redirectPath.split("?")[1]; let urlsearch = redirectPath.split("?")[1];
let appid = this.getQueryString(urlsearch, "appid"); let appid = this.getQueryString(urlsearch, "appid");
console.log("appid=", appid); this.getToken(user.access_token, appid, redirectPath);
this.getToken(res.access_token, appid, redirectPath);
}) })
.catch(err => { .catch(err => {
console.log("err=", err); console.log("err=", err);
......
src/views/ServiceFee/detail.vue
...@@ -7,27 +7,23 @@ ...@@ -7,27 +7,23 @@
<div class="header"> <div class="header">
<div class="content_left"> <div class="content_left">
<div class="title_info">应付总额</div> <div class="title_info">应付总额</div>
<div class="title_money">{{data.payment}}</div> <div class="title_money">{{data.payment|moneyNum}}</div>
</div> </div>
<div class="content_right"> <div class="content_right">
<div class="title_info">待付金额</div> <div class="title_info">待付金额</div>
<div class="title_money">{{data.waitPayment}}</div> <div class="title_money">{{data.waitPayment|moneyNum}}</div>
</div> </div>
</div> </div>
<div class="box mt0" v-for="(item,index) in data.list" :key="index"> <div class="box mt0" v-for="(item,index) in data.list" :key="index">
<div class="box-due">
<label class="label_time">截止扣费日期 {{item.dueDate|transDate}}</label> <label class="label_time">截止扣费日期 {{item.dueDate|transDate}}</label>
<span class="font-blue status">{{item.statusDesc}}</span>
</div>
<div class="list" v-for="(ele,index) in item.list" :key="index"> <div class="list" v-for="(ele,index) in item.list" :key="index">
<div class="list_title"> <div class="list_title">
<div class="title">{{ele.employeeName}}</div> <div class="title">{{ele.employeeName}}</div>
<div class="list_title_money">{{ele.dueAmount}}</div> <div class="list_title_money">{{ele.dueAmount|moneyNum}}</div>
</div> </div>
<p> <p>
<span>{{ele.cityName}}</span> <span>{{ele.cityName}}</span>
<i class>{{ele.desc}}</i> <i class="no_bill">{{ele.statusDesc}}</i>
</p> </p>
</div> </div>
</div> </div>
...@@ -36,8 +32,9 @@ ...@@ -36,8 +32,9 @@
</template> </template>
<script> <script>
import { Icon } from "vant";
import { Header } from "@/components"; import { Header } from "@/components";
import { Icon } from "vant";
import { mapGetters } from "vuex";
import dayjs from "dayjs"; import dayjs from "dayjs";
export default { export default {
components: { components: {
...@@ -46,25 +43,8 @@ export default { ...@@ -46,25 +43,8 @@ export default {
}, },
data() { data() {
return { return {
title: "服务费详情", title: "",
data: { data: {}
payment: 500.0,
waitPayment: 9999.0,
list: [
{
dueDate: "2020-11-20",
statusDesc: "未扣费",
list: [
{
employeeName: "杨俊",
dueAmount: 100.0,
cityName: "北京市 北京市",
desc: "社保/公积金"
}
]
}
]
}
}; };
}, },
filters: { filters: {
...@@ -82,22 +62,36 @@ export default { ...@@ -82,22 +62,36 @@ export default {
return value; return value;
} }
}, },
computed: {
...mapGetters(["getReceiptDetail", "getBeginDate"])
},
methods: { methods: {
getData() {
const index = this.$route.query.index;
if (
this.getReceiptDetail &&
JSON.stringify(this.getReceiptDetail) != {} &&
this.getReceiptDetail.list &&
this.getReceiptDetail.list.length > index
) {
this.data = this.getReceiptDetail.list[index];
this.title = this.data.groupName;
}
},
navLeftArrowClick() { navLeftArrowClick() {
this.$router.go(-1); this.$router.go(-1);
} }
}, },
mounted() { mounted() {
this.globalNavLeftArrowClick(this.navLeftArrowClick); this.globalNavLeftArrowClick(this.navLeftArrowClick);
this.getData();
} }
}; };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.contener { .contener {
.font-blue { background: rgba(245, 247, 250, 1);
color: #007aec;
}
.header { .header {
height: 98px; height: 98px;
padding: 0 16px; padding: 0 16px;
...@@ -127,19 +121,20 @@ export default { ...@@ -127,19 +121,20 @@ export default {
} }
} }
.box { .box {
margin-top: 16px;
padding: 0 16px; padding: 0 16px;
.box-due { background: white;
width: 100%; &:first-child {
display: grid; margin-top: 0;
grid-template-columns: 150px 70px; }
grid-template-rows: 52px; .label_time {
height: 20px;
font-size: 14px; font-size: 14px;
justify-content: space-between; color: rgba(61, 64, 71, 1);
align-items: center; line-height: 20px;
padding: 16px 0;
display: block;
border-bottom: 1px solid #ececee; border-bottom: 1px solid #ececee;
.status {
justify-self: right;
}
} }
.list { .list {
background: rgba(255, 255, 255, 1); background: rgba(255, 255, 255, 1);
...@@ -148,7 +143,6 @@ export default { ...@@ -148,7 +143,6 @@ export default {
&:last-child { &:last-child {
border-bottom: 0; border-bottom: 0;
} }
.list_title { .list_title {
display: flex; display: flex;
align-items: center; align-items: center;
...@@ -159,16 +153,16 @@ export default { ...@@ -159,16 +153,16 @@ export default {
color: rgba(61, 64, 71, 1); color: rgba(61, 64, 71, 1);
line-height: 22px; line-height: 22px;
} }
.arrow_right {
color: #e4e4e6;
}
.list_title_money { .list_title_money {
margin-left: auto;
height: 22px; height: 22px;
font-size: 16px; font-size: 16px;
font-weight: 500; font-weight: 500;
color: rgba(61, 64, 71, 1); color: rgba(61, 64, 71, 1);
} line-height: 22px;
.arrow_right {
margin-left: auto; margin-left: auto;
color: #e4e4e6;
} }
} }
p { p {
......
src/views/Trusteeship/index.vue
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<div class="header_box"> <div class="header_box">
<div class="header_box_title"> <div class="header_box_title">
<span>{{hosting.social.bizName}}</span> <span>{{hosting.social.bizName}}</span>
<i class="title_color">{{hosting.social.amount}}</i> <i class="title_color">{{hosting.social.amount|moneyNum}}</i>
</div> </div>
<div class="list_contenter"> <div class="list_contenter">
<div class="list" v-for="(item,index) in hosting.social.list" :key="index"> <div class="list" v-for="(item,index) in hosting.social.list" :key="index">
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
</div> </div>
<p> <p>
<span>总备款金额</span> <span>总备款金额</span>
<i>{{item.amount}}</i> <i>{{item.amount|moneyNum}}</i>
</p> </p>
</div> </div>
</div> </div>
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
<div class="header_box"> <div class="header_box">
<div class="header_box_title"> <div class="header_box_title">
<span>{{hosting.fund.bizName}}</span> <span>{{hosting.fund.bizName}}</span>
<i class="title_color">{{hosting.fund.amount}}</i> <i class="title_color">{{hosting.fund.amount|moneyNum}}</i>
</div> </div>
<div class="list_contenter"> <div class="list_contenter">
<div class="list" v-for="(item,index) in hosting.fund.list" :key="index"> <div class="list" v-for="(item,index) in hosting.fund.list" :key="index">
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
</div> </div>
<p> <p>
<span>总备款金额</span> <span>总备款金额</span>
<i>{{item.amount}}</i> <i>{{item.amount|moneyNum}}</i>
</p> </p>
</div> </div>
</div> </div>
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
<van-popup v-model="show" round closeable position="bottom" :style="{ height: '50%' }"> <van-popup v-model="show" round closeable position="bottom" :style="{ height: '50%' }">
<div class="popup_city"> <div class="popup_city">
<div class="popup_city_title">总备款金额</div> <div class="popup_city_title">总备款金额</div>
<div class="popup_city_money">{{currentDetail.amount}}</div> <div class="popup_city_money">{{currentDetail.amount|moneyNum}}</div>
<p> <p>
<span>参保城市</span> <span>参保城市</span>
<i>{{currentDetail.cityName}}</i> <i>{{currentDetail.cityName}}</i>
......
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 sign in to comment