|
@@ -15,12 +15,13 @@
|
|
|
<el-form-item label="楼层名称" prop="floorName" label-width="80px">
|
|
<el-form-item label="楼层名称" prop="floorName" label-width="80px">
|
|
|
<el-input v-model="queryParams.floorName" clearable />
|
|
<el-input v-model="queryParams.floorName" clearable />
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
- <el-form-item label="日期" prop="orderFoodDate" label-width="60px">
|
|
|
|
|
|
|
+ <el-form-item label="时间段" prop="orderFoodDateRange" label-width="60px">
|
|
|
<TgDatePicker
|
|
<TgDatePicker
|
|
|
- type="date"
|
|
|
|
|
- v-model="queryParams.orderFoodDate"
|
|
|
|
|
|
|
+ type="daterange"
|
|
|
|
|
+ v-model="queryParams.orderFoodDateRange"
|
|
|
class="!w-240px"
|
|
class="!w-240px"
|
|
|
- placeholder="请选择日期"
|
|
|
|
|
|
|
+ start-placeholder="开始日期"
|
|
|
|
|
+ end-placeholder="结束日期"
|
|
|
/>
|
|
/>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
<el-form-item>
|
|
@@ -77,7 +78,9 @@ const queryParams = reactive({
|
|
|
tenantIds: userStore.orgTenantId,
|
|
tenantIds: userStore.orgTenantId,
|
|
|
buildName:'',
|
|
buildName:'',
|
|
|
floorName:'',
|
|
floorName:'',
|
|
|
- orderFoodDate: undefined as string | undefined
|
|
|
|
|
|
|
+ orderFoodDateRange: [] as string[] | undefined,
|
|
|
|
|
+ orderFoodStartDate: undefined as string | undefined,
|
|
|
|
|
+ orderFoodEndDate: undefined as string | undefined
|
|
|
})
|
|
})
|
|
|
|
|
|
|
|
const getWeekText = (dateStr?: string) => {
|
|
const getWeekText = (dateStr?: string) => {
|
|
@@ -103,6 +106,10 @@ const getParams = (isExport = false) => {
|
|
|
...queryParams,
|
|
...queryParams,
|
|
|
tenantIds: queryParams.tenantIds && queryParams.tenantIds.length ? queryParams.tenantIds : undefined
|
|
tenantIds: queryParams.tenantIds && queryParams.tenantIds.length ? queryParams.tenantIds : undefined
|
|
|
}
|
|
}
|
|
|
|
|
+ const dateRange = queryParams.orderFoodDateRange || []
|
|
|
|
|
+ params.orderFoodStartDate = dateRange[0]
|
|
|
|
|
+ params.orderFoodEndDate = dateRange[1]
|
|
|
|
|
+ delete params.orderFoodDateRange
|
|
|
if (isExport) {
|
|
if (isExport) {
|
|
|
params.pageNo = 1
|
|
params.pageNo = 1
|
|
|
params.pageSize = 99999
|
|
params.pageSize = 99999
|