|
|
|
@ -16,6 +16,8 @@ import {
|
|
|
|
|
} from 'vue'
|
|
|
|
|
import { rowPropKeys } from 'naive-ui/es/legacy-grid/src/Row'
|
|
|
|
|
import { useRoute, useRouter } from 'vue-router'
|
|
|
|
|
import dayjs from 'dayjs'
|
|
|
|
|
import { cloneDeep } from 'lodash-es'
|
|
|
|
|
import {
|
|
|
|
|
CustomTabelModal,
|
|
|
|
|
ImportExcelModal,
|
|
|
|
@ -484,7 +486,18 @@ const finalStore = useFinal()
|
|
|
|
|
|
|
|
|
|
async function query(page: number, pageSize: number, filterId?: any, taskName?: string) {
|
|
|
|
|
console.log('query', taskName)
|
|
|
|
|
const asideParmas = unref(finalStore.getAsideValue)
|
|
|
|
|
const asideParmas = cloneDeep(unref(finalStore.getAsideValue))
|
|
|
|
|
if (asideParmas.izyear) {
|
|
|
|
|
asideParmas.izuptime = cloneDeep(asideParmas.izyear)
|
|
|
|
|
if (typeof asideParmas.izuptime == 'object') {
|
|
|
|
|
asideParmas.izuptime[0] = dayjs(asideParmas.izuptime[0]).format('YYYY/MM/DD')
|
|
|
|
|
asideParmas.izuptime[1] = dayjs(asideParmas.izuptime[1]).format('YYYY/MM/DD')
|
|
|
|
|
asideParmas.izuptime = asideParmas.izuptime.join('-')
|
|
|
|
|
delete asideParmas.izyear
|
|
|
|
|
}
|
|
|
|
|
console.log('typeof asideParmas[\'izuptime\']', typeof asideParmas.izuptime)
|
|
|
|
|
// delete asideParmas['izyear'];
|
|
|
|
|
}
|
|
|
|
|
// 有过滤配置的时候优先使用过滤配置,不要使用左侧参数
|
|
|
|
|
// let params = filterId ? { userSearchId: filterId } : asideParmas
|
|
|
|
|
let params = asideParmas
|
|
|
|
|