|
@@ -8,12 +8,15 @@
|
|
|
v-show="showSearch"
|
|
|
label-width="100px"
|
|
|
>
|
|
|
+
|
|
|
+
|
|
|
<el-form-item label="选择日期">
|
|
|
<el-date-picker
|
|
|
v-model="uploadDate"
|
|
|
style="width: 240px"
|
|
|
value-format="yyyy-MM-dd"
|
|
|
format="yyyy-MM-dd"
|
|
|
+ type="daterange"
|
|
|
range-separator="-"
|
|
|
start-placeholder="开始日期"
|
|
|
end-placeholder="结束日期"
|
|
@@ -21,7 +24,7 @@
|
|
|
</el-form-item>
|
|
|
|
|
|
|
|
|
- <el-form-item label="类型" prop="dataType" >
|
|
|
+ <el-form-item label="类型" prop="dataType">
|
|
|
<el-select
|
|
|
filterable
|
|
|
v-model="queryParams.dataType"
|
|
@@ -130,9 +133,11 @@ export default {
|
|
|
pageSize: 10,
|
|
|
promoterId: undefined,
|
|
|
promoterName: undefined,
|
|
|
- dataType: 0
|
|
|
+ dataType: 0,
|
|
|
+ startDate: undefined,
|
|
|
+ endDate: undefined,
|
|
|
},
|
|
|
- uploadDate: new Date(),
|
|
|
+ uploadDate: [new Date(), new Date()],
|
|
|
//页面所有的下拉数据
|
|
|
queryParamsList: {
|
|
|
typeList: [
|
|
@@ -176,16 +181,13 @@ export default {
|
|
|
created() {
|
|
|
this.userId = this.$store.getters.userId;
|
|
|
|
|
|
- let start = new Date();
|
|
|
- start.setTime(start.getTime() - 3600 * 1000 * 24 * 1);
|
|
|
- let date = new Date(start);
|
|
|
+ let date = new Date();
|
|
|
let y = date.getFullYear();
|
|
|
let MM = date.getMonth() + 1;
|
|
|
MM = MM < 10 ? "0" + MM : MM;
|
|
|
let dd = date.getDate();
|
|
|
dd = dd < 10 ? "0" + dd : dd;
|
|
|
- this.uploadDate = `${y}-${MM}-${dd}`;
|
|
|
-
|
|
|
+ this.uploadDate = [`${y}-${MM}-${dd}`, `${y}-${MM}-${dd}`];
|
|
|
this.getList();
|
|
|
},
|
|
|
filters: {},
|
|
@@ -196,16 +198,21 @@ export default {
|
|
|
getList() {
|
|
|
this.dayArray = [];
|
|
|
this.loading = true;
|
|
|
- profitData({date: this.uploadDate, ...this.queryParams})
|
|
|
- .then((response) => {
|
|
|
- console.log(response)
|
|
|
- this.loading = false;
|
|
|
- this.dayArray = response.dayArray;
|
|
|
+ profitData(
|
|
|
+ this.addDateRange(
|
|
|
+ {...this.queryParams},
|
|
|
+ this.uploadDate,
|
|
|
+ "startDate",
|
|
|
+ "endDate")
|
|
|
+ ).then((response) => {
|
|
|
+ console.log(response)
|
|
|
+ this.loading = false;
|
|
|
+ this.dayArray = response.dayArray;
|
|
|
|
|
|
- })
|
|
|
- .catch((err) => {
|
|
|
- console.log(err);
|
|
|
- });
|
|
|
+ })
|
|
|
+ .catch((err) => {
|
|
|
+ console.log(err);
|
|
|
+ });
|
|
|
},
|
|
|
// 取消按钮
|
|
|
cancel() {
|