From f9f89116f04c8eb0214a0e8da755aa2b1d050c32 Mon Sep 17 00:00:00 2001 From: xuhuajiao <13476289682@163.com> Date: Wed, 29 Jun 2022 17:28:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A1=A3=E6=A1=88=E7=AE=A1=E7=90=86-=20?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E8=AF=95/=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/archivesManage/archivesList.js | 21 ++-- src/assets/icons/svg/bindbiaoqian.svg | 23 ++++ src/assets/icons/svg/fujian.svg | 34 +++++ src/assets/icons/svg/jieyue.svg | 18 +++ src/assets/icons/svg/ruku.svg | 21 ++++ src/assets/icons/svg/zhuanghe.svg | 19 +++ src/assets/images/cover-bg.png | Bin 0 -> 4053 bytes src/assets/styles/archives-manage.scss | 2 +- src/assets/styles/yxk-admin.scss | 5 + src/utils/index.js | 6 +- .../archivesManage/archivesList/index.vue | 64 ++++++---- .../module/archivesAnjuan/index.vue | 48 ++++--- .../module/archivesInfo/index.vue | 50 ++++++-- .../module/archivesJuannei/index.vue | 14 ++- .../module/archivesProject/index.vue | 19 ++- .../archivesList/module/uploadFile/index.vue | 119 +++++++++--------- src/views/components/category/PreviewForm.vue | 58 +++++---- 17 files changed, 361 insertions(+), 160 deletions(-) create mode 100644 src/assets/icons/svg/bindbiaoqian.svg create mode 100644 src/assets/icons/svg/fujian.svg create mode 100644 src/assets/icons/svg/jieyue.svg create mode 100644 src/assets/icons/svg/ruku.svg create mode 100644 src/assets/icons/svg/zhuanghe.svg create mode 100644 src/assets/images/cover-bg.png 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 0000000000000000000000000000000000000000..fa668ba73a117850f240797b1b74c1bffdbdca9b GIT binary patch literal 4053 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 { - 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 @@