From fb13ab3155b770b147dc1a612d82ffd67c87c702 Mon Sep 17 00:00:00 2001 From: xuhuajiao <13476289682@163.com> Date: Fri, 19 Jan 2024 17:30:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A1=A3=E6=A1=88=E7=AE=A1=E7=90=86/=E6=A1=A3?= =?UTF-8?q?=E6=A1=88=E7=9B=92=E7=AE=A1=E7=90=86/bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/archivesManage/library.js | 20 +- src/assets/styles/collect-reorganizi.scss | 10 + .../caseManage/caseList/index.vue | 88 +++++- .../caseList/module/detailDialog.vue | 268 ++++++++++++------ .../{module/caseLog.vue => caseLog/index.vue} | 28 +- src/views/archiveKeeping/caseManage/index.vue | 2 +- .../archivesManage/destructionList/index.vue | 3 +- .../module/collectHeader.vue | 23 +- .../managementLibrary/module/handOverForm.vue | 8 +- .../module/offLineHandover/index.vue | 3 - .../module/onlineHandover/index.vue | 3 +- .../module/packingBox/index.vue | 7 +- .../archivesManage/moveInventory/index.vue | 3 +- .../archivesManage/openInventory/index.vue | 140 ++++++--- .../openInventory/module/detail.vue | 75 +++-- .../module/collectHeader.vue | 2 + .../components/archivesListModule/index.vue | 15 +- src/views/components/category/PreviewForm.vue | 5 +- 18 files changed, 502 insertions(+), 201 deletions(-) rename src/views/archiveKeeping/caseManage/{module/caseLog.vue => caseLog/index.vue} (87%) diff --git a/src/api/archivesManage/library.js b/src/api/archivesManage/library.js index 328e42a..43558ee 100644 --- a/src/api/archivesManage/library.js +++ b/src/api/archivesManage/library.js @@ -25,12 +25,19 @@ export function FetchIntoFlowBusiness(data) { }) } -// 档案退回流程确定 -export function FetchArchivesReturnConfirm(data) { +// 获取业务流程列表 +export function FetchBusinessFlowHistory(params) { return request({ - url: 'api/control/archivesReturnConfirm', - method: 'post', - data: data + url: 'api/control/getBusinessFlowHistory' + '?' + qs.stringify(params, { indices: false }), + method: 'get' + }) +} + +// 获取业务流程id获取详情信息 +export function FetchBusinessFlowDetails(params) { + return request({ + url: 'api/control/getBusinessFlowDetails' + '?' + qs.stringify(params, { indices: false }), + method: 'get' }) } @@ -38,5 +45,6 @@ export default { FetchInitContorlView, FetchPrintData, FetchIntoFlowBusiness, - FetchArchivesReturnConfirm + FetchBusinessFlowHistory, + FetchBusinessFlowDetails } diff --git a/src/assets/styles/collect-reorganizi.scss b/src/assets/styles/collect-reorganizi.scss index d82061f..60d85ef 100644 --- a/src/assets/styles/collect-reorganizi.scss +++ b/src/assets/styles/collect-reorganizi.scss @@ -20,6 +20,7 @@ } } .hitch-info{ + position: relative; display: flex; flex-wrap: wrap; justify-content: space-between; @@ -38,6 +39,15 @@ font-style: normal; } } + .state-list{ + position: absolute; + right: 0; + top: 0; + width: auto; + span{ + width: auto; + } + } } // 2023-10-9 收集整编 diff --git a/src/views/archiveKeeping/caseManage/caseList/index.vue b/src/views/archiveKeeping/caseManage/caseList/index.vue index 716dd95..a6e6923 100644 --- a/src/views/archiveKeeping/caseManage/caseList/index.vue +++ b/src/views/archiveKeeping/caseManage/caseList/index.vue @@ -73,13 +73,14 @@ > - + + @@ -101,6 +102,27 @@ + +
+

归档文件目录

