diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts new file mode 100644 index 0000000..525909d --- /dev/null +++ b/src/api/device/checkList.ts @@ -0,0 +1,46 @@ +// 设备借用相关接口api +import request from '../index' +// 设备管理点检查列表 +export function getcheckInfoList(data: { limit: number; offset: number }) { + return request({ + url: `/check/checkInfoList?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} + +// 数据删除 +export function getDeleteCheckInfo(data: object) { + return request({ + url: '/check/deleteCheckInfo', + method: 'post', + data, + }) +} + +// 数据导出 +export function getExportCheckInfoList(data: object) { + return request({ + url: '/check/exportCheckInfoList', + method: 'post', + responseType: 'blob', + data, + }) +} + +// 获取详情数据 +export function getselectCheckInfo(data: object) { + return request({ + url: '/check/selectCheckInfo', + method: 'post', + data, + }) +} +// 获取详情数据 +export function getAddCheckInfo(data: object) { + return request({ + url: '/check/addCheckInfo', + method: 'post', + data, + }) +} diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts new file mode 100644 index 0000000..525909d --- /dev/null +++ b/src/api/device/checkList.ts @@ -0,0 +1,46 @@ +// 设备借用相关接口api +import request from '../index' +// 设备管理点检查列表 +export function getcheckInfoList(data: { limit: number; offset: number }) { + return request({ + url: `/check/checkInfoList?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} + +// 数据删除 +export function getDeleteCheckInfo(data: object) { + return request({ + url: '/check/deleteCheckInfo', + method: 'post', + data, + }) +} + +// 数据导出 +export function getExportCheckInfoList(data: object) { + return request({ + url: '/check/exportCheckInfoList', + method: 'post', + responseType: 'blob', + data, + }) +} + +// 获取详情数据 +export function getselectCheckInfo(data: object) { + return request({ + url: '/check/selectCheckInfo', + method: 'post', + data, + }) +} +// 获取详情数据 +export function getAddCheckInfo(data: object) { + return request({ + url: '/check/addCheckInfo', + method: 'post', + data, + }) +} diff --git a/src/api/system/process.ts b/src/api/system/process.ts index ebd6e56..fa9e004 100644 --- a/src/api/system/process.ts +++ b/src/api/system/process.ts @@ -3,16 +3,10 @@ const prefix = '/system/flow' // 列表 -export function getProcessList(data: object) { - console.log('offset:', data.offset) - console.log('limit', data.limit) +export function getProcessList(data: { offset: number; limit: number }) { return request({ - url: `${prefix}/listPage`, + url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`, method: 'post', - headers: { - offset: data.offset, - limit: data.limit, - }, data, }) } @@ -77,3 +71,10 @@ }) } +// 获取关联业务列表 +export function getBusinessList() { + return request({ + url: `${prefix}/flowFormList`, + method: 'get', + }) +} diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts new file mode 100644 index 0000000..525909d --- /dev/null +++ b/src/api/device/checkList.ts @@ -0,0 +1,46 @@ +// 设备借用相关接口api +import request from '../index' +// 设备管理点检查列表 +export function getcheckInfoList(data: { limit: number; offset: number }) { + return request({ + url: `/check/checkInfoList?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} + +// 数据删除 +export function getDeleteCheckInfo(data: object) { + return request({ + url: '/check/deleteCheckInfo', + method: 'post', + data, + }) +} + +// 数据导出 +export function getExportCheckInfoList(data: object) { + return request({ + url: '/check/exportCheckInfoList', + method: 'post', + responseType: 'blob', + data, + }) +} + +// 获取详情数据 +export function getselectCheckInfo(data: object) { + return request({ + url: '/check/selectCheckInfo', + method: 'post', + data, + }) +} +// 获取详情数据 +export function getAddCheckInfo(data: object) { + return request({ + url: '/check/addCheckInfo', + method: 'post', + data, + }) +} diff --git a/src/api/system/process.ts b/src/api/system/process.ts index ebd6e56..fa9e004 100644 --- a/src/api/system/process.ts +++ b/src/api/system/process.ts @@ -3,16 +3,10 @@ const prefix = '/system/flow' // 列表 -export function getProcessList(data: object) { - console.log('offset:', data.offset) - console.log('limit', data.limit) +export function getProcessList(data: { offset: number; limit: number }) { return request({ - url: `${prefix}/listPage`, + url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`, method: 'post', - headers: { - offset: data.offset, - limit: data.limit, - }, data, }) } @@ -77,3 +71,10 @@ }) } +// 获取关联业务列表 +export function getBusinessList() { + return request({ + url: `${prefix}/flowFormList`, + method: 'get', + }) +} diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts index 0c9033d..3d73df2 100644 --- a/src/router/modules/device.ts +++ b/src/router/modules/device.ts @@ -442,6 +442,18 @@ }, }, { + path: 'manageCheckList/:type/:id?', + name: 'manageAdd', + component: () => import('@/views/device/deviceMaintenance/components/manageAdd.vue'), + meta: { + title: '设备管理点检查表', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/maintenance/manageCheckList', + }, + }, + { path: ':type/:id?', name: 'maintenanceAdd', component: () => import('@/views/device/deviceMaintenance/components/listApply/listPageAdd.vue'), diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts new file mode 100644 index 0000000..525909d --- /dev/null +++ b/src/api/device/checkList.ts @@ -0,0 +1,46 @@ +// 设备借用相关接口api +import request from '../index' +// 设备管理点检查列表 +export function getcheckInfoList(data: { limit: number; offset: number }) { + return request({ + url: `/check/checkInfoList?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} + +// 数据删除 +export function getDeleteCheckInfo(data: object) { + return request({ + url: '/check/deleteCheckInfo', + method: 'post', + data, + }) +} + +// 数据导出 +export function getExportCheckInfoList(data: object) { + return request({ + url: '/check/exportCheckInfoList', + method: 'post', + responseType: 'blob', + data, + }) +} + +// 获取详情数据 +export function getselectCheckInfo(data: object) { + return request({ + url: '/check/selectCheckInfo', + method: 'post', + data, + }) +} +// 获取详情数据 +export function getAddCheckInfo(data: object) { + return request({ + url: '/check/addCheckInfo', + method: 'post', + data, + }) +} diff --git a/src/api/system/process.ts b/src/api/system/process.ts index ebd6e56..fa9e004 100644 --- a/src/api/system/process.ts +++ b/src/api/system/process.ts @@ -3,16 +3,10 @@ const prefix = '/system/flow' // 列表 -export function getProcessList(data: object) { - console.log('offset:', data.offset) - console.log('limit', data.limit) +export function getProcessList(data: { offset: number; limit: number }) { return request({ - url: `${prefix}/listPage`, + url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`, method: 'post', - headers: { - offset: data.offset, - limit: data.limit, - }, data, }) } @@ -77,3 +71,10 @@ }) } +// 获取关联业务列表 +export function getBusinessList() { + return request({ + url: `${prefix}/flowFormList`, + method: 'get', + }) +} diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts index 0c9033d..3d73df2 100644 --- a/src/router/modules/device.ts +++ b/src/router/modules/device.ts @@ -442,6 +442,18 @@ }, }, { + path: 'manageCheckList/:type/:id?', + name: 'manageAdd', + component: () => import('@/views/device/deviceMaintenance/components/manageAdd.vue'), + meta: { + title: '设备管理点检查表', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/maintenance/manageCheckList', + }, + }, + { path: ':type/:id?', name: 'maintenanceAdd', component: () => import('@/views/device/deviceMaintenance/components/listApply/listPageAdd.vue'), diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts new file mode 100644 index 0000000..b6f5cf3 --- /dev/null +++ b/src/views/device/deviceMaintenance/checkList_interface.ts @@ -0,0 +1,36 @@ +export interface IlistQuery { + checkDate: string + checkName: string + checkNo: string + logType?: string + offset: number + limit: number +} +export interface ISupplier { + checkDate: null | string + checkName: string + checkNo: string + checkPerson: string + checkResult: string + checkResultName: string + createTime: null | string + createUser: string + fileList: [ + { + checkId: string + createTime: null | string + createUser: string + fileName: string + id: string + isDel: null | string + minioFileName: string + remark: string + updateTime: string + }, + ] + id: string + isDel: null | string + managerPoinLocation: string + remark: string + updateTime: null | string +} diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts new file mode 100644 index 0000000..525909d --- /dev/null +++ b/src/api/device/checkList.ts @@ -0,0 +1,46 @@ +// 设备借用相关接口api +import request from '../index' +// 设备管理点检查列表 +export function getcheckInfoList(data: { limit: number; offset: number }) { + return request({ + url: `/check/checkInfoList?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} + +// 数据删除 +export function getDeleteCheckInfo(data: object) { + return request({ + url: '/check/deleteCheckInfo', + method: 'post', + data, + }) +} + +// 数据导出 +export function getExportCheckInfoList(data: object) { + return request({ + url: '/check/exportCheckInfoList', + method: 'post', + responseType: 'blob', + data, + }) +} + +// 获取详情数据 +export function getselectCheckInfo(data: object) { + return request({ + url: '/check/selectCheckInfo', + method: 'post', + data, + }) +} +// 获取详情数据 +export function getAddCheckInfo(data: object) { + return request({ + url: '/check/addCheckInfo', + method: 'post', + data, + }) +} diff --git a/src/api/system/process.ts b/src/api/system/process.ts index ebd6e56..fa9e004 100644 --- a/src/api/system/process.ts +++ b/src/api/system/process.ts @@ -3,16 +3,10 @@ const prefix = '/system/flow' // 列表 -export function getProcessList(data: object) { - console.log('offset:', data.offset) - console.log('limit', data.limit) +export function getProcessList(data: { offset: number; limit: number }) { return request({ - url: `${prefix}/listPage`, + url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`, method: 'post', - headers: { - offset: data.offset, - limit: data.limit, - }, data, }) } @@ -77,3 +71,10 @@ }) } +// 获取关联业务列表 +export function getBusinessList() { + return request({ + url: `${prefix}/flowFormList`, + method: 'get', + }) +} diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts index 0c9033d..3d73df2 100644 --- a/src/router/modules/device.ts +++ b/src/router/modules/device.ts @@ -442,6 +442,18 @@ }, }, { + path: 'manageCheckList/:type/:id?', + name: 'manageAdd', + component: () => import('@/views/device/deviceMaintenance/components/manageAdd.vue'), + meta: { + title: '设备管理点检查表', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/maintenance/manageCheckList', + }, + }, + { path: ':type/:id?', name: 'maintenanceAdd', component: () => import('@/views/device/deviceMaintenance/components/listApply/listPageAdd.vue'), diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts new file mode 100644 index 0000000..b6f5cf3 --- /dev/null +++ b/src/views/device/deviceMaintenance/checkList_interface.ts @@ -0,0 +1,36 @@ +export interface IlistQuery { + checkDate: string + checkName: string + checkNo: string + logType?: string + offset: number + limit: number +} +export interface ISupplier { + checkDate: null | string + checkName: string + checkNo: string + checkPerson: string + checkResult: string + checkResultName: string + createTime: null | string + createUser: string + fileList: [ + { + checkId: string + createTime: null | string + createUser: string + fileName: string + id: string + isDel: null | string + minioFileName: string + remark: string + updateTime: string + }, + ] + id: string + isDel: null | string + managerPoinLocation: string + remark: string + updateTime: null | string +} diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue new file mode 100644 index 0000000..0c3445d --- /dev/null +++ b/src/views/device/deviceMaintenance/components/manageAdd.vue @@ -0,0 +1,323 @@ + + + + + + + + 打印 + + + + 提交 + + + 关闭 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 无 + + + {{ formInline.fileList[0].minioFileName === '' ? '上传' : '更换附件' }} + + + + + + + + + + + diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts new file mode 100644 index 0000000..525909d --- /dev/null +++ b/src/api/device/checkList.ts @@ -0,0 +1,46 @@ +// 设备借用相关接口api +import request from '../index' +// 设备管理点检查列表 +export function getcheckInfoList(data: { limit: number; offset: number }) { + return request({ + url: `/check/checkInfoList?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} + +// 数据删除 +export function getDeleteCheckInfo(data: object) { + return request({ + url: '/check/deleteCheckInfo', + method: 'post', + data, + }) +} + +// 数据导出 +export function getExportCheckInfoList(data: object) { + return request({ + url: '/check/exportCheckInfoList', + method: 'post', + responseType: 'blob', + data, + }) +} + +// 获取详情数据 +export function getselectCheckInfo(data: object) { + return request({ + url: '/check/selectCheckInfo', + method: 'post', + data, + }) +} +// 获取详情数据 +export function getAddCheckInfo(data: object) { + return request({ + url: '/check/addCheckInfo', + method: 'post', + data, + }) +} diff --git a/src/api/system/process.ts b/src/api/system/process.ts index ebd6e56..fa9e004 100644 --- a/src/api/system/process.ts +++ b/src/api/system/process.ts @@ -3,16 +3,10 @@ const prefix = '/system/flow' // 列表 -export function getProcessList(data: object) { - console.log('offset:', data.offset) - console.log('limit', data.limit) +export function getProcessList(data: { offset: number; limit: number }) { return request({ - url: `${prefix}/listPage`, + url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`, method: 'post', - headers: { - offset: data.offset, - limit: data.limit, - }, data, }) } @@ -77,3 +71,10 @@ }) } +// 获取关联业务列表 +export function getBusinessList() { + return request({ + url: `${prefix}/flowFormList`, + method: 'get', + }) +} diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts index 0c9033d..3d73df2 100644 --- a/src/router/modules/device.ts +++ b/src/router/modules/device.ts @@ -442,6 +442,18 @@ }, }, { + path: 'manageCheckList/:type/:id?', + name: 'manageAdd', + component: () => import('@/views/device/deviceMaintenance/components/manageAdd.vue'), + meta: { + title: '设备管理点检查表', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/maintenance/manageCheckList', + }, + }, + { path: ':type/:id?', name: 'maintenanceAdd', component: () => import('@/views/device/deviceMaintenance/components/listApply/listPageAdd.vue'), diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts new file mode 100644 index 0000000..b6f5cf3 --- /dev/null +++ b/src/views/device/deviceMaintenance/checkList_interface.ts @@ -0,0 +1,36 @@ +export interface IlistQuery { + checkDate: string + checkName: string + checkNo: string + logType?: string + offset: number + limit: number +} +export interface ISupplier { + checkDate: null | string + checkName: string + checkNo: string + checkPerson: string + checkResult: string + checkResultName: string + createTime: null | string + createUser: string + fileList: [ + { + checkId: string + createTime: null | string + createUser: string + fileName: string + id: string + isDel: null | string + minioFileName: string + remark: string + updateTime: string + }, + ] + id: string + isDel: null | string + managerPoinLocation: string + remark: string + updateTime: null | string +} diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue new file mode 100644 index 0000000..0c3445d --- /dev/null +++ b/src/views/device/deviceMaintenance/components/manageAdd.vue @@ -0,0 +1,323 @@ + + + + + + + + 打印 + + + + 提交 + + + 关闭 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 无 + + + {{ formInline.fileList[0].minioFileName === '' ? '上传' : '更换附件' }} + + + + + + + + + + + diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue index 37e4ae0..f12b2b5 100644 --- a/src/views/device/deviceMaintenance/manageCheckList.vue +++ b/src/views/device/deviceMaintenance/manageCheckList.vue @@ -1,12 +1,311 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + 编辑 + + + 详情 + + + 删除 + + + + + + + + diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts new file mode 100644 index 0000000..525909d --- /dev/null +++ b/src/api/device/checkList.ts @@ -0,0 +1,46 @@ +// 设备借用相关接口api +import request from '../index' +// 设备管理点检查列表 +export function getcheckInfoList(data: { limit: number; offset: number }) { + return request({ + url: `/check/checkInfoList?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} + +// 数据删除 +export function getDeleteCheckInfo(data: object) { + return request({ + url: '/check/deleteCheckInfo', + method: 'post', + data, + }) +} + +// 数据导出 +export function getExportCheckInfoList(data: object) { + return request({ + url: '/check/exportCheckInfoList', + method: 'post', + responseType: 'blob', + data, + }) +} + +// 获取详情数据 +export function getselectCheckInfo(data: object) { + return request({ + url: '/check/selectCheckInfo', + method: 'post', + data, + }) +} +// 获取详情数据 +export function getAddCheckInfo(data: object) { + return request({ + url: '/check/addCheckInfo', + method: 'post', + data, + }) +} diff --git a/src/api/system/process.ts b/src/api/system/process.ts index ebd6e56..fa9e004 100644 --- a/src/api/system/process.ts +++ b/src/api/system/process.ts @@ -3,16 +3,10 @@ const prefix = '/system/flow' // 列表 -export function getProcessList(data: object) { - console.log('offset:', data.offset) - console.log('limit', data.limit) +export function getProcessList(data: { offset: number; limit: number }) { return request({ - url: `${prefix}/listPage`, + url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`, method: 'post', - headers: { - offset: data.offset, - limit: data.limit, - }, data, }) } @@ -77,3 +71,10 @@ }) } +// 获取关联业务列表 +export function getBusinessList() { + return request({ + url: `${prefix}/flowFormList`, + method: 'get', + }) +} diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts index 0c9033d..3d73df2 100644 --- a/src/router/modules/device.ts +++ b/src/router/modules/device.ts @@ -442,6 +442,18 @@ }, }, { + path: 'manageCheckList/:type/:id?', + name: 'manageAdd', + component: () => import('@/views/device/deviceMaintenance/components/manageAdd.vue'), + meta: { + title: '设备管理点检查表', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/maintenance/manageCheckList', + }, + }, + { path: ':type/:id?', name: 'maintenanceAdd', component: () => import('@/views/device/deviceMaintenance/components/listApply/listPageAdd.vue'), diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts new file mode 100644 index 0000000..b6f5cf3 --- /dev/null +++ b/src/views/device/deviceMaintenance/checkList_interface.ts @@ -0,0 +1,36 @@ +export interface IlistQuery { + checkDate: string + checkName: string + checkNo: string + logType?: string + offset: number + limit: number +} +export interface ISupplier { + checkDate: null | string + checkName: string + checkNo: string + checkPerson: string + checkResult: string + checkResultName: string + createTime: null | string + createUser: string + fileList: [ + { + checkId: string + createTime: null | string + createUser: string + fileName: string + id: string + isDel: null | string + minioFileName: string + remark: string + updateTime: string + }, + ] + id: string + isDel: null | string + managerPoinLocation: string + remark: string + updateTime: null | string +} diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue new file mode 100644 index 0000000..0c3445d --- /dev/null +++ b/src/views/device/deviceMaintenance/components/manageAdd.vue @@ -0,0 +1,323 @@ + + + + + + + + 打印 + + + + 提交 + + + 关闭 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 无 + + + {{ formInline.fileList[0].minioFileName === '' ? '上传' : '更换附件' }} + + + + + + + + + + + diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue index 37e4ae0..f12b2b5 100644 --- a/src/views/device/deviceMaintenance/manageCheckList.vue +++ b/src/views/device/deviceMaintenance/manageCheckList.vue @@ -1,12 +1,311 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + 编辑 + + + 详情 + + + 删除 + + + + + + + + diff --git a/src/views/system/process/process.ts b/src/views/system/process/process.ts index 7d97e9d..25b3325 100644 --- a/src/views/system/process/process.ts +++ b/src/views/system/process/process.ts @@ -5,7 +5,8 @@ name: string // 名称 business: string // 关联业务 person: string // 负责人 - time: string // 创建时间 + beginTime: string // 开始时间 + endTime: string // 结束时间 status: string // 当前流程状态 describe?: string // 流程描述 offset: number diff --git a/src/api/device/checkList.ts b/src/api/device/checkList.ts new file mode 100644 index 0000000..525909d --- /dev/null +++ b/src/api/device/checkList.ts @@ -0,0 +1,46 @@ +// 设备借用相关接口api +import request from '../index' +// 设备管理点检查列表 +export function getcheckInfoList(data: { limit: number; offset: number }) { + return request({ + url: `/check/checkInfoList?limit=${data.limit}&offset=${data.offset}`, + method: 'post', + data, + }) +} + +// 数据删除 +export function getDeleteCheckInfo(data: object) { + return request({ + url: '/check/deleteCheckInfo', + method: 'post', + data, + }) +} + +// 数据导出 +export function getExportCheckInfoList(data: object) { + return request({ + url: '/check/exportCheckInfoList', + method: 'post', + responseType: 'blob', + data, + }) +} + +// 获取详情数据 +export function getselectCheckInfo(data: object) { + return request({ + url: '/check/selectCheckInfo', + method: 'post', + data, + }) +} +// 获取详情数据 +export function getAddCheckInfo(data: object) { + return request({ + url: '/check/addCheckInfo', + method: 'post', + data, + }) +} diff --git a/src/api/system/process.ts b/src/api/system/process.ts index ebd6e56..fa9e004 100644 --- a/src/api/system/process.ts +++ b/src/api/system/process.ts @@ -3,16 +3,10 @@ const prefix = '/system/flow' // 列表 -export function getProcessList(data: object) { - console.log('offset:', data.offset) - console.log('limit', data.limit) +export function getProcessList(data: { offset: number; limit: number }) { return request({ - url: `${prefix}/listPage`, + url: `${prefix}/listPage?offset=${data.offset}&limit=${data.limit}`, method: 'post', - headers: { - offset: data.offset, - limit: data.limit, - }, data, }) } @@ -77,3 +71,10 @@ }) } +// 获取关联业务列表 +export function getBusinessList() { + return request({ + url: `${prefix}/flowFormList`, + method: 'get', + }) +} diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts index 0c9033d..3d73df2 100644 --- a/src/router/modules/device.ts +++ b/src/router/modules/device.ts @@ -442,6 +442,18 @@ }, }, { + path: 'manageCheckList/:type/:id?', + name: 'manageAdd', + component: () => import('@/views/device/deviceMaintenance/components/manageAdd.vue'), + meta: { + title: '设备管理点检查表', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/maintenance/manageCheckList', + }, + }, + { path: ':type/:id?', name: 'maintenanceAdd', component: () => import('@/views/device/deviceMaintenance/components/listApply/listPageAdd.vue'), diff --git a/src/views/device/deviceMaintenance/checkList_interface.ts b/src/views/device/deviceMaintenance/checkList_interface.ts new file mode 100644 index 0000000..b6f5cf3 --- /dev/null +++ b/src/views/device/deviceMaintenance/checkList_interface.ts @@ -0,0 +1,36 @@ +export interface IlistQuery { + checkDate: string + checkName: string + checkNo: string + logType?: string + offset: number + limit: number +} +export interface ISupplier { + checkDate: null | string + checkName: string + checkNo: string + checkPerson: string + checkResult: string + checkResultName: string + createTime: null | string + createUser: string + fileList: [ + { + checkId: string + createTime: null | string + createUser: string + fileName: string + id: string + isDel: null | string + minioFileName: string + remark: string + updateTime: string + }, + ] + id: string + isDel: null | string + managerPoinLocation: string + remark: string + updateTime: null | string +} diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue new file mode 100644 index 0000000..0c3445d --- /dev/null +++ b/src/views/device/deviceMaintenance/components/manageAdd.vue @@ -0,0 +1,323 @@ + + + + + + + + 打印 + + + + 提交 + + + 关闭 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 无 + + + {{ formInline.fileList[0].minioFileName === '' ? '上传' : '更换附件' }} + + + + + + + + + + + diff --git a/src/views/device/deviceMaintenance/manageCheckList.vue b/src/views/device/deviceMaintenance/manageCheckList.vue index 37e4ae0..f12b2b5 100644 --- a/src/views/device/deviceMaintenance/manageCheckList.vue +++ b/src/views/device/deviceMaintenance/manageCheckList.vue @@ -1,12 +1,311 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + 编辑 + + + 详情 + + + 删除 + + + + + + + + diff --git a/src/views/system/process/process.ts b/src/views/system/process/process.ts index 7d97e9d..25b3325 100644 --- a/src/views/system/process/process.ts +++ b/src/views/system/process/process.ts @@ -5,7 +5,8 @@ name: string // 名称 business: string // 关联业务 person: string // 负责人 - time: string // 创建时间 + beginTime: string // 开始时间 + endTime: string // 结束时间 status: string // 当前流程状态 describe?: string // 流程描述 offset: number diff --git a/src/views/system/process/process.vue b/src/views/system/process/process.vue index fb742de..4286086 100644 --- a/src/views/system/process/process.vue +++ b/src/views/system/process/process.vue @@ -1,16 +1,17 @@ @@ -293,19 +312,19 @@ /> - - + - --> + @@ -327,10 +346,18 @@ + + +