From b4b0840581d9283bc34453c8867d164b070ef4d1 Mon Sep 17 00:00:00 2001 From: xuhuajiao <13476289682@163.com> Date: Wed, 10 Jan 2024 19:25:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BD=92=E6=A1=A3/=E8=AF=A6=E6=83=85/=E5=9B=9E?= =?UTF-8?q?=E6=94=B6=E7=AB=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/collect/collect.js | 38 +++ src/main.js | 4 + .../archiveEditing/module/onlineEditing.vue | 25 +- .../collectionLibrary/anjuan/tableList.vue | 2 +- .../collectionLibrary/index.vue | 6 + .../collectionLibrary/juannei/index.vue | 2 +- .../collectionLibrary/mixins/index.js | 1 + .../module/archivesFilling/index.vue | 191 ++++++++++++++ .../module/archivesInfo/index.vue | 28 ++- .../module/collectHeader.vue | 152 +++++++----- .../module/fourTest/index.vue | 9 +- .../collectionLibrary/project/index.vue | 4 +- .../collectReorganizi/recycled/index.vue | 3 +- .../components/archivesDetail/project.vue | 110 +++++---- .../components/archivesListModule/index.vue | 232 ++++++++++++++++++ 15 files changed, 667 insertions(+), 140 deletions(-) create mode 100644 src/views/collectReorganizi/collectionLibrary/module/archivesFilling/index.vue create mode 100644 src/views/components/archivesListModule/index.vue diff --git a/src/api/collect/collect.js b/src/api/collect/collect.js index f2f5317..03fc6a5 100644 --- a/src/api/collect/collect.js +++ b/src/api/collect/collect.js @@ -233,6 +233,40 @@ export function FetchFourCheck(data) { } // 归档 +export function FetchBecomeDocumentConfirm(data) { + return request({ + url: 'api/collect/becomeDocumentConfirm', + method: 'post', + data + }) +} + +// 彻底删除档案 +export function FetchCompleteDelArchives(data) { + return request({ + url: 'api/collect/completeDelArchives', + method: 'post', + data + }) +} + +// 恢复档案 +export function FetchRestoreArchives(data) { + return request({ + url: 'api/collect/restoreArchives', + method: 'post', + data + }) +} + +export function FetchBusinessFlowTitle(params) { + return request({ + url: 'api/collect/getBusinessFlowTitle', + method: 'get', + params + }) +} + export function FetchBecomeDocument(data) { return request({ url: 'api/collect/becomeDocument', @@ -265,5 +299,9 @@ export default { FetchReturnReDocument, FetchPreFastToArchives, FetchFourCheck, + FetchBecomeDocumentConfirm, + FetchCompleteDelArchives, + FetchRestoreArchives, + FetchBusinessFlowTitle, FetchBecomeDocument } diff --git a/src/main.js b/src/main.js index 14bc8b3..ebfc333 100644 --- a/src/main.js +++ b/src/main.js @@ -28,6 +28,10 @@ import 'echarts-gl' import uploader from 'vue-simple-uploader' +import ArchivesListModule from './views/components/archivesListModule/index' + +Vue.component('ArchivesListModule', ArchivesListModule) + // 加载用户主题 if (localStorage.getItem('themeValue')) { window.document.documentElement.setAttribute('data-theme', localStorage.getItem('themeValue')) diff --git a/src/views/archiveUtilize/archiveEditing/module/onlineEditing.vue b/src/views/archiveUtilize/archiveEditing/module/onlineEditing.vue index e5cc260..780adac 100644 --- a/src/views/archiveUtilize/archiveEditing/module/onlineEditing.vue +++ b/src/views/archiveUtilize/archiveEditing/module/onlineEditing.vue @@ -2,6 +2,11 @@
+
+ 附件上传 + 发布 + 取消发布 +
- - - + + + @@ -174,12 +179,16 @@ export default { diff --git a/src/views/collectReorganizi/collectionLibrary/module/archivesInfo/index.vue b/src/views/collectReorganizi/collectionLibrary/module/archivesInfo/index.vue index d0ce7af..c799421 100644 --- a/src/views/collectReorganizi/collectionLibrary/module/archivesInfo/index.vue +++ b/src/views/collectReorganizi/collectionLibrary/module/archivesInfo/index.vue @@ -7,7 +7,9 @@
  • 基本信息
    • -
  • 附件
    • +
  • 原文列表
    • +
  • 文件列表
    • +
  • 案卷列表
  • 元数据
  • 四性检测
  • 操作记录
    • @@ -31,8 +33,9 @@
- - + + + @@ -62,6 +65,10 @@ export default { default: function() { return '' } + }, + isTitleType: { + type: Number, + default: 2 } }, data() { @@ -83,13 +90,11 @@ export default { }, methods: { getDetial(collectLevel, rowId) { - console.log(this.arcId) const params = { 'categoryId': this.selectedCategory.id, 'categoryLevel': collectLevel, 'id': rowId } - console.log(params) FetchDetailsById(params).then(data => { this.archivesDetailsData = data.showFiled .filter(field => field.fieldName in data.echo) @@ -106,23 +111,25 @@ export default { 'categoryLevel': collectLevel, 'archivesId': rowId } - console.log('metaData', metaDataParams) FetchArchivesMetadata(metaDataParams).then(data => { this.archivesDetailsMetadata = data }) }, setXml() { const xmlstr = this.archivesDetailsMetadata - // console.log('xmlstr:', xmlstr) - // console.log('xml转json:', this.$x2js.xml2js(xmlstr)) - // console.log('json转xml:', this.$x2js.js2xml(this.$x2js.xml2js(xmlstr))) - // this.xml_show = vkbeautify.xml(xmlstr) this.xml_show = this.showXml(xmlstr) }, changeActiveTab(index) { this.archivesTabIndex = index if (this.archivesTabIndex === 2) { this.setXml() + } else if (this.archivesTabIndex === 5) { + if (this.selectedCategory.arrangeType === 3) { + this.$refs.archivesListModuleRef.collectLevelList = 1 + } + this.$refs.archivesListModuleRef.parentId = this.arcId + this.$refs.archivesListModuleRef.isDetail = true + this.$refs.archivesListModuleRef.getViewTable() } this.$nextTick(() => { if (this.$refs.uploadFile) { @@ -134,6 +141,7 @@ export default { // 删除 - 关闭 handleClose(done) { this.archivesInfoVisible = false + localStorage.removeItem('collectLevelList') done() }, // xml格式化 diff --git a/src/views/collectReorganizi/collectionLibrary/module/collectHeader.vue b/src/views/collectReorganizi/collectionLibrary/module/collectHeader.vue index c6ffaa8..b692497 100644 --- a/src/views/collectReorganizi/collectionLibrary/module/collectHeader.vue +++ b/src/views/collectReorganizi/collectionLibrary/module/collectHeader.vue @@ -196,33 +196,8 @@ - - -
-
-

此恢复将会把所选条目及其子集一并恢复

- 你是否还要继续? -
-
- 取消 - 确定 -
-
- - - - -
-
-

此删除将把会所选条目与其子集彻底删除

- 你是否还要继续? -
-
- 取消 - 确定 -
-
- + +
{{ test }}
@@ -232,7 +207,8 @@ import CRUD, { crud } from '@crud/crud' import { collectionLibraryCrud } from '../mixins/index' import { FetchInitCategoryInputFieldByPid } from '@/api/system/category/category' -import { FetchDetailsById, collectDel, FetchRemoveArchivesSingle, FetchDeleteArchivesFile, FetchUpdateArchivesNo, FetchDisbandArchives, FetchReturnReDocument, FetchBecomeDocument } from '@/api/collect/collect' +// FetchBecomeDocumentConfirm +import { FetchDetailsById, collectDel, FetchRemoveArchivesSingle, FetchDeleteArchivesFile, FetchUpdateArchivesNo, FetchDisbandArchives, FetchReturnReDocument, FetchCompleteDelArchives, FetchRestoreArchives } from '@/api/collect/collect' import { FetchArchivesClassTree } from '@/api/system/archivesClass' import { FetchDictionaryTree } from '@/api/system/dict' import Treeselect from '@riophae/vue-treeselect' @@ -251,13 +227,14 @@ import CollectMoveFile from './collectMoveFile/index' import Print from './print/index' import FourTest from './fourTest/index' import QuickPaper from './quickPaper/index' +import ArchivesFilling from './archivesFilling/index' import qs from 'qs' import { downloadFile, exportFile } from '@/utils/index' import { mapGetters } from 'vuex' export default { name: 'CollectHeader', - components: { Treeselect, PreviewForm, UploadOriginal, BigUpload, BlukImport, BlukEditing, FileSeqAdjustment, CombineFile, InsertFile, CollectMoveFile, Print, FourTest, QuickPaper }, + components: { Treeselect, PreviewForm, UploadOriginal, BigUpload, BlukImport, BlukEditing, FileSeqAdjustment, CombineFile, InsertFile, CollectMoveFile, Print, FourTest, QuickPaper, ArchivesFilling }, mixins: [collectionLibraryCrud, crud()], props: { selectedCategory: { @@ -856,32 +833,33 @@ export default { this.$message('您还未勾选需要操作的条目，请先确认！') return false } - this.$confirm('此操作将会把所选条目提交归档' + '你是否还要继续？', '提示', { - confirmButtonText: '继续', - cancelButtonText: '取消', - type: 'warning', - dangerouslyUseHTMLString: true - }).then(() => { - const archivesIds = this.selections.map(item => item.id) - const params = { - 'categoryId': this.selectedCategory.id, - 'categoryLevel': this.collectLevel, - 'archivesIds': archivesIds - } - console.log(params) - FetchBecomeDocument(params).then((res) => { - console.log(res) - // if (res.code !== 500) { - // this.crud.notify('归档成功', CRUD.NOTIFICATION_TYPE.SUCCESS) - // this.handleSearch(this.collectLevel) - // } else { - // this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.ERROR) - // } - }).catch(err => { - console.log(err) - }) - }).catch(() => { - }) + this.$refs.archivesFillingRef.archivesFillingVisible = true + // this.$confirm('此操作将会把所选条目提交归档' + '你是否还要继续？', '提示', { + // confirmButtonText: '继续', + // cancelButtonText: '取消', + // type: 'warning', + // dangerouslyUseHTMLString: true + // }).then(() => { + // const archivesIds = this.selections.map(item => item.id) + // const params = { + // 'categoryId': this.selectedCategory.id, + // 'categoryLevel': this.collectLevel, + // 'archivesIds': archivesIds + // } + // console.log(params) + // FetchBecomeDocumentConfirm(params).then((res) => { + // console.log(res) + // if (res.code !== 500) { + // this.crud.notify('归档成功', CRUD.NOTIFICATION_TYPE.SUCCESS) + // this.handleSearch(this.collectLevel) + // } else { + // this.crud.notify('归档失败', CRUD.NOTIFICATION_TYPE.ERROR) + // } + // }).catch(err => { + // console.log(err) + // }) + // }).catch(() => { + // }) }, // 退回预归档库 handleReturn() { @@ -1029,10 +1007,34 @@ export default { this.$message('您还未勾选需要操作的条目，请先确认！') return false } - this.recoverVisible = true - }, - handleRecover() { - this.recoverVisible = false + this.$confirm('此恢复将会把所选条目及其子集一并恢复' + '你是否还要继续？', '提示', { + confirmButtonText: '继续', + cancelButtonText: '取消', + type: 'warning', + dangerouslyUseHTMLString: true + }).then(() => { + const archivesIds = [] + this.selections.forEach(val => { + archivesIds.push(val.id) + }) + const params = { + 'categoryId': this.selectedCategory.id, + 'categoryLevel': this.collectLevel, + 'archivesIds': archivesIds + } + FetchRestoreArchives(params).then((res) => { + if (res.code !== 500) { + console.log(res) + this.crud.notify(res, CRUD.NOTIFICATION_TYPE.SUCCESS) + this.handleSearch(this.collectLevel) + } else { + this.crud.notify('回复所选档案失败', CRUD.NOTIFICATION_TYPE.ERROR) + } + }).catch(err => { + console.log(err) + }) + }).catch(() => { + }) }, // 回收站 - 彻底删除 toCompletelyDelete() { @@ -1040,10 +1042,34 @@ export default { this.$message('您还未勾选需要操作的条目，请先确认！') return false } - this.completelyDeleteVisible = true - }, - handleCompletelyDelete() { - this.completelyDeleteVisible = false + + this.$confirm('此删除将把会所选条目与其子集彻底删除' + '你是否还要继续？', '提示', { + confirmButtonText: '继续', + cancelButtonText: '取消', + type: 'warning', + dangerouslyUseHTMLString: true + }).then(() => { + const archivesIds = [] + this.selections.forEach(val => { + archivesIds.push(val.id) + }) + const params = { + 'categoryId': this.selectedCategory.id, + 'categoryLevel': this.collectLevel, + 'archivesIds': archivesIds + } + FetchCompleteDelArchives(params).then((res) => { + if (res.code !== 500) { + this.crud.notify(res, CRUD.NOTIFICATION_TYPE.SUCCESS) + this.handleSearch(this.collectLevel) + } else { + this.crud.notify('删除所选档案失败', CRUD.NOTIFICATION_TYPE.ERROR) + } + }).catch(err => { + console.log(err) + }) + }).catch(() => { + }) }, closeDialog(data) { this.formVisible = false diff --git a/src/views/collectReorganizi/collectionLibrary/module/fourTest/index.vue b/src/views/collectReorganizi/collectionLibrary/module/fourTest/index.vue index 80a6991..6f4ada0 100644 --- a/src/views/collectReorganizi/collectionLibrary/module/fourTest/index.vue +++ b/src/views/collectReorganizi/collectionLibrary/module/fourTest/index.vue @@ -75,10 +75,17 @@ export default { FetchFourCheck(params).then(res => { console.log(res) if (res.code !== 500) { + // if (res.result) { this.$message({ - message: '检测成功', + message: '检测成功' + res.success.length + '条数据, 检测失败' + res.fail.length + '条数据', type: 'success' }) + // } else { + // this.$message({ + // message: '检测失败' + res.fail.length + '条数据', + // type: 'success' + // }) + // } } else { this.$message({ message: '检测失败', diff --git a/src/views/collectReorganizi/collectionLibrary/project/index.vue b/src/views/collectReorganizi/collectionLibrary/project/index.vue index d575921..f3de221 100644 --- a/src/views/collectReorganizi/collectionLibrary/project/index.vue +++ b/src/views/collectReorganizi/collectionLibrary/project/index.vue @@ -55,7 +55,8 @@ /> - + + @@ -64,6 +65,7 @@ import { collectionLibraryCrud } from '../mixins/index' import { header, form } from '@crud/crud' import CollectHeader from '../module/collectHeader.vue' import ArchivesInfo from '../module/archivesInfo/index' +// import ProjectDetail from '@/views/components/archivesDetail/project' export default { name: 'Project', diff --git a/src/views/collectReorganizi/recycled/index.vue b/src/views/collectReorganizi/recycled/index.vue index 5f4e1af..afb708c 100644 --- a/src/views/collectReorganizi/recycled/index.vue +++ b/src/views/collectReorganizi/recycled/index.vue @@ -1,6 +1,6 @@ @@ -12,6 +12,7 @@ export default { components: { CollectModule }, data() { return { + isdel: true, isRecycle: true } }, diff --git a/src/views/components/archivesDetail/project.vue b/src/views/components/archivesDetail/project.vue index 42596cd..9fcddc5 100644 --- a/src/views/components/archivesDetail/project.vue +++ b/src/views/components/archivesDetail/project.vue @@ -42,28 +42,40 @@ - - -
- - - - - + + + + + + + - -
@@ -85,8 +97,8 @@ + +