|
|
@@ -419,15 +419,15 @@ export default {
|
|
|
this.$post("/api/admin/ReportForm/getFormBar", data).then(res => {
|
|
|
let data = res.data;
|
|
|
if (res.status === 1) {
|
|
|
- this.headerBar.trusteeship = data.trusteeshipAmount * 1;
|
|
|
- this.headerBar.refund = data.refundAmount * 1;
|
|
|
+ this.headerBar.trusteeship = (data.trusteeshipAmount * 1).toFixed(2);
|
|
|
+ this.headerBar.refund = (data.refundAmount * 1).toFixed(2);
|
|
|
this.headerBar.trusteeshipCount = data.trusteeshipCount;
|
|
|
this.headerBar.refundCount = data.refundCount;
|
|
|
|
|
|
// let amount = data.trusteeshipAmount - data.refundAmount;
|
|
|
let count = data.trusteeshipCount - data.refundCount;
|
|
|
// this.headerBar.revenue = amount > 0 ? amount : 0;
|
|
|
- this.headerBar.revenue = data.revenue * 1;
|
|
|
+ this.headerBar.revenue = (data.revenue * 1).toFixed(2);
|
|
|
this.headerBar.revenueCount = count > 0 ? count : 0;
|
|
|
}
|
|
|
});
|
|
|
@@ -481,7 +481,7 @@ export default {
|
|
|
product_type: query.product_type, //项目类型2整包4雇佣9云端
|
|
|
start_time: query.start_time,
|
|
|
end_time: query.end_time,
|
|
|
- order_type:1,
|
|
|
+ // order_type:1,
|
|
|
date_type: query.date_type || 2, //1到账时间2创建时间
|
|
|
status: 401, //401订单支付成功
|
|
|
artificial_mark: 0, //0为开启人工财务1开启
|
|
|
@@ -489,11 +489,12 @@ export default {
|
|
|
page_size: this.pageInfo.size
|
|
|
|
|
|
}
|
|
|
- // if (this.orderType !== "") {
|
|
|
- // data.order_type = this.orderType;
|
|
|
- // } else {
|
|
|
- // data.active_name = 'all';
|
|
|
- // }
|
|
|
+ if (this.orderType !== "") {
|
|
|
+ data.order_type = this.orderType;
|
|
|
+ } else {
|
|
|
+ // data.active_name = 'all';
|
|
|
+ data.order_type = 1;
|
|
|
+ }
|
|
|
this.formatTitle(data.product_type);
|
|
|
this.queryData = data;
|
|
|
return true;
|
