diff --git a/src/api/archivesManagement/fileManager/fileManager.js b/src/api/archivesManagement/fileManager/fileManager.js index 78131aa..82f8b7a 100644 --- a/src/api/archivesManagement/fileManager/fileManager.js +++ b/src/api/archivesManagement/fileManager/fileManager.js @@ -20,10 +20,19 @@ export function getFileManageTreeApi(params) { }) } -// 新增档案目录 -export function addArchiveLeftApi(data) { +// 获取档案目录树(新增/编辑) +export function getFileManageTreeByAddOrUpdateApi(params) { return request({ - url: '/smartArchives/fileManage/addLeft', + url: '/smartArchives/fileManage/getFileManageTreeByAddOrUpdate', + method: 'get', + params:params, + }) +} + +// 新增档案目录 +export function addFileManageLeftApi(data) { + return request({ + url: '/smartArchives/fileManage/addFileManageLeft', method: 'post', data:data }) @@ -39,9 +48,9 @@ export function addArchiveRightApi(data) { } // 修改档案目录 -export function editArchiveLeftApi(data) { +export function updateFileManageLeftApi(data) { return request({ - url: '/smartArchives/fileManage/editLeft', + url: '/smartArchives/fileManage/updateFileManageLeft', method: 'post', data:data, }) @@ -86,7 +95,7 @@ export function getFileManageApi(params) { // 查询序号 export function geMaxSortApi(params) { return request({ - url: '/smartArchives/fileManage/geMaxSort', + url: '/smartArchives/fileManage/getMaxSort', method: 'get', params }) diff --git a/src/views/archivesManagement/archClass/archCatalogue/components/rightTable.vue b/src/views/archivesManagement/archClass/archCatalogue/components/rightTable.vue index ddd345c..686e1ea 100644 --- a/src/views/archivesManagement/archClass/archCatalogue/components/rightTable.vue +++ b/src/views/archivesManagement/archClass/archCatalogue/components/rightTable.vue @@ -108,7 +108,7 @@ export default { this.title = "详情"; this.isAdd = 'detail'; this.row = row; - this.row.belongName = this.selectedNode.label + '/' + this.selectedNode.parentName + this.row.belongName = this.selectedNode.parentName + '/' + this.selectedNode.label this.row.detailStatus = true; this.isflag = true; }, diff --git a/src/views/archivesManagement/fileManager/components/addTreeData.vue b/src/views/archivesManagement/fileManager/components/addTreeData.vue index 871a675..5ad4395 100644 --- a/src/views/archivesManagement/fileManager/components/addTreeData.vue +++ b/src/views/archivesManagement/fileManager/components/addTreeData.vue @@ -33,7 +33,7 @@ import _ from 'lodash' import Treeselect from "@riophae/vue-treeselect"; import "@riophae/vue-treeselect/dist/vue-treeselect.css"; -import { getArchivalCatalogueTreeApi, addFileManageApi, updateFileManageApi,geMaxSortApi } from '@/api/archivesManagement/index.js' +import { getFileManageTreeByAddOrUpdateApi, addFileManageLeftApi, updateFileManageLeftApi,geMaxSortApi } from '@/api/archivesManagement/fileManager/fileManager.js' export default { name: "FileAddTreeData", props: ["width", "dataForm", "title", "disabled", "isAdd", "rowData"], @@ -225,7 +225,7 @@ export default { }, // 获取左侧树列表 async getLeftTreeList(value) { - const res = await getArchivalCatalogueTreeApi({id:value}) + const res = await getFileManageTreeByAddOrUpdateApi({id:value}) const transformedData = this.convertToVueTree(res.data) this.treeDataList = transformedData; }, @@ -275,7 +275,7 @@ export default { let params = _.cloneDeep(this.form); if (this.isAdd === 'add') { - addFileManageApi(params).then(res => { + addFileManageLeftApi(params).then(res => { this.loading.close(); if (res.code === 200) { this.handleReuslt(res); @@ -287,7 +287,7 @@ export default { // this.$modal.msgError('提交失败,请重试'); }); } else { - updateFileManageApi(params).then(res => { + updateFileManageLeftApi(params).then(res => { this.loading.close(); if (res.code === 200) { this.handleReuslt(res); diff --git a/src/views/archivesManagement/fileManager/components/config.js b/src/views/archivesManagement/fileManager/components/config.js index 9e56199..58a7be0 100644 --- a/src/views/archivesManagement/fileManager/components/config.js +++ b/src/views/archivesManagement/fileManager/components/config.js @@ -6,13 +6,20 @@ export const formLabel = [ f_model: 'contentName', f_max: 32, }, + { + isShow: false, // 是否展示label + f_type: 'date', + f_label: '上传时间', + f_model: 'uploadTime', + }, ] export const columnsList = [ - { t_props: 'contentName', t_label: '文件名称',t_width:220 }, - { t_props: 'term', t_label: '案卷期限' }, - { t_props: 'markCode', t_label: '档案标识代码' }, - { t_props: 'unitName', t_label: '归档责任单位' }, - { t_props: 'major', t_label: '所属专业' }, - { t_props: 'classifyMark', t_label: '文件分类标记' } + { t_props: 'contentName', t_label: '档案名称',t_width:200 }, + { t_props: 'fileName', t_label: '档案文件' }, + { t_props: 'markCode', t_label: '上传人' }, + { t_props: 'unitName', t_label: '保管期限' }, + { t_slot: 'dataSource', t_label: '来源' }, + { t_props: 'unitName', t_label: '责任单位' }, + { t_props: 'classifyMark', t_label: '上传时间' } ] \ No newline at end of file diff --git a/src/views/archivesManagement/fileManager/components/rightTable.vue b/src/views/archivesManagement/fileManager/components/rightTable.vue index 2efd483..e84ab2e 100644 --- a/src/views/archivesManagement/fileManager/components/rightTable.vue +++ b/src/views/archivesManagement/fileManager/components/rightTable.vue @@ -5,22 +5,22 @@