diff --git a/src/api/collect/collect.js b/src/api/collect/collect.js index d183f9f..9c9d00b 100644 --- a/src/api/collect/collect.js +++ b/src/api/collect/collect.js @@ -189,6 +189,23 @@ export function FetchMove(data) { }) } +// 获取打印数据 +export function FetchPrintData(params) { + return request({ + url: 'api/collect/getPrintData' + '?' + qs.stringify(params, { indices: false }), + method: 'get' + }) +} + +// 退回预归档库 +export function FetchReturnReDocument(data) { + return request({ + url: 'api/collect/returnReDocument', + method: 'post', + data + }) +} + export default { collectAdd, collectEdit, @@ -208,5 +225,7 @@ export default { FetchDisbandArchives, FetchMergeArchives, FetchInsertSingle, - FetchMove + FetchMove, + FetchPrintData, + FetchReturnReDocument } diff --git a/src/assets/images/archives/bg.png b/src/assets/images/archives/bg.png new file mode 100644 index 0000000..a4a0d27 Binary files /dev/null and b/src/assets/images/archives/bg.png differ diff --git a/src/assets/images/archives/bgw.png b/src/assets/images/archives/bgw.png new file mode 100644 index 0000000..5487ed6 Binary files /dev/null and b/src/assets/images/archives/bgw.png differ diff --git a/src/assets/images/archives/icon-js.png b/src/assets/images/archives/icon-js.png new file mode 100644 index 0000000..6f528dd Binary files /dev/null and b/src/assets/images/archives/icon-js.png differ diff --git a/src/assets/images/archives/icon-ls.png b/src/assets/images/archives/icon-ls.png new file mode 100644 index 0000000..e818544 Binary files /dev/null and b/src/assets/images/archives/icon-ls.png differ diff --git a/src/assets/images/archives/ys1.png b/src/assets/images/archives/ys1.png new file mode 100644 index 0000000..ab0565d Binary files /dev/null and b/src/assets/images/archives/ys1.png differ diff --git a/src/assets/images/archives/ys2.png b/src/assets/images/archives/ys2.png new file mode 100644 index 0000000..bc89c9e Binary files /dev/null and b/src/assets/images/archives/ys2.png differ diff --git a/src/assets/images/archives/ys3.png b/src/assets/images/archives/ys3.png new file mode 100644 index 0000000..14dc38e Binary files /dev/null and b/src/assets/images/archives/ys3.png differ diff --git a/src/assets/images/archives/ys4.png b/src/assets/images/archives/ys4.png new file mode 100644 index 0000000..bba0cba Binary files /dev/null and b/src/assets/images/archives/ys4.png differ diff --git a/src/assets/styles/archives-manage.scss b/src/assets/styles/archives-manage.scss index 9721090..26443ee 100644 --- a/src/assets/styles/archives-manage.scss +++ b/src/assets/styles/archives-manage.scss @@ -1029,4 +1029,37 @@ font-weight: bold !important; color: #0348F3 !important; border-color: #0348F3 !important; +} + +.device-sulan-btn{ + display: inline-block; + padding: 0 7px; + color: #FF8329; + background-color: #FFF3E5; + border: 1px solid #FEBD98; + border-radius: 3px; + cursor: pointer; +} + +.device-edit-btn{ + display: inline-block; + padding: 0 6px 0 10px; + margin: 0 4px; + text-align: center; + color: #0348F3; + background-color: #DCEDFD; + border: 1px solid #9BD1FF; + border-radius: 3px; + cursor: pointer; +} + +.device-delt-btn{ + display: inline-block; + padding: 0 6px 0 10px; + text-align: center; + color: #ED4A41; + background-color: #FCECE9; + border: 1px solid #FBC0B5; + border-radius: 3px; + cursor: pointer; } \ No newline at end of file diff --git a/src/views/archiveKeeping/deviceManage/module/childDevice.vue b/src/views/archiveKeeping/deviceManage/module/childDevice.vue index a358eaf..dfb25b6 100644 --- a/src/views/archiveKeeping/deviceManage/module/childDevice.vue +++ b/src/views/archiveKeeping/deviceManage/module/childDevice.vue @@ -228,34 +228,5 @@ export default { } } } -.device-sulan-btn{ - display: inline-block; - padding: 0 7px; - color: #FF8329; - background-color: #FFF3E5; - border: 1px solid #FEBD98; - border-radius: 3px; - cursor: pointer; -} -.device-edit-btn{ - display: inline-block; - padding: 0 6px 0 10px; - margin: 0 4px; - text-align: center; - color: #0348F3; - background-color: #DCEDFD; - border: 1px solid #9BD1FF; - border-radius: 3px; - cursor: pointer; -} -.device-delt-btn{ - display: inline-block; - padding: 0 6px 0 10px; - text-align: center; - color: #ED4A41; - background-color: #FCECE9; - border: 1px solid #FBC0B5; - border-radius: 3px; - cursor: pointer; -} + diff --git a/src/views/archiveKeeping/deviceManage/module/detail.vue b/src/views/archiveKeeping/deviceManage/module/detail.vue index bfb3d7f..8c6d2f1 100644 --- a/src/views/archiveKeeping/deviceManage/module/detail.vue +++ b/src/views/archiveKeeping/deviceManage/module/detail.vue @@ -1,38 +1,81 @@ + + diff --git a/src/views/archiveUtilize/archiveSearch/index.vue b/src/views/archiveUtilize/archiveSearch/index.vue new file mode 100644 index 0000000..64c890c --- /dev/null +++ b/src/views/archiveUtilize/archiveSearch/index.vue @@ -0,0 +1,286 @@ + + + + + diff --git a/src/views/archiveUtilize/utillizeRecord/index.vue b/src/views/archiveUtilize/utillizeRecord/index.vue new file mode 100644 index 0000000..a1a71d0 --- /dev/null +++ b/src/views/archiveUtilize/utillizeRecord/index.vue @@ -0,0 +1,20 @@ + + + + + diff --git a/src/views/collectReorganizi/collectionLibrary/module/collectHeader.vue b/src/views/collectReorganizi/collectionLibrary/module/collectHeader.vue index 005fcba..8c9fa04 100644 --- a/src/views/collectReorganizi/collectionLibrary/module/collectHeader.vue +++ b/src/views/collectReorganizi/collectionLibrary/module/collectHeader.vue @@ -200,22 +200,8 @@ - - -
-
-

