diff --git a/src/api/common.js b/src/api/common.js index 16a363f..830dccb 100644 --- a/src/api/common.js +++ b/src/api/common.js @@ -103,3 +103,12 @@ export const deleteFileAPI = (id) => { }, }) } + +// 查询修改记录 +export const getUpdateRecordAPI = (data) => { + return request({ + url: '/bmw/subCompany/getHisList', + method: 'GET', + params: data, + }) +} diff --git a/src/views/basic-manage/project-manage/all-project/index.vue b/src/views/basic-manage/project-manage/all-project/index.vue index 44c55f5..228a0ae 100644 --- a/src/views/basic-manage/project-manage/all-project/index.vue +++ b/src/views/basic-manage/project-manage/all-project/index.vue @@ -168,25 +168,35 @@ @@ -257,6 +267,7 @@ import { getAllProjectListAPI, } from '@/api/basic-manage/project-manage/all-project' import { getSubCompanySelectListCommonFun } from '@/utils/getCommonData' +import { getUpdateRecordAPI } from '@/api/common' export default { name: 'All-project', dicts: ['voltage_level', 'project_type', 'project_status'], @@ -485,8 +496,13 @@ export default { }, // 历史记录 - onHandleHistoryRecord(data) { - console.log(data) + async onHandleHistoryRecord(data) { + const res = await getUpdateRecordAPI({ + type: 4, + id: data.id, + }) + + this.historyRecordList = res.rows this.dialogConfig.outerWidth = '60%' this.dialogConfig.minHeight = '60vh' this.dialogConfig.maxHeight = '90vh' diff --git a/src/views/basic-manage/project-manage/dept-project/index.vue b/src/views/basic-manage/project-manage/dept-project/index.vue index 3fa22d6..1360edf 100644 --- a/src/views/basic-manage/project-manage/dept-project/index.vue +++ b/src/views/basic-manage/project-manage/dept-project/index.vue @@ -170,25 +170,35 @@ @@ -258,6 +268,7 @@ import { addAndEditDeptProjectAPI, } from '@/api/basic-manage/project-manage/dept-project' import { getSubCompanySelectListCommonFun } from '@/utils/getCommonData' +import { getUpdateRecordAPI } from '@/api/common' export default { name: 'Dept-project', dicts: ['project_type', 'project_status'], // 字典类型 @@ -464,8 +475,13 @@ export default { }, // 历史记录 - onHandleHistoryRecord(data) { - console.log(data) + async onHandleHistoryRecord(data) { + const res = await getUpdateRecordAPI({ + type: 3, + orgId: data.id, + }) + + this.historyRecordList = res.rows this.dialogConfig.outerWidth = '60%' this.dialogConfig.minHeight = '60vh' this.dialogConfig.maxHeight = '90vh' diff --git a/src/views/basic-manage/project-manage/lot-project/index.vue b/src/views/basic-manage/project-manage/lot-project/index.vue index 5595795..c2c3aa6 100644 --- a/src/views/basic-manage/project-manage/lot-project/index.vue +++ b/src/views/basic-manage/project-manage/lot-project/index.vue @@ -102,25 +102,35 @@ @@ -159,6 +169,7 @@ import { getSubCompanySelectListCommonFun, getLotProjectSelectListCommonFun, } from '@/utils/getCommonData' +import { getUpdateRecordAPI } from '@/api/common' export default { name: 'Lot-project', dicts: ['project_type', 'project_status', 'project_action'], @@ -345,8 +356,14 @@ export default { this.dialogConfig.outerVisible = false }, // 历史记录 - onHandleHistoryRecord(data) { - console.log(data) + async onHandleHistoryRecord(data) { + const res = await getUpdateRecordAPI({ + type: 5, + id: data.id, + }) + + this.historyRecordList = res.rows + this.dialogConfig.outerTitle = '历史记录' this.dialogConfig.outerWidth = '60%' this.dialogConfig.minHeight = '60vh' diff --git a/src/views/system/basic-type-config/divide-company-manage/config.js b/src/views/system/basic-type-config/divide-company-manage/config.js index e4809ca..c5254d3 100644 --- a/src/views/system/basic-type-config/divide-company-manage/config.js +++ b/src/views/system/basic-type-config/divide-company-manage/config.js @@ -5,6 +5,14 @@ export const formLabel = [ f_type: 'ipt', isShow: false, // 是否展示label }, + { + isShow: false, + f_label: '创建时间', + f_model: 'createTime', + f_type: 'dateRange', + dateType: ['startTime', 'endTime'], + f_selList: [], + }, ] export const columnsList = [ diff --git a/src/views/system/basic-type-config/divide-company-manage/index.vue b/src/views/system/basic-type-config/divide-company-manage/index.vue index 4965da2..5c03a62 100644 --- a/src/views/system/basic-type-config/divide-company-manage/index.vue +++ b/src/views/system/basic-type-config/divide-company-manage/index.vue @@ -144,25 +144,35 @@ @@ -181,6 +191,7 @@ import { getDivideCompanyManageListAPI, } from '@/api/system/basic-type-config/divide-company-manage' import { getCompanySelectListCommonFun } from '@/utils/getCommonData' +import { getUpdateRecordAPI } from '@/api/common' export default { name: 'DivideCompanyManage', components: { @@ -193,6 +204,7 @@ export default { columnsList, dialogConfig, getDivideCompanyManageListAPI, + historyRecordList: [], addOrEditForm: { comId: null, // 所属公司id subCompanyName: '', // 分公司名称 @@ -326,8 +338,13 @@ export default { }, // 历史记录 - onHandleHistoryRecord(data) { - console.log(data) + async onHandleHistoryRecord(data) { + const res = await getUpdateRecordAPI({ + type: 2, + id: data.id, + }) + + this.historyRecordList = res.rows this.dialogConfig.outerWidth = '60%' this.dialogConfig.minHeight = '60vh' this.dialogConfig.maxHeight = '90vh'