+ + + + + + + + + + + + + + +
+ @@ -198,7 +220,9 @@ export default { ], inputSelect: '', typeValue: '', - typeInputkey: '' // 避免向后端传递多余参数,切换和重置时，若有typeInputkey则去掉form中对应参数 + typeInputkey: '', // 避免向后端传递多余参数,切换和重置时，若有typeInputkey则去掉form中对应参数 + isHidden: false, + printData: [] } }, computed: { @@ -278,34 +302,31 @@ export default { }) } }, - [CRUD.HOOK.beforeToCU](crud, form, btn) { - console.log(form) - }, // 提交前的验证 [CRUD.HOOK.afterValidateCU](crud) { console.log(crud.form) return true }, - resetQuery() { - }, tableDoubleClick(row) { + this.$refs.detailDom.caseTabIndex = 0 this.$refs.detailDom.rowData = row const params = { caseId: row.id } this.crud.crudMethod.findInCase(params).then(res => { + console.log(res) if (res) { this.$refs.detailDom.tableData = res.archives + this.$refs.detailDom.collectLevel = parseInt(res.archives[0].categoryLevel) + } else { + this.$refs.detailDom.tableData = [] } }) this.$refs.detailDom.detailVisible = true }, - handleCloseDialog(done) { - }, handleDel(data) { const boolDeposit = data.every(item => item.depositNum === 0) const boolStorage = data.every(item => item.storageType === 0) - if (boolStorage) { if (boolDeposit) { this.$confirm('此操作将删除所选数据' + '你是否还要继续？', '提示', { @@ -414,7 +435,7 @@ export default { type: 'warning' }) } else { - this.$confirm('此操作将导出所选数据' + '提示：1.确定拆盒后，当前盒号下绑定的所有档案数据将一并清除；2.若案卷存在多个盒，选择其中一个分盒则自动拆掉该案卷的全部档案盒', '提示', { + this.$confirm('此操作将拆掉当前档案盒' + '提示：1.确定拆盒后，当前盒号下绑定的所有档案数据将一并清除；2.若案卷存在多个盒，选择其中一个分盒则自动拆掉该案卷的全部档案盒', '提示', { confirmButtonText: '继续', cancelButtonText: '取消', type: 'warning', @@ -465,4 +486,49 @@ export default { background-color: #fff !important; color: #0348F3 !important; } + +.intoExamine{ + position: fixed; + left: 50%; + top: 50%; + transform: translate(-50%,-50%); + // width: 980px; + background-color: #fff; + z-index: 99; + ::v-deep .el-table--group, .el-table--border{ + border: 1px solid #000; + border-bottom: none; + } + ::v-deep .el-table__header{ + border-bottom: 1px solid #000;; + } + ::v-deep .el-table .el-table__header-wrapper th.el-table__cell, .el-table .el-table__header th.el-table__cell{ + color: #000; + background-color: #fff; + border-bottom: none; + &>.cell{ + color: #000; + } + } + ::v-deep .el-table .el-table__body-wrapper td.el-table__cell, .el-table .el-table__fixed-right td.el-table__cell{ + color: #000; + border-bottom: 1px solid #000; + padding: 0; + } + ::v-deep .el-table__body tr.el-table__row:hover>td.el-table__cell, .el-table__body tr.el-table__row:focus>td.el-table__cell, .el-table__body tr.current-row:hover>td.el-table__cell, .el-table__body tr.current-row:focus>td.el-table__cell{ + background-color: transparent; + } + ::v-deep .el-table--border .el-table__cell{ + border-right: 1px solid #000; + } +} +@media print { + /*最外层打印节点*/ + html,body{ + height: inherit; + } + .intoExamine{ + margin: 0 auto; + } +} diff --git a/src/views/archiveKeeping/caseManage/caseList/module/detailDialog.vue b/src/views/archiveKeeping/caseManage/caseList/module/detailDialog.vue index 626c5f7..8955967 100644 --- a/src/views/archiveKeeping/caseManage/caseList/module/detailDialog.vue +++ b/src/views/archiveKeeping/caseManage/caseList/module/detailDialog.vue @@ -1,105 +1,213 @@ diff --git a/src/views/archiveKeeping/caseManage/module/caseLog.vue b/src/views/archiveKeeping/caseManage/caseLog/index.vue similarity index 87% rename from src/views/archiveKeeping/caseManage/module/caseLog.vue rename to src/views/archiveKeeping/caseManage/caseLog/index.vue index 101ae56..bc6ec54 100644 --- a/src/views/archiveKeeping/caseManage/module/caseLog.vue +++ b/src/views/archiveKeeping/caseManage/caseLog/index.vue @@ -38,7 +38,7 @@
- + 导出 @@ -51,6 +51,7 @@ style="width: 100%;" height="calc(100vh - 346px)" @selection-change="crud.selectionChangeHandler" + @row-click="clickRowHandler" > @@ -80,6 +81,9 @@ import CRUD, { presenter, crud } from '@crud/crud' import caseCurd from '@/api/archivesKeeping/caseManage' import rrOperation from '@crud/RR.operation' import pagination from '@crud/Pagination' +import qs from 'qs' +import { exportFile } from '@/utils/index' +import { mapGetters } from 'vuex' export default { name: 'RecordList', @@ -149,13 +153,11 @@ export default { } }, computed: { - // ...mapGetters([ - // 'user' - // ]) + ...mapGetters([ + 'baseApi' + ]) }, watch: { - activeIndex: function(newValue, oldValue) { - } }, created() { // 初始化带select的输入框的 - 搜索 @@ -198,7 +200,19 @@ export default { [CRUD.HOOK.beforeRefresh]() { this.crud.query.operationType = this.selectStatus }, - resetQuery() { + getRowKey(row) { + return row.id + }, + clickRowHandler(row) { + this.$refs.table.toggleRowSelection(row) + }, + // 导出接口调用 + downloadApi(data) { + const ids = data.map(item => { return item.id }) + const params = { + 'logIds': ids + } + exportFile(this.baseApi + '/api/archivesDeposit/exportCaseLogList?' + qs.stringify(params, { indices: false })) } } } diff --git a/src/views/archiveKeeping/caseManage/index.vue b/src/views/archiveKeeping/caseManage/index.vue index c42fc2c..96dc5eb 100644 --- a/src/views/archiveKeeping/caseManage/index.vue +++ b/src/views/archiveKeeping/caseManage/index.vue @@ -18,7 +18,7 @@ diff --git a/src/views/collectReorganizi/collectionLibrary/module/collectHeader.vue b/src/views/collectReorganizi/collectionLibrary/module/collectHeader.vue index c3042a5..bb5a9de 100644 --- a/src/views/collectReorganizi/collectionLibrary/module/collectHeader.vue +++ b/src/views/collectReorganizi/collectionLibrary/module/collectHeader.vue @@ -537,6 +537,8 @@ export default { this.isDesFormType = 'arcives' this.$nextTick(() => { this.$refs.previewForm.archivesType = 'add' + console.log('active', this.activeIndex) + this.$refs.previewForm.activeIndex = this.activeIndex this.$refs.previewForm.FetchNoFormatField(this.selectedCategory.id) }) }) diff --git a/src/views/components/archivesListModule/index.vue b/src/views/components/archivesListModule/index.vue index 1e2d11a..e34765b 100644 --- a/src/views/components/archivesListModule/index.vue +++ b/src/views/components/archivesListModule/index.vue @@ -12,7 +12,8 @@ @cell-dblclick="tableDoubleClick" > - + + @@ -69,6 +70,10 @@ export default { isCollect: { type: Boolean, default: true + }, + isCase: { + type: Boolean, + default: false } }, data() { @@ -80,7 +85,8 @@ export default { arcId: null, isDetail: false, parentId: null, - detailLevel: null + detailLevel: null, + caseCategoryId: null } }, watch: { @@ -110,6 +116,11 @@ export default { categoryId: this.selectedCategory.id, categoryLevel: this.detailLevel } + } else if (this.isCase) { + params = { + categoryId: this.caseCategoryId, + categoryLevel: this.collectLevel + } } else { params = { categoryId: this.selectedCategory.id, diff --git a/src/views/components/category/PreviewForm.vue b/src/views/components/category/PreviewForm.vue index 1ee7c29..fc6abb5 100644 --- a/src/views/components/category/PreviewForm.vue +++ b/src/views/components/category/PreviewForm.vue @@ -221,7 +221,8 @@ export default { fileJsonString: null, mergeFileArcIds: null, mergeFileCategory: null, - archivesType: null + archivesType: null, + activeIndex: null } }, computed: { @@ -804,7 +805,7 @@ export default { 'categoryLevel': 2, 'jsonString': JSON.stringify(this.addOrUpdateForm) } - } else if (this.selectedCategory.arrangeType === 3 && this.collectLevel === 3 && this.archivesType === 'add') { + } else if (this.selectedCategory.arrangeType === 3 && this.activeIndex === 1 && this.archivesType === 'add') { // 在项目下，未整理的文件只属于门类下，不属于任何项目或案卷，所以parentsId === null params = { 'archivesId': this.arcId,