此移出将把会所选条目退回到预归档库

- 你是否还要继续? -
-
- 取消 - 确定 -
-
- - - + @@ -272,7 +258,7 @@ 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 } from '@/api/collect/collect' +import { FetchDetailsById, collectDel, FetchRemoveArchivesSingle, FetchDeleteArchivesFile, FetchUpdateArchivesNo, FetchDisbandArchives, FetchReturnReDocument } from '@/api/collect/collect' import { FetchArchivesClassTree } from '@/api/system/archivesClass' import { FetchDictionaryTree } from '@/api/system/dict' import Treeselect from '@riophae/vue-treeselect' @@ -341,7 +327,6 @@ export default { deleteVisible: false, moveVisible: false, filingVisible: false, - returnVisible: false, downloadVisible: false, recoverVisible: false, completelyDeleteVisible: false, @@ -895,14 +880,38 @@ export default { }, // 退回预归档库 handleReturn() { - if (this.selections.length > 1 || this.selections.length === 0) { - this.$message('该操作只可勾选唯一目标条目，请先确认！') + if (this.selections.length === 0) { + this.$message('您还未勾选需要操作的条目，请先确认！') return false } - this.returnVisible = true - }, - handleReturnConfirm() { - this.returnVisible = false + this.$confirm('此操作将把会所选条目退回到预归档库' + '你是否还要继续？', '提示', { + confirmButtonText: '继续', + cancelButtonText: '取消', + type: 'warning', + dangerouslyUseHTMLString: true + }).then(() => { + const archivesIds = this.selections.map(item => item.id) + const params = { + 'categoryId': this.selectedCategory.id, + 'archivesIds': archivesIds + } + console.log(params) + FetchReturnReDocument(params).then((res) => { + if (res.code !== 500) { + if (res === 0) { + this.crud.notify('当前数据中不包含预归档数据，无法返回', CRUD.NOTIFICATION_TYPE.INFO) + } else { + this.crud.notify('已成功返回' + res + '条来自预归档的数据', CRUD.NOTIFICATION_TYPE.SUCCESS) + } + this.handleSearch(this.collectLevel) + } else { + this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.ERROR) + } + }).catch(err => { + console.log(err) + }) + }).catch(() => { + }) }, // 导出 handleExport() { @@ -943,6 +952,21 @@ export default { handlePrint() { if (this.selections.length === 0) { this.$refs.printRef.form.printRange = '当页条目' + let currentTableData = [] + if (this.collectLevel === 2) { + console.log('案卷') + currentTableData = this.parentsData.$refs.anjuanEle.$refs.ajContent.$refs.tableList.anjuanData + } else if (this.collectLevel === 3) { + if (this.isTitleType === 3) { + console.log('文件') + currentTableData = this.parentsData.$refs.anjuanEle.$refs.ajContent.$refs.tableList.anjuanData + } else { + console.log('卷内') + currentTableData = this.parentsData.$refs.juanneiEle.junneiData + } + } + console.log(currentTableData) + this.$refs.printRef.currentTable = JSON.parse(JSON.stringify(currentTableData)) } else { this.$refs.printRef.form.printRange = '勾选条目' } diff --git a/src/views/collectReorganizi/collectionLibrary/module/print/index.vue b/src/views/collectReorganizi/collectionLibrary/module/print/index.vue index aa4101b..221929f 100644 --- a/src/views/collectReorganizi/collectionLibrary/module/print/index.vue +++ b/src/views/collectReorganizi/collectionLibrary/module/print/index.vue @@ -7,17 +7,17 @@ - - + + - + @@ -29,68 +29,78 @@ - +

{{ printTitle }}

- - - - - + - - -