From b24154bc5e5e83a40c69fdf38c1e485b4507285a Mon Sep 17 00:00:00 2001 From: xuhuajiao <13476289682@163.com> Date: Wed, 24 Jan 2024 17:35:51 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/styles/archives-manage.scss | 2 +- src/assets/styles/mixin.scss | 2 +- src/assets/styles/yxk-admin.scss | 2 +- .../caseManage/caseList/index.vue | 1 + .../managementLibrary/index.vue | 10 +- .../managementLibrary/mixins/index.js | 2 +- .../module/collectHeader.vue | 33 +++- .../collectionLibrary/index.vue | 12 +- .../collectionLibrary/mixins/index.js | 2 +- .../module/collectHeader.vue | 152 ++++++++++-------- .../collectionLibrary/project/index.vue | 2 +- src/views/components/category/PreviewForm.vue | 6 +- src/views/system/archivesCategory/index.vue | 5 + .../descriptionPreview/index.vue | 2 +- src/views/system/fileLibraryManage/index.vue | 5 + 15 files changed, 151 insertions(+), 87 deletions(-) diff --git a/src/assets/styles/archives-manage.scss b/src/assets/styles/archives-manage.scss index d1eaa1d..64a2b70 100644 --- a/src/assets/styles/archives-manage.scss +++ b/src/assets/styles/archives-manage.scss @@ -616,7 +616,7 @@ .el-drawer__body{ position: relative; overflow: visible; - padding-top: 57px; + padding-top: 54px; } [data-theme=dark] .el-drawer__body{ diff --git a/src/assets/styles/mixin.scss b/src/assets/styles/mixin.scss index 0a672c7..489163a 100644 --- a/src/assets/styles/mixin.scss +++ b/src/assets/styles/mixin.scss @@ -731,7 +731,7 @@ li{ margin-right: 60px; &.active-tab-nav{ - padding-bottom: 13px; + padding-bottom: 10px; color: #0348F3; border-bottom: 3px solid #0348F3; } diff --git a/src/assets/styles/yxk-admin.scss b/src/assets/styles/yxk-admin.scss index 426d1de..896e4dc 100644 --- a/src/assets/styles/yxk-admin.scss +++ b/src/assets/styles/yxk-admin.scss @@ -97,7 +97,7 @@ li{ margin-right: 60px; &.active-tab-nav{ - padding-bottom: 13px; + padding-bottom: 10px; color: #0348F3; border-bottom: 3px solid #0348F3; } diff --git a/src/views/archiveKeeping/caseManage/caseList/index.vue b/src/views/archiveKeeping/caseManage/caseList/index.vue index e8aff89..1c4716a 100644 --- a/src/views/archiveKeeping/caseManage/caseList/index.vue +++ b/src/views/archiveKeeping/caseManage/caseList/index.vue @@ -36,6 +36,7 @@ + 读取
diff --git a/src/views/archivesManage/managementLibrary/index.vue b/src/views/archivesManage/managementLibrary/index.vue index 8738d2c..b29c09f 100644 --- a/src/views/archivesManage/managementLibrary/index.vue +++ b/src/views/archivesManage/managementLibrary/index.vue @@ -10,17 +10,17 @@
- + {{ data.cnName }} - + {{ data.cnName }} - + {{ data.cnName }} @@ -507,6 +507,10 @@ export default { font-size: 14px; } +::v-deep .custom-tree-node{ + font-size: 14px; +} + [data-theme=light] .elect-cont-right { padding: 0 20px !important; } diff --git a/src/views/archivesManage/managementLibrary/mixins/index.js b/src/views/archivesManage/managementLibrary/mixins/index.js index a595ea3..d246e37 100644 --- a/src/views/archivesManage/managementLibrary/mixins/index.js +++ b/src/views/archivesManage/managementLibrary/mixins/index.js @@ -96,7 +96,7 @@ export const manageLibraryCrud = { if (res) { this.arrySort = [] this.tableDisplayFields = res - const orderSortArry = this.tableDisplayFields.filter(item => item.displayOrder).sort((a, b) => a.displayOrder - b.displayOrder) + 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) diff --git a/src/views/archivesManage/managementLibrary/module/collectHeader.vue b/src/views/archivesManage/managementLibrary/module/collectHeader.vue index 58c6e4a..9c4ee1b 100644 --- a/src/views/archivesManage/managementLibrary/module/collectHeader.vue +++ b/src/views/archivesManage/managementLibrary/module/collectHeader.vue @@ -38,7 +38,16 @@ placeholder="请选择" @input="handleSearch(collectLevel)" @select="handleSearch(collectLevel)" - /> + > +

+ +

+ + >

+ +

+
@@ -230,6 +247,7 @@ export default { inject: ['parentsData'], data() { return { + value: null, statusOptions: [ { label: '标签状态', @@ -463,7 +481,7 @@ export default { } return { id: node.code, - label: node.name, + label: `${node.name} - ${node.code}`, children: node.childArchivesClass } }, @@ -476,7 +494,6 @@ export default { filteredItems = this.addLevelToDictionaryList(filteredItems, 1) if (this.selectedCategory.arrangeType === 3 && this.isTitleType === 3) { this.projectOptions = filteredItems - // console.log(this.projectOptions) } else { this.projectOptions = this.filterData(filteredItems, filteredItems[0].id) } @@ -506,13 +523,16 @@ export default { }) return dictionaryList }, + getLabel(node) { + return `ID: ${node.id}, Name: ${node.label}` + }, normalizerProject(node) { if ((node.childDictionarys && !node.childDictionarys.length) || node.childDictionarys === null) { delete node.childDictionarys } return { id: node.dictionaryName, - label: node.dictionaryName, + label: node.level !== 1 ? `${node.dictionaryName} - ${node.dictionaryCode}` : `${node.dictionaryName}`, children: node.childDictionarys, isDisabled: this.isTitleType === 3 ? node.level !== 3 : node.level === 1 } @@ -886,4 +906,7 @@ export default { } } } +::v-deep .vue-treeselect__list-item{ + width: 200px; +} diff --git a/src/views/collectReorganizi/collectionLibrary/index.vue b/src/views/collectReorganizi/collectionLibrary/index.vue index 800fb1b..ea260ab 100644 --- a/src/views/collectReorganizi/collectionLibrary/index.vue +++ b/src/views/collectReorganizi/collectionLibrary/index.vue @@ -10,17 +10,17 @@
- + {{ data.cnName }} - + {{ data.cnName }} - + {{ data.cnName }} @@ -509,8 +509,12 @@ export default { font-size: 14px; } +::v-deep .custom-tree-node{ + font-size: 14px; +} + [data-theme=light] .elect-cont-right { - padding: 20px 0 !important; + padding: 15px 0 !important; } [data-theme=dark] .elect-cont-right { margin-top: 0 !important; diff --git a/src/views/collectReorganizi/collectionLibrary/mixins/index.js b/src/views/collectReorganizi/collectionLibrary/mixins/index.js index 2087827..786caee 100644 --- a/src/views/collectReorganizi/collectionLibrary/mixins/index.js +++ b/src/views/collectReorganizi/collectionLibrary/mixins/index.js @@ -92,7 +92,7 @@ export const collectionLibraryCrud = { if (res) { this.arrySort = [] this.tableDisplayFields = res - const orderSortArry = this.tableDisplayFields.filter(item => item.displayOrder).sort((a, b) => a.displayOrder - b.displayOrder) + 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) diff --git a/src/views/collectReorganizi/collectionLibrary/module/collectHeader.vue b/src/views/collectReorganizi/collectionLibrary/module/collectHeader.vue index d3b1099..2e73ad0 100644 --- a/src/views/collectReorganizi/collectionLibrary/module/collectHeader.vue +++ b/src/views/collectReorganizi/collectionLibrary/module/collectHeader.vue @@ -14,7 +14,16 @@ placeholder="请选择" @input="handleSearch(collectLevel)" @select="handleSearch(collectLevel)" - /> + > +

+ +

+ + > +

+ +

+
@@ -424,7 +442,7 @@ export default { } return { id: node.code, - label: node.name, + label: `${node.name} - ${node.code}`, children: node.childArchivesClass } }, @@ -472,7 +490,7 @@ export default { } return { id: node.dictionaryName, - label: node.dictionaryName, + label: node.level !== 1 ? `${node.dictionaryName} - ${node.dictionaryCode}` : `${node.dictionaryName}`, children: node.childDictionarys, isDisabled: this.isTitleType === 3 ? node.level !== 3 : node.level === 1 } @@ -484,7 +502,7 @@ export default { handleForm(type, isPaper) { if (type === 'add') { if (this.parentsData.parentsAnjuanRow && this.parentsData.parentsAnjuanRow.collect_formal === 2) { - this.$message('当前档案处于归档流程中，不可操作新增，请先确认！') + this.$message({ message: '当前档案处于归档流程中，不可操作新增，请先确认！', offset: 8 }) return false } this.arcId = null @@ -498,13 +516,13 @@ export default { } else if (type === 'edit') { this.quickPaper = false if (this.selections.length === 0) { - this.$message('您还未勾选需要操作的条目，请先确认！') + this.$message({ message: '您还未勾选需要操作的条目，请先确认！', offset: 8 }) return false } else if (this.selections.length > 1) { - this.$message('编辑操作只可勾选唯一目标条目，请先确认！') + this.$message({ message: '编辑操作只可勾选唯一目标条目，请先确认！', offset: 8 }) return false } else if (this.selections[0].collect_formal === 2) { - this.$message('当前所选的档案处于归档流程中，不可操作编辑，请先确认！') + this.$message({ message: '当前所选的档案处于归档流程中，不可操作编辑，请先确认！', offset: 8 }) return false } this.arcId = this.selections[0].id @@ -568,17 +586,17 @@ export default { // 删除 toDelete() { if (this.selections.length === 0) { - this.$message('您还未勾选需要操作的条目，请先确认！') + this.$message({ message: '您还未勾选需要操作的条目，请先确认！', offset: 8 }) return false } const isHasFillFormal = this.selections.some(item => item.collect_formal === 2) if (isHasFillFormal) { - this.$message('您所选的条目有正在归档流程中，不可操作删除，请先确认！') + this.$message({ message: '您所选的条目有正在归档流程中，不可操作删除，请先确认！', offset: 8 }) return false } if (this.collectLevel === 4) { if (this.parentsData.parentsAnjuanRow && this.parentsData.parentsAnjuanRow.collect_formal === 2) { - this.$message('当前档案处于归档流程中，不可操作删除，请先确认！') + this.$message({ message: '当前档案处于归档流程中，不可操作删除，请先确认！', offset: 8 }) return false } } @@ -587,12 +605,12 @@ export default { // 卷内 - 移除 toMove() { if (this.selections.length === 0) { - this.$message('您还未勾选需要操作的条目，请先确认！') + this.$message({ message: '您还未勾选需要操作的条目，请先确认！', offset: 8 }) return false } const isHasFillFormal = this.selections.some(item => item.collect_formal === 2) if (isHasFillFormal) { - this.$message('您所选的条目有正在归档流程中，不可操作删除，请先确认！') + this.$message({ message: '您所选的条目有正在归档流程中，不可操作删除，请先确认！', offset: 8 }) return false } this.moveVisible = true @@ -612,12 +630,12 @@ export default { }) FetchDeleteArchivesFile(params).then((res) => { if (res === 'SUCCESS') { - this.crud.notify('删除成功', CRUD.NOTIFICATION_TYPE.SUCCESS) + this.$message({ message: '删除成功', type: 'success', offset: 8 }) this.delAllLoading = false this.deleteVisible = false this.handleSearch(this.collectLevel) } else { - this.crud.notify('删除所选电子原文失败', CRUD.NOTIFICATION_TYPE.ERROR) + this.$message({ message: '删除所选电子原文失败', type: 'error', offset: 8 }) } }).catch(err => { this.delAllLoading = false @@ -635,12 +653,12 @@ export default { } collectDel(params).then((res) => { if (res.includes('成功')) { - this.crud.notify('删除成功', CRUD.NOTIFICATION_TYPE.SUCCESS) + this.$message({ message: '删除成功', type: 'success', offset: 8 }) this.delAllLoading = false this.deleteVisible = false this.handleSearch(this.collectLevel) } else { - this.crud.notify('删除所选档案失败', CRUD.NOTIFICATION_TYPE.ERROR) + this.$message({ message: '删除所选档案失败', type: 'error', offset: 8 }) } }).catch(err => { this.delAllLoading = false @@ -662,10 +680,10 @@ export default { } FetchRemoveArchivesSingle(params).then((res) => { if (res === true) { - this.crud.notify('移出成功', CRUD.NOTIFICATION_TYPE.SUCCESS) + this.$message({ message: '移出成功', type: 'success', offset: 8 }) this.handleSearch(this.collectLevel) } else { - this.crud.notify('移出失败', CRUD.NOTIFICATION_TYPE.ERROR) + this.$message({ message: '移出失败', type: 'error', offset: 8 }) } this.moveVisible = false }).catch(err => { @@ -677,22 +695,22 @@ export default { if (uploadType !== 2) { if (this.isTitleType !== 6) { if (this.selections.length === 0) { - this.$message('您还未勾选需要操作的条目，请先确认！') + this.$message({ message: '您还未勾选需要操作的条目，请先确认！', offset: 8 }) return false } if (this.selections.length > 1) { - this.$message('上传操作只可勾选唯一目标条目，请先确认！') + this.$message({ message: '上传操作只可勾选唯一目标条目，请先确认！', offset: 8 }) return false } const isHasFillFormal = this.selections.some(item => item.collect_formal === 2) if (isHasFillFormal) { - this.$message('您所选的条目有正在归档流程中，不可操作原文上传，请先确认！') + this.$message({ message: '您所选的条目有正在归档流程中，不可操作原文上传，请先确认！', offset: 8 }) return false } this.arcId = this.selections[0].id } else { if (this.parentsData.parentsAnjuanRow && this.parentsData.parentsAnjuanRow.collect_formal === 2) { - this.$message('当前档案处于归档流程中，不可操作原文上传，请先确认！') + this.$message({ message: '当前档案处于归档流程中，不可操作原文上传，请先确认！', offset: 8 }) return false } @@ -724,7 +742,7 @@ export default { // 批量导入 handleBlukImport() { if (this.parentsData.parentsAnjuanRow && this.parentsData.parentsAnjuanRow.collect_formal === 2) { - this.$message('当前档案处于归档流程中，不可操作批量导入，请先确认！') + this.$message({ message: '当前档案处于归档流程中，不可操作批量导入，请先确认！', offset: 8 }) return false } this.$refs.blukImportRef.bulkImportVisible = true @@ -732,12 +750,12 @@ export default { // 批量修改 handleBlukEditing() { if (this.selections.length === 0) { - this.$message('您还未勾选需要操作的条目，请先确认！') + this.$message({ message: '您还未勾选需要操作的条目，请先确认！', offset: 8 }) return false } const isHasFillFormal = this.selections.some(item => item.collect_formal === 2) if (isHasFillFormal) { - this.$message('您所选的条目有正在归档流程中，不可操作批量修改，请先确认！') + this.$message({ message: '您所选的条目有正在归档流程中，不可操作批量修改，请先确认！', offset: 8 }) return false } this.$nextTick(() => { @@ -748,16 +766,16 @@ export default { handleJnSeqAdjustment(type) { if (type === 'juannei') { if (this.selections.length === 0) { - this.$message('您还未勾选需要操作的条目，请先确认！') + this.$message({ message: '您还未勾选需要操作的条目，请先确认！', offset: 8 }) return false } if (this.selections.length > 1) { - this.$message('卷内顺序调整操作只可勾选唯一目标条目，请先确认！') + this.$message({ message: '卷内顺序调整操作只可勾选唯一目标条目，请先确认！', offset: 8 }) return false } const isHasFillFormal = this.selections.some(item => item.collect_formal === 2) if (isHasFillFormal) { - this.$message('您所选的条目有正在归档流程中，不可操作卷内顺序调整，请先确认！') + this.$message({ message: '您所选的条目有正在归档流程中，不可操作卷内顺序调整，请先确认！', offset: 8 }) return false } this.$nextTick(() => { @@ -766,12 +784,12 @@ export default { }) } else { if (this.selections.length < 2) { - this.$message('请选择多个' + (type === 'file' ? '文件' : '案卷') + '后进行操作！') + this.$message({ message: '请选择多个' + (type === 'file' ? '文件' : '案卷') + '后进行操作！', offset: 8 }) return false } const isHasFillFormal = this.selections.some(item => item.collect_formal === 2) if (isHasFillFormal) { - this.$message('您所选的条目有正在归档流程中，不可操作案卷/文件顺序调整，请先确认！') + this.$message({ message: '您所选的条目有正在归档流程中，不可操作案卷/文件顺序调整，请先确认！', offset: 8 }) return false } this.$nextTick(() => { @@ -790,12 +808,12 @@ export default { // 档号更新 handleFileNumberUpdate(type) { if (this.selections.length === 0) { - this.$message('您还未勾选需要操作的条目，请先确认！') + this.$message({ message: '您还未勾选需要操作的条目，请先确认！', offset: 8 }) return false } const isHasFillFormal = this.selections.some(item => item.collect_formal === 2) if (isHasFillFormal) { - this.$message('您所选的条目有正在归档流程中，不可操作档号更新，请先确认！') + this.$message({ message: '您所选的条目有正在归档流程中，不可操作档号更新，请先确认！', offset: 8 }) return false } this.$confirm('此操作将会自动重新生成档号' + '你是否还要继续？', '提示', { @@ -823,10 +841,10 @@ export default { } FetchUpdateArchivesNo(params).then((res) => { if (res.code !== 500) { - this.crud.notify('档号更新成功', CRUD.NOTIFICATION_TYPE.SUCCESS) + this.$message({ message: '档号更新成功', type: 'success', offset: 8 }) this.handleSearch(this.collectLevel) } else { - this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.ERROR) + this.$message({ message: res.message, type: 'error', offset: 8 }) } }).catch(err => { console.log(err) @@ -837,12 +855,12 @@ export default { // 拆卷 handleUncoil() { if (this.selections.length === 0) { - this.$message('您还未勾选需要操作的条目，请先确认！') + this.$message({ message: '您还未勾选需要操作的条目，请先确认！', offset: 8 }) return false } const isHasFillFormal = this.selections.some(item => item.collect_formal === 2) if (isHasFillFormal) { - this.$message('您所选的条目有正在归档流程中，不可操作拆卷，请先确认！') + this.$message({ message: '您所选的条目有正在归档流程中，不可操作拆卷，请先确认！', offset: 8 }) return false } this.$confirm('拆卷之后，对应的案卷数据将会自动删除' + '你是否还要继续？', '提示', { @@ -861,10 +879,10 @@ export default { } FetchDisbandArchives(params).then((res) => { if (res.code !== 500) { - this.crud.notify('拆卷成功', CRUD.NOTIFICATION_TYPE.SUCCESS) + this.$message({ message: '拆卷成功', type: 'success', offset: 8 }) this.handleSearch(this.collectLevel) } else { - this.crud.notify('拆卷失败', CRUD.NOTIFICATION_TYPE.ERROR) + this.$message({ message: '拆卷失败', type: 'error', offset: 8 }) } }).catch(err => { console.log(err) @@ -875,12 +893,12 @@ export default { // 合卷 handleCombineFile() { if (this.selections.length < 2) { - this.$message('合卷操作至少勾选2个案卷，请重试！') + this.$message({ message: '合卷操作至少勾选2个案卷，请重试！', offset: 8 }) return false } const isHasFillFormal = this.selections.some(item => item.collect_formal === 2) if (isHasFillFormal) { - this.$message('您所选的条目有正在归档流程中，不可操作合卷，请先确认！') + this.$message({ message: '您所选的条目有正在归档流程中，不可操作合卷，请先确认！', offset: 8 }) return false } this.$refs.combineFileRef.getTargetList() @@ -905,10 +923,10 @@ export default { } else { const isHasFillFormal = this.selections.some(item => item.collect_formal === 2) if (this.selections.length !== 1) { - this.$message('插卷操作只可勾选唯一目标条目，请先确认！') + this.$message({ message: '插卷操作只可勾选唯一目标条目，请先确认！', offset: 8 }) return false } else if (isHasFillFormal) { - this.$message('您所选的条目有正在归档流程中，不可操作插件，请先确认！') + this.$message({ message: '您所选的条目有正在归档流程中，不可操作插件，请先确认！', offset: 8 }) return false } else { this.$refs.insertFileRef.getInsertViewTable() @@ -918,12 +936,12 @@ export default { // 移动 handleCollectMoveFile() { if (this.selections.length === 0) { - this.$message('您还未勾选需要操作的条目，请先确认！') + this.$message({ message: '您还未勾选需要操作的条目，请先确认！', offset: 8 }) return false } const isHasFillFormal = this.selections.some(item => item.collect_formal === 2) if (isHasFillFormal) { - this.$message('您所选的条目有正在归档流程中，不可操作移动，请先确认！') + this.$message({ message: '您所选的条目有正在归档流程中，不可操作移动，请先确认！', offset: 8 }) return false } this.$refs.collectMoveFileRef.collectMoveFileVisible = true @@ -931,12 +949,12 @@ export default { // 归档 handleFiling() { if (this.selections.length === 0) { - this.$message('您还未勾选需要操作的条目，请先确认！') + this.$message({ message: '您还未勾选需要操作的条目，请先确认！', offset: 8 }) return false } const isHasFillFormal = this.selections.some(item => item.collect_formal === 2) if (isHasFillFormal) { - this.$message('您所选的条目有正在归档流程中，勿重复操作，请先确认！！') + this.$message({ message: '您所选的条目有正在归档流程中，勿重复操作，请先确认！！', offset: 8 }) return false } this.$refs.archivesFillingRef.archivesFillingVisible = true @@ -944,12 +962,12 @@ export default { // 退回预归档库 handleReturn() { if (this.selections.length === 0) { - this.$message('您还未勾选需要操作的条目，请先确认！') + this.$message({ message: '您还未勾选需要操作的条目，请先确认！', offset: 8 }) return false } const isHasFillFormal = this.selections.some(item => item.collect_formal === 2) if (isHasFillFormal) { - this.$message('您所选的条目有正在归档流程中，不可操作退回预归档库，请先确认！！') + this.$message({ message: '您所选的条目有正在归档流程中，不可操作退回预归档库，请先确认！！', offset: 8 }) return false } this.$confirm('此操作将把会所选条目退回到预归档库' + '你是否还要继续？', '提示', { @@ -966,13 +984,14 @@ export default { FetchReturnReDocument(params).then((res) => { if (res.code !== 500) { if (res === 0) { - this.crud.notify('当前数据中不包含预归档数据，无法返回', CRUD.NOTIFICATION_TYPE.INFO) + this.crud.notify('', CRUD.NOTIFICATION_TYPE.INFO) + this.$message({ message: '当前数据中不包含预归档数据，无法返回', offset: 8 }) } else { - this.crud.notify('已成功返回' + res + '条来自预归档的数据', CRUD.NOTIFICATION_TYPE.SUCCESS) + this.$message({ message: '已成功返回' + res + '条来自预归档的数据', type: 'success', offset: 8 }) } this.handleSearch(this.collectLevel) } else { - this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.ERROR) + this.$message({ message: res.message, type: 'error', offset: 8 }) } }).catch(err => { console.log(err) @@ -983,7 +1002,7 @@ export default { // 导出 handleExport() { if (this.selections.length === 0) { - this.$message('您还未勾选需要操作的条目，请先确认！') + this.$message({ message: '您还未勾选需要操作的条目，请先确认！', offset: 8 }) return false } this.$confirm('此操作将导出所选数据' + '你是否还要继续？', '提示', { @@ -1028,12 +1047,12 @@ export default { // 四性检测 handleFourTest() { if (this.selections.length === 0) { - this.$message('您还未勾选需要操作的条目，请先确认！') + this.$message({ message: '您还未勾选需要操作的条目，请先确认！', offset: 8 }) return false } const isHasFillFormal = this.selections.some(item => item.collect_formal === 2) if (isHasFillFormal) { - this.$message('您所选的条目有正在归档流程中，不可操作四性检测，请先确认！') + this.$message({ message: '您所选的条目有正在归档流程中，不可操作四性检测，请先确认！', offset: 8 }) return false } this.$refs.fourTestRef.fourTestVisible = true @@ -1042,7 +1061,7 @@ export default { // 目录下载 handleCatalogDownload() { if (this.selections.length === 0) { - this.$message('您还未勾选需要操作的条目，请先确认！') + this.$message({ message: '您还未勾选需要操作的条目，请先确认！', offset: 8 }) return false } this.$confirm('此操作将下载所选条目目录' + '你是否还要继续？', '提示', { @@ -1071,7 +1090,7 @@ export default { // 手工组卷 handlePaper() { if (this.selections.length === 0) { - this.$message('您还未勾选需要操作的条目，请先确认！') + this.$message({ message: '您还未勾选需要操作的条目，请先确认！', offset: 8 }) return false } @@ -1081,20 +1100,20 @@ export default { // 原文内的附件下载 handleOriginalDownload() { if (this.selections.length > 1 || this.selections.length === 0) { - this.$message('下载操作只可勾选唯一目标条目，请先确认！') + this.$message({ message: '下载操作只可勾选唯一目标条目，请先确认！', offset: 8 }) return false } const url = this.baseApi + '/downloadFile' + this.selections[0].file_path fetch(url).then(res => res.blob()).then(blob => { downloadFile(blob, this.selections[0].file_name.split('.')[0], this.selections[0].file_type) }).catch(() => { - this.$message.error('下载文件失败!') + this.$message({ message: '下载文件失败！', type: 'error', offset: 8 }) }) }, // 回收站 - 恢复 toRecover() { if (this.selections.length === 0) { - this.$message('您还未勾选需要操作的条目，请先确认！') + this.$message({ message: '您还未勾选需要操作的条目，请先确认！', offset: 8 }) return false } this.$confirm('此恢复将会把所选条目及其子集一并恢复' + '你是否还要继续？', '提示', { @@ -1115,10 +1134,10 @@ export default { FetchRestoreArchives(params).then((res) => { if (res.code !== 500) { console.log(res) - this.crud.notify(res, CRUD.NOTIFICATION_TYPE.SUCCESS) + this.$message({ message: res, type: 'success', offset: 8 }) this.handleSearch(this.collectLevel) } else { - this.crud.notify('回复所选档案失败', CRUD.NOTIFICATION_TYPE.ERROR) + this.$message({ message: '回复所选档案失败', type: 'error', offset: 8 }) } }).catch(err => { console.log(err) @@ -1129,7 +1148,7 @@ export default { // 回收站 - 彻底删除 toCompletelyDelete() { if (this.selections.length === 0) { - this.$message('您还未勾选需要操作的条目，请先确认！') + this.$message({ message: '您还未勾选需要操作的条目，请先确认！', offset: 8 }) return false } this.$confirm('此删除将把会所选条目与其子集彻底删除' + '你是否还要继续？', '提示', { @@ -1149,10 +1168,10 @@ export default { } FetchCompleteDelArchives(params).then((res) => { if (res.code !== 500) { - this.crud.notify(res, CRUD.NOTIFICATION_TYPE.SUCCESS) + this.$message({ message: res, type: 'success', offset: 8 }) this.handleSearch(this.collectLevel) } else { - this.crud.notify('删除所选档案失败', CRUD.NOTIFICATION_TYPE.ERROR) + this.$message({ message: '删除所选档案失败', type: 'error', offset: 8 }) } }).catch(err => { console.log(err) @@ -1172,4 +1191,7 @@ export default { diff --git a/src/views/collectReorganizi/collectionLibrary/project/index.vue b/src/views/collectReorganizi/collectionLibrary/project/index.vue index db55d86..5add33d 100644 --- a/src/views/collectReorganizi/collectionLibrary/project/index.vue +++ b/src/views/collectReorganizi/collectionLibrary/project/index.vue @@ -197,7 +197,7 @@ export default {