diff --git a/src/api/eam/equipmentRepairJobMain/index.ts b/src/api/eam/equipmentRepairJobMain/index.ts
index 3e7cad2b0..0a77ee4eb 100644
--- a/src/api/eam/equipmentRepairJobMain/index.ts
+++ b/src/api/eam/equipmentRepairJobMain/index.ts
@@ -115,7 +115,7 @@ export const backEquipmentRepairOrder = async (data: EquipmentRepairJobMainVO) =
return await request.post({ url: `/eam/equipment-repair-job-main/fallback`, data })
}
-//报修验证不通过,生成新工单
+//报修验证
export const createEquipmentRepairNewOrder = async (data: EquipmentRepairJobMainVO) => {
return await request.post({ url: `/eam/equipment-repair-job-main/createNew`, data })
}
diff --git a/src/api/eam/recordDeviceChanged/index.ts b/src/api/eam/recordDeviceChanged/index.ts
new file mode 100644
index 000000000..a7fe656b6
--- /dev/null
+++ b/src/api/eam/recordDeviceChanged/index.ts
@@ -0,0 +1,59 @@
+import request from '@/config/axios'
+
+export interface RecordDeviceChangedVO {
+ id: number
+ code: string
+ name: string
+ statusBefore: string
+ statusAfter: string
+ operator: number
+ operateTime: Date
+ departmentCode: string
+ remark: string
+ siteId: string
+ available: string
+ deletionTime: Date
+ deleterId: byte[]
+ concurrencyStamp: number
+}
+
+// 查询设备变更记录列表
+export const getRecordDeviceChangedPage = async (params) => {
+ if (params.isSearch) {
+ delete params.isSearch
+ const data = {...params}
+ return await request.post({ url: '/eam/record-device-changed/senior', data })
+ } else {
+ return await request.get({ url: `/eam/record-device-changed/page`, params })
+ }
+}
+
+// 查询设备变更记录详情
+export const getRecordDeviceChanged = async (id: number) => {
+ return await request.get({ url: `/eam/record-device-changed/get?id=` + id })
+}
+
+// 新增设备变更记录
+export const createRecordDeviceChanged = async (data: RecordDeviceChangedVO) => {
+ return await request.post({ url: `/eam/record-device-changed/create`, data })
+}
+
+// 修改设备变更记录
+export const updateRecordDeviceChanged = async (data: RecordDeviceChangedVO) => {
+ return await request.put({ url: `/eam/record-device-changed/update`, data })
+}
+
+// 删除设备变更记录
+export const deleteRecordDeviceChanged = async (id: number) => {
+ return await request.delete({ url: `/eam/record-device-changed/delete?id=` + id })
+}
+
+// 导出设备变更记录 Excel
+export const exportRecordDeviceChanged = async (params) => {
+ return await request.download({ url: `/eam/record-device-changed/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+ return request.download({ url: '/eam/record-device-changed/get-import-template' })
+}
\ No newline at end of file
diff --git a/src/views/eam/equipmentAccounts/index.vue b/src/views/eam/equipmentAccounts/index.vue
index f3503a55f..9a7a924e6 100644
--- a/src/views/eam/equipmentAccounts/index.vue
+++ b/src/views/eam/equipmentAccounts/index.vue
@@ -50,7 +50,7 @@
:isBusiness="false"
/>
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ row.code }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/eam/recordDeviceChanged/recordDeviceChanged.data.ts b/src/views/eam/recordDeviceChanged/recordDeviceChanged.data.ts
new file mode 100644
index 000000000..3a587c48d
--- /dev/null
+++ b/src/views/eam/recordDeviceChanged/recordDeviceChanged.data.ts
@@ -0,0 +1,181 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const RecordDeviceChangedRules = reactive({
+ code: [required],
+ name: [required],
+})
+
+export const RecordDeviceChanged = useCrudSchemas(reactive([
+ {
+ label: 'id',
+ field: 'id',
+ sort: 'custom',
+ isForm: false,
+ },
+ {
+ label: '设备编号',
+ field: 'code',
+ sort: 'custom',
+ isSearch: true,
+ },
+ {
+ label: '名称',
+ field: 'name',
+ sort: 'custom',
+ isSearch: true,
+ },
+ {
+ label: '变更前状态',
+ field: 'statusBefore',
+ sort: 'custom',
+ dictType: DICT_TYPE.DEVICE_STATUS,
+ dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+ isSearch: true,
+ },
+ {
+ label: '变更后状态',
+ field: 'statusAfter',
+ sort: 'custom',
+ dictType: DICT_TYPE.DEVICE_STATUS,
+ dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+ isSearch: true,
+ },
+ {
+ label: '操作人',
+ field: 'operator',
+ sort: 'custom',
+ isSearch: true,
+ },
+ {
+ label: '操作时间',
+ field: 'operateTime',
+ sort: 'custom',
+ formatter: dateFormatter,
+ isSearch: true,
+ search: {
+ component: 'DatePicker',
+ componentProps: {
+ valueFormat: 'YYYY-MM-DD HH:mm:ss',
+ type: 'daterange',
+ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+ }
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ valueFormat: 'x'
+ }
+ },
+ },
+ {
+ label: '创建时间',
+ field: 'createTime',
+ sort: 'custom',
+ formatter: dateFormatter,
+ isSearch: false,
+ isTable: false,
+ isForm: false,
+ isDetail:false,
+ search: {
+ component: 'DatePicker',
+ componentProps: {
+ valueFormat: 'YYYY-MM-DD HH:mm:ss',
+ type: 'daterange',
+ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+ }
+ },
+ isForm: false,
+ },
+ {
+ label: '部门id',
+ field: 'departmentCode',
+ sort: 'custom',
+ isSearch: false,
+ isTable: false,
+ isForm: false,
+ isDetail:false,
+ },
+ {
+ label: '备注',
+ field: 'remark',
+ sort: 'custom',
+ isSearch: true,
+ },
+ {
+ label: '地点ID',
+ field: 'siteId',
+ sort: 'custom',
+ isSearch: false,
+ isTable: false,
+ isForm: false,
+ isDetail:false,
+ },
+ {
+ label: '是否可用默认TRUE',
+ field: 'available',
+ sort: 'custom',
+ isSearch: false,
+ isTable: false,
+ isForm: false,
+ isDetail:false,
+ },
+ {
+ label: '删除时间',
+ field: 'deletionTime',
+ sort: 'custom',
+ formatter: dateFormatter,
+ isSearch: false,
+ isTable: false,
+ isForm: false,
+ isDetail:false,
+ search: {
+ component: 'DatePicker',
+ componentProps: {
+ valueFormat: 'YYYY-MM-DD HH:mm:ss',
+ type: 'daterange',
+ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+ }
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ valueFormat: 'x'
+ }
+ },
+ },
+ {
+ label: '删除人id',
+ field: 'deleterId',
+ sort: 'custom',
+ isSearch: false,
+ isTable: false,
+ isForm: false,
+ isDetail:false,
+ },
+ {
+ label: '并发乐观锁',
+ field: 'concurrencyStamp',
+ sort: 'custom',
+ isSearch: false,
+ isTable: false,
+ isForm: false,
+ isDetail:false,
+ form: {
+ component: 'InputNumber',
+ value: 0
+ },
+ },
+ {
+ label: '操作',
+ field: 'action',
+ isForm: false,
+ table: {
+ width: 150,
+ fixed: 'right'
+ }
+ }
+]))