diff --git a/src/utils/date.ts b/src/utils/date.ts new file mode 100644 index 0000000..bf3b8d5 --- /dev/null +++ b/src/utils/date.ts @@ -0,0 +1,15 @@ +import dayjs from 'dayjs' + +// 获取指定时间范围内的所有日期 +export function getRangeAllTime(startDate: string, endDate: string) { + const dates = [] + let currentDate = dayjs(startDate) + const formattedEndDate = dayjs(endDate).format('YYYY-MM-DD') + + while (currentDate.format('YYYY-MM-DD') <= formattedEndDate) { + dates.push(currentDate.format('YYYY-MM-DD')) + currentDate = currentDate.add(1, 'day') + } + return dates +} + diff --git a/src/utils/date.ts b/src/utils/date.ts new file mode 100644 index 0000000..bf3b8d5 --- /dev/null +++ b/src/utils/date.ts @@ -0,0 +1,15 @@ +import dayjs from 'dayjs' + +// 获取指定时间范围内的所有日期 +export function getRangeAllTime(startDate: string, endDate: string) { + const dates = [] + let currentDate = dayjs(startDate) + const formattedEndDate = dayjs(endDate).format('YYYY-MM-DD') + + while (currentDate.format('YYYY-MM-DD') <= formattedEndDate) { + dates.push(currentDate.format('YYYY-MM-DD')) + currentDate = currentDate.add(1, 'day') + } + return dates +} + diff --git a/src/views/equipement/standard/book/components/checkRecord.vue b/src/views/equipement/standard/book/components/checkRecord.vue index 3db9cd2..d4fd387 100644 --- a/src/views/equipement/standard/book/components/checkRecord.vue +++ b/src/views/equipement/standard/book/components/checkRecord.vue @@ -1,5 +1,6 @@ + + + + diff --git a/src/utils/date.ts b/src/utils/date.ts new file mode 100644 index 0000000..bf3b8d5 --- /dev/null +++ b/src/utils/date.ts @@ -0,0 +1,15 @@ +import dayjs from 'dayjs' + +// 获取指定时间范围内的所有日期 +export function getRangeAllTime(startDate: string, endDate: string) { + const dates = [] + let currentDate = dayjs(startDate) + const formattedEndDate = dayjs(endDate).format('YYYY-MM-DD') + + while (currentDate.format('YYYY-MM-DD') <= formattedEndDate) { + dates.push(currentDate.format('YYYY-MM-DD')) + currentDate = currentDate.add(1, 'day') + } + return dates +} + diff --git a/src/views/equipement/standard/book/components/checkRecord.vue b/src/views/equipement/standard/book/components/checkRecord.vue index 3db9cd2..d4fd387 100644 --- a/src/views/equipement/standard/book/components/checkRecord.vue +++ b/src/views/equipement/standard/book/components/checkRecord.vue @@ -1,5 +1,6 @@ + + + + diff --git a/src/views/equipement/standard/book/list.vue b/src/views/equipement/standard/book/list.vue index 3d00b70..07adb9e 100644 --- a/src/views/equipement/standard/book/list.vue +++ b/src/views/equipement/standard/book/list.vue @@ -201,6 +201,7 @@ query: { approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称 standardNo: row.standardNo, // 标准装置编号 + standardId: row.id, standardName: row.standardName, // 标准装置名称 processId: row.processId, // 流程实例id taskId: row.taskId, // 任务id