diff --git a/src/api/archivesManage/archivesList.js b/src/api/archivesManage/archivesList.js index a3fb8d1..9f26aac 100644 --- a/src/api/archivesManage/archivesList.js +++ b/src/api/archivesManage/archivesList.js @@ -2,6 +2,7 @@ import request from '@/utils/request' import qs from 'qs' // import { form } from '../../components/Crud/crud' +// 档案列表获取显示列 export function FetchTableDisplayFields(params) { return request({ url: 'api/archives/initArchivesViewTable' + '?' + qs.stringify(params, { indices: false }), @@ -9,6 +10,7 @@ export function FetchTableDisplayFields(params) { }) } +// 档案预编辑 export function FetchFormDisplayFields(params) { return request({ url: 'api/archives/doedit' + '?' + qs.stringify(params, { indices: false }), @@ -20,6 +22,7 @@ export function add(form) { return edit(form) } +// 档案编辑 export function edit(parameter) { return request({ url: 'api/archives/edit', @@ -114,6 +117,15 @@ export function FetchDeleteFile(parameter) { }) } +// 附件排序 +export function FetchFileSort(parameter) { + return request({ + url: 'api/archives/fileSort', + method: 'post', + data: parameter + }) +} + // 档案还原 export function FetchReduction(parameter) { return request({ @@ -123,14 +135,5 @@ export function FetchReduction(parameter) { }) } -// 根据门类导出数据 -// export function FetchExportArchives(params) { -// return request({ -// url: 'api/archives/exportArchives?' + qs.stringify(params, { indices: false }), -// method: 'get', -// responseType: 'blob' -// }) -// } - export default { add, edit, del, FetchInitArchivesView, FetchTableDisplayFields, FetchFormDisplayFields, FetchDoeditIsRepeat } diff --git a/src/assets/icons/svg/bindbiaoqian.svg b/src/assets/icons/svg/bindbiaoqian.svg new file mode 100644 index 0000000..ee7a474 --- /dev/null +++ b/src/assets/icons/svg/bindbiaoqian.svg @@ -0,0 +1,23 @@ + + + + + + + + + + diff --git a/src/assets/icons/svg/fujian.svg b/src/assets/icons/svg/fujian.svg new file mode 100644 index 0000000..f247c8b --- /dev/null +++ b/src/assets/icons/svg/fujian.svg @@ -0,0 +1,34 @@ + + + + + + + + + + + + diff --git a/src/assets/icons/svg/jieyue.svg b/src/assets/icons/svg/jieyue.svg new file mode 100644 index 0000000..f3a6e42 --- /dev/null +++ b/src/assets/icons/svg/jieyue.svg @@ -0,0 +1,18 @@ + + + + + + diff --git a/src/assets/icons/svg/ruku.svg b/src/assets/icons/svg/ruku.svg new file mode 100644 index 0000000..5b8581b --- /dev/null +++ b/src/assets/icons/svg/ruku.svg @@ -0,0 +1,21 @@ + + + + + + + + diff --git a/src/assets/icons/svg/zhuanghe.svg b/src/assets/icons/svg/zhuanghe.svg new file mode 100644 index 0000000..772699c --- /dev/null +++ b/src/assets/icons/svg/zhuanghe.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + diff --git a/src/assets/images/cover-bg.png b/src/assets/images/cover-bg.png new file mode 100644 index 0000000..fa668ba Binary files /dev/null and b/src/assets/images/cover-bg.png differ diff --git a/src/assets/styles/archives-manage.scss b/src/assets/styles/archives-manage.scss index 509747d..d5cc363 100644 --- a/src/assets/styles/archives-manage.scss +++ b/src/assets/styles/archives-manage.scss @@ -305,7 +305,7 @@ $arcCyan: #0FBED9; // 档案详情 .base-info{ - padding-top: 20px; + padding: 20px 20px 0 60px; color: #fff; .base-info-item{ display: flex; diff --git a/src/assets/styles/yxk-admin.scss b/src/assets/styles/yxk-admin.scss index 9262feb..7e786e4 100644 --- a/src/assets/styles/yxk-admin.scss +++ b/src/assets/styles/yxk-admin.scss @@ -880,6 +880,11 @@ } } } +.preview-dialog{ + .el-dialog__body{ + padding: 30px 0 !important; + } +} // 去除element ui 中el-input type=“number“的上下箭头 input::-webkit-outer-spin-button, input::-webkit-inner-spin-button { diff --git a/src/utils/index.js b/src/utils/index.js index 8c5034e..e8f11a7 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -377,7 +377,6 @@ export function regMobile(mobile) { // 下载文件 export function downloadFile(obj, name, suffix) { const url = window.URL.createObjectURL(new Blob([obj])) - console.log(url) const link = document.createElement('a') link.style.display = 'none' link.href = url @@ -388,9 +387,8 @@ export function downloadFile(obj, name, suffix) { document.body.removeChild(link) } -// new - 导出 - TEST -export function exportFile(StingParams, fileName) { - const url = StingParams +// new - 导出 +export function exportFile(url, fileName) { const link = document.createElement('a') link.style.display = 'none' link.href = url diff --git a/src/views/archivesManage/archivesList/index.vue b/src/views/archivesManage/archivesList/index.vue index a482dc7..850bb7d 100644 --- a/src/views/archivesManage/archivesList/index.vue +++ b/src/views/archivesManage/archivesList/index.vue @@ -236,34 +236,46 @@ export default { }, getAjInProjectBtnState(data) { this.isProject = data - console.log('isProject', data) }, - getProjectSelections(data) { - this.projectSelection = data - this.$nextTick(() => { - this.$refs.anjuan.getTableList() - }) + getProjectSelections(data, selectData) { + if ((selectData && selectData.length > 1) || (selectData && selectData.length === 0)) { + this.projectSelection = {} + this.$nextTick(() => { + if (this.$refs.anjuan) { + this.$refs.anjuan.anjuanData = [] + } + }) + } else if (selectData && selectData.length === 1) { + this.projectSelection = selectData[0] + this.$nextTick(() => { + if (this.$refs.anjuan) { + this.$refs.anjuan.getTableList() + } + }) + } else { + this.projectSelection = data + this.$nextTick(() => { + if (this.$refs.anjuan) { + this.$refs.anjuan.getTableList() + } + }) + } }, getSelections(data, selectData) { - if (selectData) { - if (selectData.length > 1 || selectData.length === 0) { - this.anjuanSelection = {} - this.$refs.file.junneiData = [] - } else if (selectData.length === 1) { - this.anjuanSelection = selectData[0] - this.$nextTick(() => { - if (this.$refs.file) { - this.$refs.file.getTableList() - } - }) - } else { - this.anjuanSelection = data - this.$nextTick(() => { - if (this.$refs.file) { - this.$refs.file.getTableList() - } - }) - } + if ((selectData && selectData.length > 1) || (selectData && selectData.length === 0)) { + this.anjuanSelection = {} + this.$nextTick(() => { + if (this.$refs.file) { + this.$refs.file.junneiData = [] + } + }) + } else if (selectData && selectData.length === 1) { + this.anjuanSelection = selectData[0] + this.$nextTick(() => { + if (this.$refs.file) { + this.$refs.file.getTableList() + } + }) } else { this.anjuanSelection = data this.$nextTick(() => { @@ -282,7 +294,7 @@ export default { } } - m + diff --git a/src/views/archivesManage/archivesList/module/archivesAnjuan/index.vue b/src/views/archivesManage/archivesList/module/archivesAnjuan/index.vue index 9bf0a3c..50c6b31 100644 --- a/src/views/archivesManage/archivesList/module/archivesAnjuan/index.vue +++ b/src/views/archivesManage/archivesList/module/archivesAnjuan/index.vue @@ -10,7 +10,7 @@ 删除 - 导出 + 导出 上传附件 @@ -54,7 +54,7 @@
- +
保存 @@ -153,7 +153,17 @@ - + + + + + + +
+ +
+ + @@ -182,19 +192,16 @@ import { del, FetchTableDisplayFields, FetchInitArchivesView, FetchFormDisplayFi import { header, form } from '@crud/crud' import { mapGetters } from 'vuex' import { exportFile } from '@/utils/index' -// import { initData } from '@/api/data' -// import crudOperation from '@crud/CRUD.operation' -// import rrOperation from '@crud/RR.operation' -// import pagination from '@crud/Pagination' import PreviewForm from '@/views/components/category/PreviewForm' import ArchivesInfo from '../archivesInfo/index' import Packing from '../packing/index' import PartPacking from '../partPacking/index' import Binding from '../binding/index' +import UploadFile from '../uploadFile/index' export default { name: 'ArchivesAnjuan', - components: { PreviewForm, ArchivesInfo, Packing, Binding, PartPacking }, + components: { PreviewForm, ArchivesInfo, Packing, Binding, PartPacking, UploadFile }, mixins: [ header(), form({}) @@ -245,8 +252,7 @@ export default { ], queryOption: [ { value: 'maintitle', label: '题名' }, - { value: 'archive_no', label: '档号' }, - { value: 'archive_year', label: '年度' } + { value: 'archive_no', label: '档号' } ], inputSelect: '', permission: { @@ -259,6 +265,7 @@ export default { deleteData: {}, // 删除选中data selections: [], // table已选择的 archivesTabIndex: 0, // 新增 + categoryId: null, arcId: null, // 档案ID arrySort: [], // 多项sort-query uploadFileVisible: false, // 上传附件 @@ -300,7 +307,6 @@ export default { methods: { doExport(fileName = '未知文件') { this.crud.downloadLoading = true - console.log(this.selectedCategory) if (this.selectedCategory.pid !== '0') { this.parentsId = this.selectedCategory.pid } else { @@ -310,7 +316,6 @@ export default { 'categoryId': this.selectedCategory.id, 'parentsId': this.parentsId } - console.log(params) exportFile(this.baseApi + '/api/archives/exportArchives?' + qs.stringify(params)) this.crud.downloadLoading = false }, @@ -406,6 +411,12 @@ export default { }, // table - 双击查看详情 tableDoubleClick(row) { + if (this.selectedCategory.isType !== 5) { + this.$refs.archivesInfo.isHasFile = false + } else { + this.$refs.archivesInfo.isHasFile = true + } + this.$refs.archivesInfo.detailTitle = '档案详情' this.$refs.archivesInfo.archivesInfoVisible = true this.$refs.archivesInfo.archivesTabIndex = 0 const params = { @@ -415,10 +426,10 @@ export default { FetchArchivesDetails(params).then(data => { this.archivesDetailsData = data }) - FetchArchivesMetadata(params).then(data => { this.archivesDetailsMetadata = data }) + this.arcId = row.id }, // table - 当前选中得row clickRowHandler(row) { @@ -495,9 +506,11 @@ export default { // 上传附件 uploadFile() { this.uploadFileVisible = true - }, - uploadFileSave() { - this.uploadFileVisible = false + this.arcId = this.selections[0].id + this.$nextTick(() => { + this.$refs.uploadFile.tableData = [] + this.$refs.uploadFile.getFileList() + }) }, // 绑定 handleBinding(data) { @@ -524,8 +537,9 @@ export default { diff --git a/src/views/archivesManage/archivesList/module/archivesInfo/index.vue b/src/views/archivesManage/archivesList/module/archivesInfo/index.vue index 3d279b1..4f0cdbc 100644 --- a/src/views/archivesManage/archivesList/module/archivesInfo/index.vue +++ b/src/views/archivesManage/archivesList/module/archivesInfo/index.vue @@ -1,5 +1,5 @@