From f3e807f061dfd0551ca7aa027518bb46893213fb Mon Sep 17 00:00:00 2001 From: xuhuajiao <13476289682@163.com> Date: Mon, 8 Apr 2024 17:29:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=AE=A1=E7=90=86/bug?= =?UTF-8?q?=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 | 32 ++++- .../archiveSearch/module/resultList.vue | 4 +- .../utillizeRecord/recordList.vue | 9 +- .../managementLibrary/index.vue | 5 +- .../module/collectHeader.vue | 2 + .../managementLibrary/module/handOverForm.vue | 56 +++++++- .../module/onlineHandover/index.vue | 1 + .../collectionLibrary/index.vue | 6 +- src/views/components/category/PreviewForm.vue | 13 +- .../processManage/runningProcess/index.vue | 1 + .../module/businessDetails/index.vue | 48 ++++--- .../runningProcess/module/detail.vue | 33 ++++- src/views/system/user/processCenter/index.vue | 2 + .../system/user/processCenter/module/form.vue | 123 +++++++++++++----- 14 files changed, 252 insertions(+), 83 deletions(-) diff --git a/src/api/archivesManage/library.js b/src/api/archivesManage/library.js index 08a6ac9..4f2c61d 100644 --- a/src/api/archivesManage/library.js +++ b/src/api/archivesManage/library.js @@ -74,6 +74,33 @@ export function FetchUtilizeConfirm(data) { }) } +// 档案销毁流程确定 +export function FetchArchivesDestructionConfirm(data) { + return request({ + url: 'api/control/archivesDestructionConfirm', + method: 'post', + data: data + }) +} + +// 档案开放流程确定 +export function FetchArchivesOpenConfirm(data) { + return request({ + url: 'api/control/archivesOpenConfirm', + method: 'post', + data: data + }) +} + +// 档案退回流程确定 +export function FetchArchivesReturnConfirm(data) { + return request({ + url: 'api/control/archivesReturnConfirm', + method: 'post', + data: data + }) +} + export default { FetchInitContorlView, FetchPrintData, @@ -83,5 +110,8 @@ export default { FetchMainData, FetchIsAuthByLookType, FetchBase64ByFileId, - FetchUtilizeConfirm + FetchUtilizeConfirm, + FetchArchivesDestructionConfirm, + FetchArchivesOpenConfirm, + FetchArchivesReturnConfirm } diff --git a/src/views/archiveUtilize/archiveSearch/module/resultList.vue b/src/views/archiveUtilize/archiveSearch/module/resultList.vue index dea627b..2aad171 100644 --- a/src/views/archiveUtilize/archiveSearch/module/resultList.vue +++ b/src/views/archiveUtilize/archiveSearch/module/resultList.vue @@ -130,8 +130,8 @@
查看详情 - - + +
diff --git a/src/views/archiveUtilize/utillizeRecord/recordList.vue b/src/views/archiveUtilize/utillizeRecord/recordList.vue index 8600b82..2770a35 100644 --- a/src/views/archiveUtilize/utillizeRecord/recordList.vue +++ b/src/views/archiveUtilize/utillizeRecord/recordList.vue @@ -301,16 +301,17 @@ export default { }, getBusinessFlowDetails(row) { const params = { - 'businessId': row.businessFlowId + 'businessId': row.businessFlowId, + 'page': 0, + 'size': '999' } FetchBusinessFlowDetails(params).then((res) => { if (res.code !== 500) { - console.log(res) this.rowCurrent = res.businessFlow - res.details.forEach(item => { + res.details.content.forEach(item => { item.utilizeType = item.utilizeType.split(',').map(Number) }) - this.detailArcData = res.details + this.detailArcData = res.details.content console.log(this.detailArcData) } else { this.$message({ message: '获取数据失败', type: 'error', offset: 8 }) diff --git a/src/views/archivesManage/managementLibrary/index.vue b/src/views/archivesManage/managementLibrary/index.vue index 8b574d5..fd95632 100644 --- a/src/views/archivesManage/managementLibrary/index.vue +++ b/src/views/archivesManage/managementLibrary/index.vue @@ -332,16 +332,18 @@ export default { handlePageList(isQuickFilter) { if (this.selectedCategory.arrangeType === 3) { const tablistEle = this.$refs.projectEle + tablistEle.page.page = 0 // 项目下 if (isQuickFilter) { tablistEle.$refs.collectHeaderRef.getInitArchivesClass() tablistEle.getTableDisplayFieldsLoading = true tablistEle.getViewTableList(1, null, isQuickFilter) } else { - this.$refs.projectEle.getCommonData(1) + tablistEle.getCommonData(1) } } else if (this.selectedCategory.arrangeType === 2) { const tablistEle = this.$refs.anjuanEle.$refs.ajContent.$refs.tableList + tablistEle.page.page = 0 // 案卷下 if (isQuickFilter) { tablistEle.$refs.collectHeaderRef.getInitArchivesClass() @@ -352,6 +354,7 @@ export default { } } else if (this.selectedCategory.arrangeType === 1) { const tablistEle = this.$refs.anjuanEle.$refs.ajContent.$refs.tableList + tablistEle.page.page = 0 // 文件下 if (isQuickFilter) { tablistEle.$refs.collectHeaderRef.getInitArchivesClass() diff --git a/src/views/archivesManage/managementLibrary/module/collectHeader.vue b/src/views/archivesManage/managementLibrary/module/collectHeader.vue index 3e53388..0c94efb 100644 --- a/src/views/archivesManage/managementLibrary/module/collectHeader.vue +++ b/src/views/archivesManage/managementLibrary/module/collectHeader.vue @@ -800,6 +800,7 @@ export default { return false } // this.$refs.offLineHandover.offLineHandoverVisible = true + this.$refs.formModule.activeIndex = 0 this.$refs.formModule.overType = 7 this.$refs.formModule.overDetialVisible = true this.$refs.formModule.overDetialTitle = '离线移交-流程' @@ -843,6 +844,7 @@ export default { this.$refs.formModule.overType = 4 this.$refs.formModule.overDetialTitle = '销毁鉴定-流程' } + this.$refs.formModule.activeIndex = 0 this.$refs.formModule.overDetialVisible = true }, diff --git a/src/views/archivesManage/managementLibrary/module/handOverForm.vue b/src/views/archivesManage/managementLibrary/module/handOverForm.vue index 16b65b3..607559f 100644 --- a/src/views/archivesManage/managementLibrary/module/handOverForm.vue +++ b/src/views/archivesManage/managementLibrary/module/handOverForm.vue @@ -27,7 +27,7 @@
- +
@@ -41,6 +41,7 @@ import { FetchFondsDetail } from '@/api/system/fonds' import { FetchBusinessFlowTitle } from '@/api/collect/collect' import { FetchIntoFlowBusiness } from '@/api/archivesManage/library' +import { FetchInitFlowAll, FetchFindFolwImgByModelId } from '@/api/system/flowable' import { mapGetters } from 'vuex' import ArchivesListModule from '@/views/components/archivesListModule/index' import { getCurrentTime } from '@/utils/index' @@ -90,7 +91,8 @@ export default { ] }, defaultImg: 'this.src="' + require('@/assets/images/system/default-img.jpg') + '"', - srcImg: null + srcImg: null, + modelOptions: null } }, computed: { @@ -99,7 +101,8 @@ export default { 'baseApi' ]) }, - created() { + mounted() { + this.getAllFlowable() }, methods: { opened() { @@ -126,7 +129,35 @@ export default { if (this.activeIndex === 0) { console.log('流程表单') } else if (this.activeIndex === 1) { - console.log('流程图') + console.log(this.overType) + console.log(this.modelOptions) + // 2 退回 3 开放 4 销毁 7 离线 + let procdefId + if (this.overType === 2) { + const findItem = this.findIdByModelId('archives_return') + procdefId = findItem.procdefId + } else if (this.overType === 3) { + const findItem = this.findIdByModelId('open_auditing') + procdefId = findItem.procdefId + } else if (this.overType === 4) { + const findItem = this.findIdByModelId('destroy_appraisal') + procdefId = findItem.procdefId + } else if (this.overType === 7) { + const findItem = this.findIdByModelId('offline_handover') + procdefId = findItem.procdefId + } else if (this.overType === 6) { + const findItem = this.findIdByModelId('internal_transfer') + procdefId = findItem.procdefId + } + this.getProcessImg(procdefId) + } + }, + findIdByModelId(modelKey) { + const item = this.modelOptions.find(data => data.modelKey === modelKey) + if (item) { + return item + } else { + return null } }, getBusinessFlowTitle() { @@ -146,6 +177,21 @@ export default { console.log(err) }) }, + getAllFlowable() { + FetchInitFlowAll().then((res) => { + this.modelOptions = res + }).catch(err => { + console.log(err) + }) + }, + getProcessImg(procdefId) { + this.srcImg = '' + FetchFindFolwImgByModelId({ 'processDefinitionId': procdefId }).then((res) => { + this.srcImg = 'data:image/jpeg;base64,' + res + }).catch(err => { + console.log(err) + }) + }, submitHandOverForm() { this.$refs['form'].validate((valid) => { if (valid) { @@ -205,7 +251,7 @@ export default { overflow: hidden; img{ display: block; - width: 100%; + // width: 100%; // height: 100%; } } diff --git a/src/views/archivesManage/managementLibrary/module/onlineHandover/index.vue b/src/views/archivesManage/managementLibrary/module/onlineHandover/index.vue index ec78597..4099aad 100644 --- a/src/views/archivesManage/managementLibrary/module/onlineHandover/index.vue +++ b/src/views/archivesManage/managementLibrary/module/onlineHandover/index.vue @@ -117,6 +117,7 @@ export default { this.onlineHandoverVisible = false this.$refs.handoverForm.targetFondsNo = row this.$refs.handoverForm.overDetialVisible = true + this.$refs.handoverForm.overType = 6 this.$refs.handoverForm.overDetialTitle = '在线移交-流程' }, handleSizeChange(size) { diff --git a/src/views/collectReorganizi/collectionLibrary/index.vue b/src/views/collectReorganizi/collectionLibrary/index.vue index 482a254..70ed23d 100644 --- a/src/views/collectReorganizi/collectionLibrary/index.vue +++ b/src/views/collectReorganizi/collectionLibrary/index.vue @@ -327,18 +327,19 @@ export default { handlePageList(isQuickFilter) { if (this.selectedCategory.arrangeType === 3) { const tablistEle = this.$refs.projectEle + tablistEle.page.page = 0 // 项目下 if (isQuickFilter) { tablistEle.$refs.collectHeaderRef.getInitArchivesClass() tablistEle.getTableDisplayFieldsLoading = true tablistEle.getViewTableList(1, null, isQuickFilter) } else { - this.$refs.projectEle.getCommonData(1) + tablistEle.getCommonData(1) } } else if (this.selectedCategory.arrangeType === 2) { const getActiveIndex = this.$refs.anjuanEle.$refs.ajContent.activeIndex const tablistEle = this.$refs.anjuanEle.$refs.ajContent.$refs.tableList - + tablistEle.page.page = 0 // 案卷下 if (isQuickFilter) { tablistEle.$refs.collectHeaderRef.getInitArchivesClass() @@ -359,6 +360,7 @@ export default { } } else if (this.selectedCategory.arrangeType === 1) { const tablistEle = this.$refs.anjuanEle.$refs.ajContent.$refs.tableList + tablistEle.page.page = 0 // 文件下 if (isQuickFilter) { tablistEle.$refs.collectHeaderRef.getInitArchivesClass() diff --git a/src/views/components/category/PreviewForm.vue b/src/views/components/category/PreviewForm.vue index 8cff5e6..0791c6b 100644 --- a/src/views/components/category/PreviewForm.vue +++ b/src/views/components/category/PreviewForm.vue @@ -274,7 +274,7 @@ export default { delete node.childArchivesClass } return { - id: node.name, + id: node.code, label: node.name, children: node.childArchivesClass } @@ -326,13 +326,13 @@ export default { }) return data }, - getClassfiyNode(list, name) { + getClassfiyNode(list, code) { let data; (list || []).map(item => { - if (item.name === name) { + if (item.code === code) { data = [item] } else { - const child = this.getClassfiyNode(item.childArchivesClass, name) + const child = this.getClassfiyNode(item.childArchivesClass, code) if (child) { data = child } @@ -349,6 +349,7 @@ export default { string += '' } else { const fieldInfo = this.formPreviewData.find(element => element.fieldName === val.fieldName) + console.log('fieldInfo', fieldInfo) if (fieldInfo.isInputClass === 'select' || fieldInfo.isInputClass === 'popover') { if (fieldInfo.mateData === 3) { await FetchSonDictionaryList({ 'pid': fieldInfo.dictionaryId.id }).then(res => { @@ -375,6 +376,7 @@ export default { }) } if (fieldInfo.mateData === 2) { + console.log('进来了') let categoryId if (this.isDesFormType !== 'mergeFile' && this.isDesFormType !== 'arcives' && this.isDesFormType !== 'manageArcives') { categoryId = this.selectedCategory.pid @@ -382,7 +384,9 @@ export default { categoryId = this.selectedCategory.id } await FetchArchivesClassTree({ 'categoryId': categoryId }).then(res => { + console.log('res', res) const option = this.getClassfiyNode(res, this.addOrUpdateForm[val.fieldName]) + console.log('option', option) if (option) { const obj = {} obj.name = val.name @@ -682,7 +686,6 @@ export default { // if (this.isDesFormType === 'prearchiveLibrary' && this.archivesType === 'add') { // this.$set(this.addOrUpdateForm, 'fileOriginal', null) // } - this.formPreviewData.map(item => { if (item.isInputClass === 'select') { this.$set(item, 'options', []) diff --git a/src/views/system/processManage/runningProcess/index.vue b/src/views/system/processManage/runningProcess/index.vue index dac9f94..5a69acd 100644 --- a/src/views/system/processManage/runningProcess/index.vue +++ b/src/views/system/processManage/runningProcess/index.vue @@ -151,6 +151,7 @@ export default { this.$refs.processDetail.detailVisible = true this.$refs.processDetail.selectRow = row this.$refs.processDetail.activeIndex = 0 + this.$refs.processDetail.setPage.page = 0 this.$refs.processDetail.getBusinessFlowDetails() } } diff --git a/src/views/system/processManage/runningProcess/module/businessDetails/index.vue b/src/views/system/processManage/runningProcess/module/businessDetails/index.vue index 70d7838..a1dffa5 100644 --- a/src/views/system/processManage/runningProcess/module/businessDetails/index.vue +++ b/src/views/system/processManage/runningProcess/module/businessDetails/index.vue @@ -1,6 +1,6 @@ - - +
@@ -69,15 +68,20 @@ export default { isFlowableForm: { type: Boolean, default: false + }, + setPage: { + type: Object, + default: function() { + return { + total: 0, + size: 10, + page: 0 + } + } } }, data() { return { - page: { - total: 0, - size: 10, - page: 1 - }, categoryId: null, arcId: '', isTitleType: 3, @@ -119,15 +123,17 @@ export default { ] } }, + mounted() { + this.$nextTick(() => { + console.log(this.setPage) + }) + }, methods: { handleChange(id, value) { this.$emit('select-change', { id, value }) }, // table - 双击查看详情 tableDoubleClick(row) { - // this.$refs.archivesDetail.archivesInfoVisible = true - // this.$refs.archivesDetail.getDetial() - // this.$refs.archivesDetail.detailTitle = '项目详情' this.categoryId = row.categoryPid this.arcId = row.archivesId this.$nextTick(() => { @@ -145,23 +151,13 @@ export default { } }) }, - // 每页条数改变 - sizeChangeHandler(e) { - this.loading = true - this.page.size = e - this.page.page = 1 - this.params.size = e - this.params.page = 0 - // this.doQuery(this.params) - this.loading = false - }, // 当前页改变 pageChangeHandler(e) { - this.loading = true - this.page.page = e - this.params.page = e - 1 - // this.doQuery(this.params) - this.loading = false + this.$emit('page-change', e) + }, + // 每页条数改变 + sizeChangeHandler(e) { + this.$emit('size-change', e) } } } diff --git a/src/views/system/processManage/runningProcess/module/detail.vue b/src/views/system/processManage/runningProcess/module/detail.vue index d7a5ad1..619a16c 100644 --- a/src/views/system/processManage/runningProcess/module/detail.vue +++ b/src/views/system/processManage/runningProcess/module/detail.vue @@ -16,6 +16,7 @@
  • 结束时间：{{ (selectRow.endTime || selectRow.complete_time) | parseTime }}
  • 结束时间：-
    • +
    -

    业务类型：归档审批

    -

    原始位置：-

    -

    目标位置：-

    -

    赋权类型：-

    -

    起始时间：-

    -

    终止时间：-

    -

    利用目的：{{ baseInfo && baseInfo.borrowReason }}

    +

    业务类型：{{ businessTypeText }}

    +

    原始位置：{{ baseInfo && baseInfo.businessType === 1 ? '收集库' : baseInfo && baseInfo.businessType === 2 ? '管理库' : '-' }}

    +

    目标位置：{{ baseInfo && baseInfo.businessType === 1 ? '管理库' : baseInfo && baseInfo.businessType === 2 ? '收集库' : '-' }}

    + +

    起始时间：{{ baseInfo && baseInfo.giveStartTime | parseTime }}

    +

    起始时间：-

    +

    终止时间：{{ baseInfo && baseInfo.giveEndTime | parseTime }}

    +

    终止时间：-

    +

    申请缘由：{{ baseInfo && baseInfo.remarks }}

    +

    利用目的：{{ baseInfo && baseInfo.borrowReason }}

    @@ -37,24 +41,11 @@
    - +
    -
    驳回 审批 @@ -65,9 +56,13 @@