From 8f332feb8921d799a6bca2f4420ab5d60e62eb21 Mon Sep 17 00:00:00 2001 From: xuhuajiao <13476289682@163.com> Date: Tue, 9 Apr 2024 17:29:13 +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 | 22 +- src/api/system/new.js | 21 ++ .../archiveSearch/module/resultList.vue | 7 +- .../module/utilizationProcess.vue | 5 +- .../managementLibrary/mixins/index.js | 3 +- .../managementLibrary/module/handOverForm.vue | 13 +- .../openInventory/module/detail.vue | 2 +- .../collectionLibrary/mixins/index.js | 4 +- src/views/components/category/PreviewForm.vue | 2 + .../module/businessDetails/index.vue | 13 +- src/views/system/user/cart.vue | 1 + src/views/system/user/messageCenter/index.vue | 318 ++++++++++++++++-- .../system/user/messageCenter/module/list.vue | 60 ++-- src/views/system/user/processCenter/index.vue | 6 + .../system/user/processCenter/module/form.vue | 73 +++- 15 files changed, 455 insertions(+), 95 deletions(-) create mode 100644 src/api/system/new.js diff --git a/src/api/archivesManage/library.js b/src/api/archivesManage/library.js index 4f2c61d..f673e27 100644 --- a/src/api/archivesManage/library.js +++ b/src/api/archivesManage/library.js @@ -101,6 +101,24 @@ export function FetchArchivesReturnConfirm(data) { }) } +// 在线移交流程确定 +export function FetchTransferConfirm(data) { + return request({ + url: 'api/control/transferConfirm', + method: 'post', + data: data + }) +} + +// 离线移交流程确定 +export function FetchOfflineTransferConfirm(data) { + return request({ + url: 'api/control/offlineTransferConfirm', + method: 'post', + data: data + }) +} + export default { FetchInitContorlView, FetchPrintData, @@ -113,5 +131,7 @@ export default { FetchUtilizeConfirm, FetchArchivesDestructionConfirm, FetchArchivesOpenConfirm, - FetchArchivesReturnConfirm + FetchArchivesReturnConfirm, + FetchTransferConfirm, + FetchOfflineTransferConfirm } diff --git a/src/api/system/new.js b/src/api/system/new.js new file mode 100644 index 0000000..1bdecd6 --- /dev/null +++ b/src/api/system/new.js @@ -0,0 +1,21 @@ +import request from '@/utils/request' + +// 我的系统通知 +export function FetchMySystemNotice(params) { + return request({ + url: 'api/news/mySystemNotice', + method: 'get', + params + }) +} + +// 通知详情 +export function FetchInitNoticeDetails(params) { + return request({ + url: 'api/news/initNoticeDetails', + method: 'get', + params + }) +} + +export default { FetchMySystemNotice, FetchInitNoticeDetails } diff --git a/src/views/archiveUtilize/archiveSearch/module/resultList.vue b/src/views/archiveUtilize/archiveSearch/module/resultList.vue index 2aad171..a10f62c 100644 --- a/src/views/archiveUtilize/archiveSearch/module/resultList.vue +++ b/src/views/archiveUtilize/archiveSearch/module/resultList.vue @@ -483,9 +483,6 @@ export default { this.categoryId = row.categoryPid this.arcId = row.archivesId this.$nextTick(() => { - this.$refs.archivesInfo.archivesInfoVisible = true - this.$refs.archivesInfo.archivesTabIndex = 0 - this.$refs.archivesInfo.isFourTest = true if (row.categoryLevel === 2) { this.$refs.archivesInfo.isHasFile = false this.$refs.archivesInfo.detailTitle = '案卷详情' @@ -495,6 +492,9 @@ export default { this.$refs.archivesInfo.detailTitle = '文件详情' this.$refs.archivesInfo.getDetial(3, row.archivesId) } + this.$refs.archivesInfo.archivesTabIndex = 0 + this.$refs.archivesInfo.isFourTest = true + this.$refs.archivesInfo.archivesInfoVisible = true }) }, initiateLending(item) { @@ -505,6 +505,7 @@ export default { dangerouslyUseHTMLString: true }).then(() => { // this.$message({ message: '确定发起借阅', type: 'success', offset: 8 }) + console.log('item', item) this.$nextTick(() => { this.$refs.lendFormRef.detailArcData = [] this.$refs.lendFormRef.lendFormVisible = true diff --git a/src/views/archiveUtilize/utillizeRecord/module/utilizationProcess.vue b/src/views/archiveUtilize/utillizeRecord/module/utilizationProcess.vue index da92de7..f5ba9ed 100644 --- a/src/views/archiveUtilize/utillizeRecord/module/utilizationProcess.vue +++ b/src/views/archiveUtilize/utillizeRecord/module/utilizationProcess.vue @@ -60,9 +60,8 @@ @@ -169,7 +168,7 @@ export default { this.form.giveStartTime = formattedDate this.getFondsDetail() - console.log(this.detailArcData) + console.log('this.detailArcData', this.detailArcData) }, changeChecked() { this.responsive = !this.responsive diff --git a/src/views/archivesManage/managementLibrary/mixins/index.js b/src/views/archivesManage/managementLibrary/mixins/index.js index 4ed4317..bc2f173 100644 --- a/src/views/archivesManage/managementLibrary/mixins/index.js +++ b/src/views/archivesManage/managementLibrary/mixins/index.js @@ -111,12 +111,13 @@ export const manageLibraryCrud = { }, getViewTableList(categoryLevel, parentsId, type) { // console.log('888', this.smartQuery.fonds_no) + console.log('this.page.page', this.page.page) const params = { 'parentId': parentsId, 'categoryId': this.selectedCategory.id, 'categoryLevel': categoryLevel, 'ignore': false, - 'isdel': (this.parentsData.isdel && categoryLevel === 3) ? false : this.parentsData.isdel, + 'isdel': (this.parentsData.isdel && this.selectedCategory.arrangeType === 2 && categoryLevel === 3) ? false : this.parentsData.isdel, 'checkTypes': this.selectStatus && this.selectStatus.length !== 0 ? this.selectStatus.join(',') : null, 'search': this.query.search, 'retention': this.smartQuery.retention, diff --git a/src/views/archivesManage/managementLibrary/module/handOverForm.vue b/src/views/archivesManage/managementLibrary/module/handOverForm.vue index 607559f..55cd7e8 100644 --- a/src/views/archivesManage/managementLibrary/module/handOverForm.vue +++ b/src/views/archivesManage/managementLibrary/module/handOverForm.vue @@ -6,7 +6,7 @@
  • 流程表单
  • 流程图
    • -
    +
    @@ -24,9 +24,9 @@ - +
    -
    +
    @@ -43,11 +43,10 @@ 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' export default { name: 'HandOverForm', - components: { ArchivesListModule }, + components: { }, props: { selectedCategory: { type: Object, @@ -127,10 +126,8 @@ export default { changeActiveTab(data) { this.activeIndex = data if (this.activeIndex === 0) { - console.log('流程表单') + this.$refs.archivesListModule.getViewTable() } else if (this.activeIndex === 1) { - console.log(this.overType) - console.log(this.modelOptions) // 2 退回 3 开放 4 销毁 7 离线 let procdefId if (this.overType === 2) { diff --git a/src/views/archivesManage/openInventory/module/detail.vue b/src/views/archivesManage/openInventory/module/detail.vue index 93f9804..676d808 100644 --- a/src/views/archivesManage/openInventory/module/detail.vue +++ b/src/views/archivesManage/openInventory/module/detail.vue @@ -104,7 +104,7 @@ export default { if (res.code !== 500) { console.log(res) this.baseInfo = res.businessFlow - this.tableData = res.details + this.tableData = res.details.content } else { this.$message({ message: '获取数据失败', type: 'error', offset: 8 }) } diff --git a/src/views/collectReorganizi/collectionLibrary/mixins/index.js b/src/views/collectReorganizi/collectionLibrary/mixins/index.js index e9004dc..e2e6a71 100644 --- a/src/views/collectReorganizi/collectionLibrary/mixins/index.js +++ b/src/views/collectReorganizi/collectionLibrary/mixins/index.js @@ -113,7 +113,7 @@ export const collectionLibraryCrud = { 'categoryId': this.selectedCategory.id, 'categoryLevel': categoryLevel, 'ignore': false, - 'isdel': (this.parentsData.isdel && categoryLevel === 3) ? false : this.parentsData.isdel, + 'isdel': (this.parentsData.isdel && this.selectedCategory.arrangeType === 2 && categoryLevel === 3) ? false : this.parentsData.isdel, 'search': this.query.search, 'retention': this.smartQuery.retention, 'security_class': this.smartQuery.security_class, @@ -124,7 +124,7 @@ export const collectionLibraryCrud = { 'fonds_no': this.smartQuery.fonds_no, 'project_class': this.query.project_class, 'archive_ctg_no': this.query.archive_ctg_no, - 'page': this.page.page - 1, + 'page': this.page.page === 0 ? 0 : this.page.page - 1, 'size': this.page.size, 'sort': this.arrySort } diff --git a/src/views/components/category/PreviewForm.vue b/src/views/components/category/PreviewForm.vue index 0791c6b..9b316f5 100644 --- a/src/views/components/category/PreviewForm.vue +++ b/src/views/components/category/PreviewForm.vue @@ -34,6 +34,8 @@ :style="{ width: item.editLength+'px'}" :disabled="isDisabled || (item.fieldName === 'archival_category_code')" :validate-event="!isDisabled" + @mousewheel.native.prevent + @DOMMouseScroll.native.prevent @keyup.enter.native="isRepeatHandle(item)" @input="autoAddZero(item.isFilling, item.fieldName, addOrUpdateForm[item.fieldName], item.fillingDigit)" @blur="isRepeatHandle(item)" diff --git a/src/views/system/processManage/runningProcess/module/businessDetails/index.vue b/src/views/system/processManage/runningProcess/module/businessDetails/index.vue index a1dffa5..b594021 100644 --- a/src/views/system/processManage/runningProcess/module/businessDetails/index.vue +++ b/src/views/system/processManage/runningProcess/module/businessDetails/index.vue @@ -18,7 +18,7 @@ - + diff --git a/src/views/system/user/messageCenter/module/list.vue b/src/views/system/user/messageCenter/module/list.vue index 3a75b4f..42049c1 100644 --- a/src/views/system/user/messageCenter/module/list.vue +++ b/src/views/system/user/messageCenter/module/list.vue @@ -1,16 +1,16 @@