Browse Source

fix: 设备的一些修改

master
wangqi 2 months ago
parent
commit
fe1ffd7075
  1. 2
      src/api/module/eam/device/template.ts
  2. 2
      src/pages/deviceInfo/components/TestInfo.vue
  3. 27
      src/pages/deviceInfo/components/data-filter.vue

2
src/api/module/eam/device/template.ts

@ -64,7 +64,7 @@ export const getSheetDetail = (sheetId: number) =>
params: { sheetId }, params: { sheetId },
}) })
export const updateTestSheetStatus = (params: { id: number; deviceId: number }) => export const updateTestSheetStatus = (params: { deviceId: number }) =>
eamServer({ eamServer({
url: '/test-sheet/update-status', url: '/test-sheet/update-status',
method: 'put', method: 'put',

2
src/pages/deviceInfo/components/TestInfo.vue

@ -102,7 +102,7 @@ async function onChangeRadio(row: any) {
async function onSave() { async function onSave() {
if (!props.info) return if (!props.info) return
const res = await updateTestSheetStatus({ const res = await updateTestSheetStatus({
id: props.info.testSheetId, // id: props.info.testSheetId,
deviceId: props.info.id, deviceId: props.info.id,
}) })
if (isResError(res)) return if (isResError(res)) return

27
src/pages/deviceInfo/components/data-filter.vue

@ -92,6 +92,7 @@ import { DeviceStatus, enumToKeyValueArray } from '../utils'
import { useMessage } from '@/hooks/useMessage' import { useMessage } from '@/hooks/useMessage'
import type { CustomerVO } from '@/api/module/eam/customer' import type { CustomerVO } from '@/api/module/eam/customer'
import { isEmpty } from '@/utils/is'
const msg = useMessage() const msg = useMessage()
@ -111,12 +112,12 @@ const emit = defineEmits(['search'])
type FilterKeys = keyof typeof filterData.value type FilterKeys = keyof typeof filterData.value
const filterData = ref({ const filterData = ref({
startDay: '', startDay: undefined,
endDay: '', endDay: undefined,
sn: '', sn: undefined,
status: '', status: undefined,
// serialNo: '', // serialNo: undefined,
categoryId: '', categoryId: undefined,
}) })
const checkbox = ref<Record<FilterKeys, boolean>>({ const checkbox = ref<Record<FilterKeys, boolean>>({
@ -160,7 +161,7 @@ function validate() {
.map(([key]) => key as FilterKeys) .map(([key]) => key as FilterKeys)
for (const element of keys) { for (const element of keys) {
if (!filterData.value[element]) { if (filterData.value[element] === undefined) {
msg.error('请输入' + placeholderMap[element]) msg.error('请输入' + placeholderMap[element])
return false return false
} }
@ -184,19 +185,17 @@ function formatParams() {
function onReset() { function onReset() {
filterData.value = { filterData.value = {
startDay: '', startDay: undefined,
endDay: '', endDay: undefined,
sn: '', sn: undefined,
status: '', status: undefined,
serialNo: '', categoryId: undefined,
categoryId: [],
} }
checkbox.value = { checkbox.value = {
startDay: false, startDay: false,
endDay: false, endDay: false,
sn: false, sn: false,
status: false, status: false,
serialNo: false,
categoryId: false, categoryId: false,
} }
onSearch() onSearch()

Loading…
Cancel
Save