diff --git a/src/api/crm/project/inspection/data/index.ts b/src/api/crm/project/inspection/data/index.ts index 170c1dccf..5b345ef35 100644 --- a/src/api/crm/project/inspection/data/index.ts +++ b/src/api/crm/project/inspection/data/index.ts @@ -5,11 +5,11 @@ export interface ProjectInspectionDataVO { id: number // 主键ID configType: number // 巡检配置类型 name: string // 名称 - isRequired: boolean // 是否必填:0-否,1-是 + isRequired: number // 是否必填:0-否,1-是 type: number // 类型,1-文本,2-数字,3-单选,4-多选,5-日期,6-图片,7-文件 options: string // 选项内容 sortOrder: number // 排序序号 - status: boolean // 状态:0-停用,1-启用 + status: number // 状态:0-停用,1-启用 remark: string // 备注 } @@ -44,7 +44,7 @@ export interface ProjectInspectionDataVO { return await request.download({ url: `/crm/project-inspection-data/export-excel`, params }) } // 获取项目巡检内容列表 - export const getProjectInspectionDataList = async (type: number) => { - return await request.get({ url: `/crm/project-inspection-data/list?configType=` + type }) + export const getProjectInspectionDataList = async (types: any[]) => { + return await request.get({ url: `/crm/project-inspection-data/list`, params: { types: types.join(',') }}) } diff --git a/src/api/crm/project/inspection/index.ts b/src/api/crm/project/inspection/index.ts index f24c2182a..02bb70abe 100644 --- a/src/api/crm/project/inspection/index.ts +++ b/src/api/crm/project/inspection/index.ts @@ -2,15 +2,17 @@ import request from '@/config/axios' // 项目巡检配置 VO export interface ProjectInspectionConfigVO { + id?: number // 主键ID projectId: number // 项目ID configId: number // 配置ID + configType?: number // 配置类型 configName: string // 配置名称 frequency: string // 巡检频率 managementParty: string // 管理方 contactPerson: string // 联系人 contactPhone: string // 联系电话 responsiblePersonId: string // 负责人 - status: boolean // 状态:0-停用,1-启用 + status: number // 状态:0-停用,1-启用 remark: string // 备注 } diff --git a/src/api/crm/project/inspection/record/index.ts b/src/api/crm/project/inspection/record/index.ts new file mode 100644 index 000000000..d7dd31249 --- /dev/null +++ b/src/api/crm/project/inspection/record/index.ts @@ -0,0 +1,43 @@ +import request from '@/config/axios' + +// 巡检记录 VO +export interface ProjectInspectionRecordVO { + id: number // 主键ID + projectId: number // 项目ID + inspectionDate: Date // 巡检日期 + inspector: number // 巡检人 + overallStatus: number // 总体状态 + summary: string // 巡检总结 + remark: string // 备注 + status: number // 状态 +} + +// 查询巡检记录分页 +export const getProjectInspectionRecordPage = async (params: any) => { + return await request.get({ url: `/crm/project-inspection-record/page`, params }) +} + +// 查询巡检记录详情 +export const getProjectInspectionRecord = async (id: number) => { + return await request.get({ url: `/crm/project-inspection-record/get?id=` + id }) +} + +// 新增巡检记录 +export const createProjectInspectionRecord = async (data: ProjectInspectionRecordVO) => { + return await request.post({ url: `/crm/project-inspection-record/create`, data }) +} + +// 修改巡检记录 +export const updateProjectInspectionRecord = async (data: ProjectInspectionRecordVO) => { + return await request.put({ url: `/crm/project-inspection-record/update`, data }) +} + +// 删除巡检记录 +export const deleteProjectInspectionRecord = async (id: number) => { + return await request.delete({ url: `/crm/project-inspection-record/delete?id=` + id }) +} + +// 导出巡检记录 Excel +export const exportProjectInspectionRecord = async (params) => { + return await request.download({ url: `/crm/project-inspection-record/export-excel`, params }) +} diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 1d899e42e..8e39a0637 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -231,6 +231,8 @@ export enum DICT_TYPE { CRM_PROJECT_SETTLEMENT_STATUS = 'crm_project_settlement_status', // CRM 项目结算状态 CRM_PROJECT_INSPECTION_CHECKPOINT = 'crm_project_inspection_checkpoint', // CRM 项目巡检配置 CRM_PROJECT_INSPECTION_DATA_TYPE = 'crm_project_inspection_data_type', // CRM 项目巡检内容类型 + CRM_PROJECT_INSPECTION_RECORD_OVERALL_STATUS = 'crm_project_inspection_record_overall_status', // CRM 项目巡检记录总体状态 + CRM_PROJECT_INSPECTION_RECORD_STATUS = 'crm_project_inspection_record_status', // CRM 项目巡检记录状态 // ========== ERP - 企业资源计划模块 ========== diff --git a/src/views/crm/project/inspection/config/checkpoint/ProjectInspectionCheckpointForm.vue b/src/views/crm/project/inspection/config/checkpoint/ProjectInspectionCheckpointForm.vue new file mode 100644 index 000000000..58bc2e62c --- /dev/null +++ b/src/views/crm/project/inspection/config/checkpoint/ProjectInspectionCheckpointForm.vue @@ -0,0 +1,128 @@ + + \ No newline at end of file diff --git a/src/views/crm/project/inspection/config/data/ProjectInspectionDataForm.vue b/src/views/crm/project/inspection/config/data/ProjectInspectionDataForm.vue index e0e59df49..a247c4566 100644 --- a/src/views/crm/project/inspection/config/data/ProjectInspectionDataForm.vue +++ b/src/views/crm/project/inspection/config/data/ProjectInspectionDataForm.vue @@ -16,7 +16,7 @@ class="!w-full" > - + + - +
+
+ + +
+ + 添加选项 + +
@@ -115,6 +143,7 @@ \ No newline at end of file + + + \ No newline at end of file diff --git a/src/views/crm/project/inspection/config/data/index.vue b/src/views/crm/project/inspection/config/data/index.vue index ab3a55285..236495cf0 100644 --- a/src/views/crm/project/inspection/config/data/index.vue +++ b/src/views/crm/project/inspection/config/data/index.vue @@ -104,7 +104,6 @@ -