|
@@ -89,6 +89,7 @@
|
|
|
import { XTTitle } from '/@/components/XTTitle/index';
|
|
import { XTTitle } from '/@/components/XTTitle/index';
|
|
|
import { XTTab } from '/@/components/XTTab/index';
|
|
import { XTTab } from '/@/components/XTTab/index';
|
|
|
import { XTForm } from '/@/components/XTForm/index';
|
|
import { XTForm } from '/@/components/XTForm/index';
|
|
|
|
|
+ import dayjs from 'dayjs';
|
|
|
|
|
|
|
|
// 标题数据
|
|
// 标题数据
|
|
|
const titleData = [
|
|
const titleData = [
|
|
@@ -207,13 +208,18 @@
|
|
|
|
|
|
|
|
// 表格请求之前,对参数进行处理, 添加默认 排序
|
|
// 表格请求之前,对参数进行处理, 添加默认 排序
|
|
|
async function handleBeforeFetch(params) {
|
|
async function handleBeforeFetch(params) {
|
|
|
- console.log('searchNames:::', searchNames.value);
|
|
|
|
|
|
|
+ const shiftTimes = [];
|
|
|
|
|
+ if (shiftDate.value && shiftDate.value.length > 0) {
|
|
|
|
|
+ shiftTimes.push(shiftDate.value[0]);
|
|
|
|
|
+ shiftTimes.push(shiftDate.value[1]);
|
|
|
|
|
+ shiftTimes[1] = dayjs(shiftTimes[1]).add(1, 'day').format('YYYY-MM-DD');
|
|
|
|
|
+ }
|
|
|
return {
|
|
return {
|
|
|
...params,
|
|
...params,
|
|
|
// orders: tableSort.value,
|
|
// orders: tableSort.value,
|
|
|
name: searchNames.value == '' ? undefined : searchNames.value,
|
|
name: searchNames.value == '' ? undefined : searchNames.value,
|
|
|
status: tabSelected.value == '' ? undefined : tabSelected.value,
|
|
status: tabSelected.value == '' ? undefined : tabSelected.value,
|
|
|
- time: shiftDate.value.length <= 0 ? undefined : shiftDate.value,
|
|
|
|
|
|
|
+ time: shiftTimes.length <= 0 ? undefined : shiftTimes,
|
|
|
};
|
|
};
|
|
|
}
|
|
}
|
|
|
|
|
|