feat: 日期筛选优化修改
This commit is contained in:
parent
ccee406ea9
commit
3f03d292ca
@ -14,7 +14,9 @@ class DataCenterController extends Controller
|
|||||||
{
|
{
|
||||||
$sort = $request->get('sort', 'sales_num');
|
$sort = $request->get('sort', 'sales_num');
|
||||||
$order = $request->get('sortOrder', 'DESC');
|
$order = $request->get('sortOrder', 'DESC');
|
||||||
|
if (empty($request->get('date'))) {
|
||||||
|
$request->offsetSet('date', date('Y-m-d'));
|
||||||
|
}
|
||||||
|
|
||||||
$dailySalesReports = DailySalesReport::query()
|
$dailySalesReports = DailySalesReport::query()
|
||||||
->filter()
|
->filter()
|
||||||
|
|||||||
13453
resources/frontend/package-lock.json
generated
13453
resources/frontend/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -11,6 +11,7 @@
|
|||||||
"axios": "^0.21.1",
|
"axios": "^0.21.1",
|
||||||
"core-js": "^3.6.5",
|
"core-js": "^3.6.5",
|
||||||
"element-ui": "^2.15.6",
|
"element-ui": "^2.15.6",
|
||||||
|
"luxon": "^3.4.4",
|
||||||
"nprogress": "^0.2.0",
|
"nprogress": "^0.2.0",
|
||||||
"vue": "^2.6.11",
|
"vue": "^2.6.11",
|
||||||
"vue-router": "^3.2.0",
|
"vue-router": "^3.2.0",
|
||||||
|
|||||||
@ -3,8 +3,8 @@
|
|||||||
<el-card :body-style="{ padding: '20px 20px 0 20px' }">
|
<el-card :body-style="{ padding: '20px 20px 0 20px' }">
|
||||||
<el-form ref="form" :inline="true" :model="form">
|
<el-form ref="form" :inline="true" :model="form">
|
||||||
<el-form-item label="日期:">
|
<el-form-item label="日期:">
|
||||||
<el-date-picker v-model="form.date" type="date" placeholder="日期" format="yyyy-MM-DD"
|
<el-date-picker v-model="form.date" type="date" placeholder="日期" format="yyyy-MM-dd"
|
||||||
value-format="yyyy-MM-DD"></el-date-picker>
|
value-format="yyyy-MM-dd"></el-date-picker>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
|
||||||
<el-form-item label="商品名称:">
|
<el-form-item label="商品名称:">
|
||||||
@ -90,6 +90,7 @@
|
|||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { getSalesReportData } from "../../api/dataCenter";
|
import { getSalesReportData } from "../../api/dataCenter";
|
||||||
|
import { DateTime } from 'luxon';
|
||||||
export default {
|
export default {
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
@ -109,6 +110,8 @@ export default {
|
|||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
this.salseReportData();
|
this.salseReportData();
|
||||||
|
// 格式化时间
|
||||||
|
this.form.date = DateTime.now().toFormat('yyyy-MM-dd HH:mm:ss');
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
// 销售数据
|
// 销售数据
|
||||||
@ -146,8 +149,9 @@ export default {
|
|||||||
// 重置筛选
|
// 重置筛选
|
||||||
handleReChoose() {
|
handleReChoose() {
|
||||||
this.form = {
|
this.form = {
|
||||||
date: "",
|
date: DateTime.now().toFormat('yyyy-MM-dd HH:mm:ss'),
|
||||||
name: "",
|
name: "",
|
||||||
|
sales_num: 0,
|
||||||
};
|
};
|
||||||
this.salseReportData();
|
this.salseReportData();
|
||||||
},
|
},
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user