diff --git a/src/api/module/eam/device/template.ts b/src/api/module/eam/device/template.ts index e983c69..d2cc738 100644 --- a/src/api/module/eam/device/template.ts +++ b/src/api/module/eam/device/template.ts @@ -64,7 +64,7 @@ export const getSheetDetail = (sheetId: number) => params: { sheetId }, }) -export const updateTestSheetStatus = (params: { id: number; deviceId: number }) => +export const updateTestSheetStatus = (params: { deviceId: number }) => eamServer({ url: '/test-sheet/update-status', method: 'put', diff --git a/src/pages/deviceInfo/components/TestInfo.vue b/src/pages/deviceInfo/components/TestInfo.vue index 62a7368..7377165 100644 --- a/src/pages/deviceInfo/components/TestInfo.vue +++ b/src/pages/deviceInfo/components/TestInfo.vue @@ -102,7 +102,7 @@ async function onChangeRadio(row: any) { async function onSave() { if (!props.info) return const res = await updateTestSheetStatus({ - id: props.info.testSheetId, + // id: props.info.testSheetId, deviceId: props.info.id, }) if (isResError(res)) return diff --git a/src/pages/deviceInfo/components/data-filter.vue b/src/pages/deviceInfo/components/data-filter.vue index 0f12cd2..d805dbf 100644 --- a/src/pages/deviceInfo/components/data-filter.vue +++ b/src/pages/deviceInfo/components/data-filter.vue @@ -92,6 +92,7 @@ import { DeviceStatus, enumToKeyValueArray } from '../utils' import { useMessage } from '@/hooks/useMessage' import type { CustomerVO } from '@/api/module/eam/customer' +import { isEmpty } from '@/utils/is' const msg = useMessage() @@ -111,12 +112,12 @@ const emit = defineEmits(['search']) type FilterKeys = keyof typeof filterData.value const filterData = ref({ - startDay: '', - endDay: '', - sn: '', - status: '', - // serialNo: '', - categoryId: '', + startDay: undefined, + endDay: undefined, + sn: undefined, + status: undefined, + // serialNo: undefined, + categoryId: undefined, }) const checkbox = ref>({ @@ -160,7 +161,7 @@ function validate() { .map(([key]) => key as FilterKeys) for (const element of keys) { - if (!filterData.value[element]) { + if (filterData.value[element] === undefined) { msg.error('请输入' + placeholderMap[element]) return false } @@ -184,19 +185,17 @@ function formatParams() { function onReset() { filterData.value = { - startDay: '', - endDay: '', - sn: '', - status: '', - serialNo: '', - categoryId: [], + startDay: undefined, + endDay: undefined, + sn: undefined, + status: undefined, + categoryId: undefined, } checkbox.value = { startDay: false, endDay: false, sn: false, status: false, - serialNo: false, categoryId: false, } onSearch()