|
|
@@ -69,6 +69,8 @@
|
|
|
import { XTTab } from '/@/components/XTTab/index';
|
|
|
import { XTForm } from '/@/components/XTForm/index';
|
|
|
|
|
|
+ import dayjs from 'dayjs';
|
|
|
+
|
|
|
// 标题数据
|
|
|
const titleData = [
|
|
|
{
|
|
|
@@ -86,6 +88,7 @@
|
|
|
format: 'YYYY-MM-DD',
|
|
|
valueFormat: 'YYYY-MM-DD',
|
|
|
placeholder: '请选择日期',
|
|
|
+ defaultValue: dayjs().format('YYYY-MM-DD'),
|
|
|
width: 280,
|
|
|
},
|
|
|
{
|
|
|
@@ -182,13 +185,18 @@
|
|
|
|
|
|
// 表格请求之前,对参数进行处理, 添加默认 排序
|
|
|
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 {
|
|
|
...params,
|
|
|
orders: tableSort.value,
|
|
|
uniqueCode: searchNames.value == '' ? undefined : searchNames.value,
|
|
|
maintainCompany: tabSelected.value == '' ? undefined : tabSelected.value,
|
|
|
- maintainTime: shiftDate.value.length <= 0 ? undefined : shiftDate.value,
|
|
|
+ maintainTime: shiftTimes.length <= 0 ? undefined : shiftTimes,
|
|
|
};
|
|
|
}
|
|
|
|