diff --git a/src/assets/styles/archives-manage.scss b/src/assets/styles/archives-manage.scss index 64a2b70..dd56b77 100644 --- a/src/assets/styles/archives-manage.scss +++ b/src/assets/styles/archives-manage.scss @@ -595,6 +595,13 @@ height: calc(100vh - 159px); } +.storage-drawer.el-drawer__wrapper { + height: calc(100vh - 133px); +} +[data-theme=dark] .storage-drawer.el-drawer__wrapper { + height: calc(100vh - 173px); +} + .el-drawer{ overflow: visible; } @@ -640,6 +647,12 @@ padding: 20px; } } +.storage-drawer.el-drawer__wrapper { + .el-drawer__body{ + padding: 54px 20px 20px 20px; + } +} + .closed-btn{ position: relative; diff --git a/src/views/archiveKeeping/inStorage/index.vue b/src/views/archiveKeeping/inStorage/index.vue index e66afa1..bebe879 100644 --- a/src/views/archiveKeeping/inStorage/index.vue +++ b/src/views/archiveKeeping/inStorage/index.vue @@ -57,13 +57,31 @@
-
    +
      +
    • 待出库档案盒
      • +
    • 待出库档案
      • + + +
    +
      +
    • 档案盒记录
      • +
    • 档案记录
      • + + +
    +
    • 待入库档案盒
    • 待入库档案
    - + +
    + + + + +
@@ -74,12 +92,15 @@ import crudCategory from '@/api/category/category' import { FetchDictionaryTreeByCategoryId } from '@/api/system/dict' import CRUD, { presenter, header } from '@crud/crud' -import pendingInCase from './pendingInCase/index' -import PendingInArchive from './pendingInArchive/index' +import PendingInCase from './pendingInCase/index' +import Project from './pendingInArchive/project/index' +import Anjuan from './pendingInArchive/anjuan/index' +import Juannei from './pendingInArchive/juannei/index' +import File from './pendingInArchive/file/index' export default { name: 'InStorage', - components: { pendingInCase, PendingInArchive }, + components: { PendingInCase, Project, Anjuan, Juannei, File }, cruds() { return [ CRUD({ @@ -96,7 +117,16 @@ export default { ] }, mixins: [presenter(), header()], + provide() { + return { + parentsData: this + } + }, props: { + storageType: { + type: String, + default: 'in' + } }, data() { return { @@ -117,20 +147,16 @@ export default { 'archive_year': null, // 年度 'fonds_no': null // 全宗 }, + yearChildData: '', + parentsProjectId: null, + parentsProjectRow: null, + parentsAnjuanId: null, classifyTree: [], classifyLoading: false, activeIndex: 0 } }, computed: { - comName: function() { - if (this.activeIndex === 0) { - return 'pendingInCase' - } else if (this.activeIndex === 1) { - return 'pendingInArchive' - } - return 'pendingInCase' - } }, created() { }, @@ -248,7 +274,47 @@ export default { this.handlePageList() }) }, - handlePageList() { + handlePageList(isQuickFilter) { + // if (this.storageCategory.arrangeType === 3) { + // const tablistEle = this.$refs.projectEle + // // 项目下 + // if (isQuickFilter) { + // tablistEle.$refs.collectHeaderRef.getInitArchivesClass() + // tablistEle.getTableDisplayFieldsLoading = true + // tablistEle.getViewTableList(1, null, isQuickFilter) + // } else { + // this.$refs.projectEle.getCommonData(1) + // } + // } else if (this.storageCategory.arrangeType === 2) { + // const tablistEle = this.$refs.anjuanEle.$refs.ajContent.$refs.tableList + // // 案卷下 + // if (isQuickFilter) { + // tablistEle.$refs.collectHeaderRef.getInitArchivesClass() + // tablistEle.getTableDisplayFieldsLoading = true + // tablistEle.getViewTableList(2, null, isQuickFilter) + // } else { + // tablistEle.getCommonData(2) + // } + // } else if (this.storageCategory.arrangeType === 1) { + // const tablistEle = this.$refs.anjuanEle.$refs.ajContent.$refs.tableList + // // 文件下 + // if (isQuickFilter) { + // tablistEle.$refs.collectHeaderRef.getInitArchivesClass() + // tablistEle.getTableDisplayFieldsLoading = true + // tablistEle.getViewTableList(3, null, isQuickFilter) + // } else { + // tablistEle.getCommonData(3) + // } + // } + if (this.$refs.anjuanEle) { + this.$refs.anjuanEle.anjuanDrawer = false + } + if (this.$refs.juanneiEle) { + this.$refs.juanneiEle.juanneiDrawer = false + } + if (this.$refs.fileEle) { + this.$refs.fileEle.fileDrawer = false + } }, getDictionaryTreeByCategoryId(categoryId) { this.classifyLoading = true @@ -329,6 +395,47 @@ export default { }, changeActiveTab(val) { this.activeIndex = val + }, + handleOpenAnjuan(data, parentId, parentsRow) { + this.parentsProjectId = parentId + this.parentsProjectRow = parentsRow + this.$refs.anjuanEle.anjuanDrawer = true + this.activeIndex = 0 + if (this.$refs.anjuanEle.$refs.ajContent) { + this.$refs.anjuanEle.$refs.ajContent.activeIndex = 0 + } + this.$nextTick(() => { + // this.$refs.anjuanEle.$refs.ajContent.$refs.tableList.getCommonData(2, this.parentsProjectId) + this.$refs.anjuanEle.$refs.ajContent.test = data + }) + }, + handleOpenJuannei(data, parentId) { + this.parentsAnjuanId = parentId + console.log('this.parentsAnjuanId', this.parentsAnjuanId) + if (this.storageCategory.arrangeType === 1 || (this.storageCategory.arrangeType === 3 && this.$refs.anjuanEle.$refs.ajContent.activeIndex === 1) || (this.storageCategory.arrangeType === 2 && this.$refs.anjuanEle.$refs.ajContent.activeIndex === 1)) { + this.$refs.fileEle.fileDrawer = true + this.$nextTick(() => { + // this.$refs.fileEle.getCommonData(4, this.parentsAnjuanId) + this.$refs.fileEle.test = data + this.$refs.fileEle.isAjNo = 1 + }) + } else { + this.$refs.juanneiEle.juanneiDrawer = true + this.$nextTick(() => { + // this.$refs.juanneiEle.getCommonData(3, this.parentsAnjuanId) + this.$refs.juanneiEle.test = data + this.$refs.fileEle.isAjNo = 0 + }) + } + }, + handleOpenFile(data, parentId) { + this.parentsJuanneiId = parentId + console.log('this.parentsJuanneiId', this.parentsJuanneiId) + this.$refs.fileEle.fileDrawer = true + this.$nextTick(() => { + // this.$refs.fileEle.getCommonData(4, this.parentsJuanneiId) + this.$refs.fileEle.test = data + }) } } } diff --git a/src/views/archiveKeeping/inStorage/pendingInArchive/anjuan/content.vue b/src/views/archiveKeeping/inStorage/pendingInArchive/anjuan/content.vue new file mode 100644 index 0000000..c00017f --- /dev/null +++ b/src/views/archiveKeeping/inStorage/pendingInArchive/anjuan/content.vue @@ -0,0 +1,48 @@ + + + + + diff --git a/src/views/archiveKeeping/inStorage/pendingInArchive/anjuan/index.vue b/src/views/archiveKeeping/inStorage/pendingInArchive/anjuan/index.vue new file mode 100644 index 0000000..f864dae --- /dev/null +++ b/src/views/archiveKeeping/inStorage/pendingInArchive/anjuan/index.vue @@ -0,0 +1,71 @@ + + + + + diff --git a/src/views/archiveKeeping/inStorage/pendingInArchive/anjuan/tableList.vue b/src/views/archiveKeeping/inStorage/pendingInArchive/anjuan/tableList.vue new file mode 100644 index 0000000..5def1e1 --- /dev/null +++ b/src/views/archiveKeeping/inStorage/pendingInArchive/anjuan/tableList.vue @@ -0,0 +1,282 @@ + + + + + diff --git a/src/views/archiveKeeping/inStorage/pendingInArchive/file/index.vue b/src/views/archiveKeeping/inStorage/pendingInArchive/file/index.vue new file mode 100644 index 0000000..7993cde --- /dev/null +++ b/src/views/archiveKeeping/inStorage/pendingInArchive/file/index.vue @@ -0,0 +1,251 @@ + + + + + diff --git a/src/views/archiveKeeping/inStorage/pendingInArchive/index.vue b/src/views/archiveKeeping/inStorage/pendingInArchive/index.vue deleted file mode 100644 index 1f9d224..0000000 --- a/src/views/archiveKeeping/inStorage/pendingInArchive/index.vue +++ /dev/null @@ -1,22 +0,0 @@ - - - - - diff --git a/src/views/archiveKeeping/inStorage/pendingInArchive/juannei/index.vue b/src/views/archiveKeeping/inStorage/pendingInArchive/juannei/index.vue new file mode 100644 index 0000000..d8e4227 --- /dev/null +++ b/src/views/archiveKeeping/inStorage/pendingInArchive/juannei/index.vue @@ -0,0 +1,246 @@ + + + + + diff --git a/src/views/archiveKeeping/inStorage/pendingInArchive/mixins/index.js b/src/views/archiveKeeping/inStorage/pendingInArchive/mixins/index.js new file mode 100644 index 0000000..f5a4c4c --- /dev/null +++ b/src/views/archiveKeeping/inStorage/pendingInArchive/mixins/index.js @@ -0,0 +1,324 @@ + +import { FetchInitCategoryViewTable } from '@/api/collect/collect' +import { FetchInitContorlView } from '@/api/archivesManage/library' +import { FetchDictionaryTree } from '@/api/system/dict' +import { crud } from '@crud/crud' +export const manageLibraryCrud = { + mixins: [crud()], + // 组件共用属性 + data() { + return { + getTableDisplayFieldsLoading: false, + tableDisplayFields: [], + projectData: [], + anjuanData: [], + junneiData: [], + fileData: [], + arrySort: [], + page: { + page: 1, + size: 10, + total: 0 + }, + timer: null, + query: { + search: null, + project_class: null, + archive_ctg_no: null + }, + classifyTree: [], + classifyLoading: false, + parentsId: null + } + }, + // 组件挂载时的共用方法 + mounted() { + }, + // 组件共用方法 + methods: { + // 缓存用户对于固定栏操作习惯 + statusBarChecked(val) { + this.fixedStatusBar = val + localStorage.setItem('statusBarFixedType', val) + }, + handleSearch(categoryLevel) { + console.log('selectStatus', this.selectStatus) + this.parentsData.$refs.classifyTree.setCurrentKey(null) + this.smartQuery = { + 'retention': null, + 'security_class': null, + 'doc_type': null, + 'medium_type': null, + 'archive_year': null, + 'fonds_no': null + } + // 2 项目 3 案卷 /文件 4 卷内 6 文件 + if (this.isTitleType === 2) { + this.parentsId = null + this.$parent.getTableDisplayFieldsLoading = true + } else if (this.isTitleType === 3) { + if (this.storageCategory.arrangeType === 1) { + this.parentsId = null + } else { + if (this.activeIndex === 1) { + this.parentsId = null + } else { + this.parentsId = this.parentsData.parentsProjectId + } + } + this.$parent.getTableDisplayFieldsLoading = true + } else if (this.isTitleType === 4) { + // 卷内 + this.$parent.$parent.getTableDisplayFieldsLoading = true + this.parentsId = this.parentsData.parentsAnjuanId + } else if (this.isTitleType === 6) { + // 原文 + if (this.storageCategory.arrangeType === 1) { + this.parentsId = this.parentsData.parentsAnjuanId + this.$parent.getTableDisplayFieldsLoading = true + } else { + this.$parent.$parent.getTableDisplayFieldsLoading = true + if (this.parentsData.isTabFile) { + this.parentsId = this.parentsData.parentsAnjuanId + } else { + this.parentsId = this.parentsData.parentsJuanneiId + } + } + } + setTimeout(() => { + this.getViewTable(categoryLevel, this.parentsId, 'search') + }, 200) + }, + getViewTable(categoryLevel, parentsId, type) { + this.getTableDisplayFieldsLoading = true + this.tableDisplayFields = [] + FetchInitCategoryViewTable({ categoryId: this.storageCategory.id, categoryLevel: categoryLevel }).then((res) => { + if (res) { + this.arrySort = [] + this.tableDisplayFields = res + const orderSortArry = this.tableDisplayFields.filter(item => item.queue).sort((a, b) => a.queue - b.queue) + orderSortArry.forEach(item => { + if (item.displayOrderBy) { + this.arrySort.push(item.fieldName + ',' + item.displayOrderBy) + } + }) + this.$nextTick(() => { + this.getViewTableList(categoryLevel, parentsId, type) + }) + } + }) + }, + getViewTableList(categoryLevel, parentsId, type) { + console.log(this.smartQuery.fonds_no) + const params = { + 'parentId': parentsId, + 'categoryId': this.storageCategory.id, + 'categoryLevel': categoryLevel, + 'ignore': false, + 'isdel': (this.parentsData.isdel && categoryLevel === 3) ? false : this.parentsData.isdel, + 'checkTypes': this.selectStatus && this.selectStatus.length !== 0 ? this.selectStatus.join(',') : null, + 'search': this.query.search, + 'retention': this.smartQuery.retention, + 'security_class': this.smartQuery.security_class, + 'medium_type': this.smartQuery.medium_type, + 'doc_type': this.smartQuery.doc_type, + 'archive_year': this.smartQuery.archive_year, + 'fonds_no': this.smartQuery.fonds_no, + 'project_class': this.query.project_class, + 'archive_ctg_no': this.query.archive_ctg_no, + 'page': this.page.page - 1, + 'size': this.page.size, + 'sort': this.arrySort + } + FetchInitContorlView(params).then((res) => { + console.log('resssss', res) + if (res.code !== 500) { + this.parentsData.listCategory = res.category + if (categoryLevel === 1) { + // 项目 + const projectObj = this.parentsData.$refs.projectEle + this.projectData = res.list.content + this.page.total = res.list.totalElements + this.yearData = res.yearGroup + if (this.yearData && type !== 'quickFilter') { + this.$emit('myYearEvent', this.yearData) + } + if (type === 'search') { + projectObj.projectData = res.list.content + projectObj.page.total = res.list.totalElements + projectObj.getTableDisplayFieldsLoading = false + } + } else if (categoryLevel === 2) { + // 案卷 + const anjuanObj = this.parentsData.$refs.anjuanEle.$refs.ajContent.$refs.tableList + this.anjuanData = res.list.content + this.page.total = res.list.totalElements + this.yearData = res.yearGroup + if (this.yearData && type !== 'quickFilter') { + this.$parent.$parent.$emit('myYearEvent', this.yearData) + } + // 搜索/新增/编辑 非 案卷是主页的时候 + if (type === 'search') { + anjuanObj.anjuanData = res.list.content + anjuanObj.page.total = res.list.totalElements + anjuanObj.getTableDisplayFieldsLoading = false + } + } else if (categoryLevel === 3) { + if (this.isTitleType === 3) { + // 案卷下的未整理 / 文件为主页时 + const wjObj = this.parentsData.$refs.anjuanEle.$refs.ajContent.$refs.tableList + this.anjuanData = res.list.content + this.page.total = res.list.totalElements + this.yearData = res.yearGroup + if (this.yearData && type !== 'quickFilter') { + this.$parent.$parent.$emit('myYearEvent', this.yearData) + } + if (type === 'search') { + wjObj.anjuanData = res.list.content + wjObj.page.total = res.list.totalElements + wjObj.getTableDisplayFieldsLoading = false + } + } else { + // 卷内 + this.junneiData = res.list.content + this.page.total = res.list.totalElements + if (type === 'search') { + this.parentsData.$refs.juanneiEle.junneiData = res.list.content + this.parentsData.$refs.juanneiEle.page.total = res.list.totalElements + this.parentsData.$refs.juanneiEle.getTableDisplayFieldsLoading = false + } + } + } else { + // 原文 + this.fileData = res.list.content + this.page.total = res.list.totalElements + if (type === 'search') { + this.parentsData.$refs.fileEle.fileData = res.list.content + this.parentsData.$refs.fileEle.page.total = res.list.totalElements + this.parentsData.$refs.fileEle.getTableDisplayFieldsLoading = false + } + } + } + this.getTableDisplayFieldsLoading = false + this.crud.selections = [] + if (categoryLevel === 3) { + // 按件 + if (this.isTitleType === 3) { + const wjObj = this.parentsData.$refs.anjuanEle.$refs.ajContent.$refs.tableList + wjObj.selections = [] + wjObj.$refs.table.clearSelection() // 清空选中 + wjObj.$refs.table.setCurrentRow(-1) // 清除高亮 + } else { + const juanneiObj = this.parentsData.$refs.juanneiEle + juanneiObj.selections = [] + juanneiObj.$refs.table.clearSelection() + juanneiObj.$refs.table.setCurrentRow(-1) + } + } else if (categoryLevel === 2) { + // 按卷 + const anjuanObj = this.parentsData.$refs.anjuanEle.$refs.ajContent.$refs.tableList + anjuanObj.selections = [] + anjuanObj.$refs.table.clearSelection() + anjuanObj.$refs.table.setCurrentRow(-1) + } else if (categoryLevel === 1) { + // 项目 + const projectObj = this.parentsData.$refs.projectEle + projectObj.selections = [] + projectObj.$refs.table.clearSelection() + projectObj.$refs.table.setCurrentRow(-1) + } else { + const fileObj = this.parentsData.$refs.fileEle + fileObj.selections = [] + fileObj.$refs.table.clearSelection() + fileObj.$refs.table.setCurrentRow(-1) + } + }) + }, + // 项目级别 - 阶段分类 + getDictsList(type) { + FetchDictionaryTree().then((res) => { + const filterCodes = ['project_class'] + let filteredItems = JSON.parse(JSON.stringify(res)).filter(item => filterCodes.includes(item.dictionaryCode)) + filteredItems = this.addLevelToDictionaryList(filteredItems, 1) + + if (type === 1) { + let fiterData = [] + fiterData = filteredItems.flatMap(item => { + const level2Childs = item.childDictionarys.filter(child => { + return child.dictionaryParents === item.id && child.level === 2 + }) + return level2Childs + }) + if (this.parentsData.parentsProjectRow) { + console.log(this.parentsData.parentsProjectRow.project_class) + const anjuanObj = this.parentsData.$refs.anjuanEle.$refs.ajContent.$refs.tableList + anjuanObj.$refs.collectHeaderRef.projectOptions = [] + if (this.parentsData.parentsProjectRow.project_class !== '') { + const findDic = fiterData.find(item => item.dictionaryName === this.parentsData.parentsProjectRow.project_class) + anjuanObj.$refs.collectHeaderRef.projectOptions.push(findDic) + } else { + console.log(fiterData) + anjuanObj.$refs.collectHeaderRef.projectOptions = fiterData + } + } + } else { + if (this.storageCategory.arrangeType === 3) { + const projectObj = this.$refs.projectEle + // this.projectOptions = this.filterData(filteredItems, filteredItems[0].id) + projectObj.$refs.collectHeaderRef.projectOptions = filteredItems.flatMap(item => { + const level2Childs = item.childDictionarys.filter(child => { + return child.dictionaryParents === item.id && child.level === 2 + }) + // 将满足条件的子项目的childDictionarys设置为空数组,因为项目页不需要 + level2Childs.forEach(child => { + child.childDictionarys = [] + }) + return level2Childs + }) + } + } + }).catch(err => { + console.log(err) + }) + }, + // 显示第一级和第二级 + // filterData(data, targetId) { + // return data.filter(item => { + // if (item.id === targetId || item.dictionaryParents === targetId) { + // if (item.childDictionarys && item.childDictionarys.length > 0) { + // item.childDictionarys = this.filterData(item.childDictionarys, targetId) + // } + // return true + // } + // return false + // }) + // }, + // 给筛选出来的数据加level 方便后面是否可点击 + addLevelToDictionaryList(dictionaryList, level) { + dictionaryList.forEach(dictionary => { + dictionary.level = level + if (dictionary.childDictionarys) { + dictionary.childDictionarys = this.addLevelToDictionaryList(dictionary.childDictionarys, level + 1) + } + }) + return dictionaryList + }, + normalizerProject(node) { + if ((node.childDictionarys && !node.childDictionarys.length) || node.childDictionarys === null) { + delete node.childDictionarys + } + return { + id: node.dictionaryName, + label: `${node.dictionaryName} - ${node.dictionaryCode}`, + children: node.childDictionarys, + isDisabled: this.isTitleType === 3 ? node.level !== 3 : node.level === 1 + } + }, + /* 重新渲染table组件 防止table-fixed 错位 配合watch-table数据 */ + doLayout() { + this.$nextTick(() => { + this.$refs.table.doLayout() + }) + } + } +} diff --git a/src/views/archiveKeeping/inStorage/pendingInArchive/module/archivesInfo/index.vue b/src/views/archiveKeeping/inStorage/pendingInArchive/module/archivesInfo/index.vue new file mode 100644 index 0000000..0f0f14d --- /dev/null +++ b/src/views/archiveKeeping/inStorage/pendingInArchive/module/archivesInfo/index.vue @@ -0,0 +1,292 @@ + + + + + diff --git a/src/views/archiveKeeping/inStorage/pendingInArchive/module/collectHeader.vue b/src/views/archiveKeeping/inStorage/pendingInArchive/module/collectHeader.vue new file mode 100644 index 0000000..1ba7fd4 --- /dev/null +++ b/src/views/archiveKeeping/inStorage/pendingInArchive/module/collectHeader.vue @@ -0,0 +1,367 @@ + + + + + diff --git a/src/views/archiveKeeping/inStorage/pendingInArchive/module/fourTestInfo/index.vue b/src/views/archiveKeeping/inStorage/pendingInArchive/module/fourTestInfo/index.vue new file mode 100644 index 0000000..234f59e --- /dev/null +++ b/src/views/archiveKeeping/inStorage/pendingInArchive/module/fourTestInfo/index.vue @@ -0,0 +1,119 @@ + + + + + diff --git a/src/views/archiveKeeping/inStorage/pendingInArchive/module/handleInfo/index.vue b/src/views/archiveKeeping/inStorage/pendingInArchive/module/handleInfo/index.vue new file mode 100644 index 0000000..54a83b2 --- /dev/null +++ b/src/views/archiveKeeping/inStorage/pendingInArchive/module/handleInfo/index.vue @@ -0,0 +1,81 @@ + + + + + diff --git a/src/views/archiveKeeping/inStorage/pendingInArchive/module/uploadFile/index.vue b/src/views/archiveKeeping/inStorage/pendingInArchive/module/uploadFile/index.vue new file mode 100644 index 0000000..c5d843c --- /dev/null +++ b/src/views/archiveKeeping/inStorage/pendingInArchive/module/uploadFile/index.vue @@ -0,0 +1,363 @@ + + + + + diff --git a/src/views/archiveKeeping/inStorage/pendingInArchive/project/index.vue b/src/views/archiveKeeping/inStorage/pendingInArchive/project/index.vue new file mode 100644 index 0000000..df2e191 --- /dev/null +++ b/src/views/archiveKeeping/inStorage/pendingInArchive/project/index.vue @@ -0,0 +1,195 @@ + + + + + diff --git a/src/views/archiveKeeping/inStorage/pendingInCase/index.vue b/src/views/archiveKeeping/inStorage/pendingInCase/index.vue index 99e9076..88136e0 100644 --- a/src/views/archiveKeeping/inStorage/pendingInCase/index.vue +++ b/src/views/archiveKeeping/inStorage/pendingInCase/index.vue @@ -1,8 +1,8 @@ diff --git a/src/views/archiveKeeping/outStorage/index.vue b/src/views/archiveKeeping/outStorage/index.vue index a5f9a0d..65d18d2 100644 --- a/src/views/archiveKeeping/outStorage/index.vue +++ b/src/views/archiveKeeping/outStorage/index.vue @@ -1,16 +1,15 @@