diff --git a/.env.development b/.env.development index 5811bec..dde0f37 100644 --- a/.env.development +++ b/.env.development @@ -3,8 +3,8 @@ ENV = 'development' # 接口地址 # 许镇-本地服地址 -# VUE_APP_BASE_API = 'http://192.168.99.72:13000' -VUE_APP_BASE_API = 'http://192.168.99.67:13000' +VUE_APP_BASE_API = 'http://192.168.99.72:13000' +# VUE_APP_BASE_API = 'http://192.168.99.67:13000' VUE_APP_AIDEEPSEEK_API = 'http://192.168.99.86:12123' VUE_APP_PROCESSMODEL_API = 'http://192.168.99.72:11200' VUE_APP_SDEVID = "D002" diff --git a/src/api/system/documentArchives.js b/src/api/system/documentArchives.js index 6787348..85e9297 100644 --- a/src/api/system/documentArchives.js +++ b/src/api/system/documentArchives.js @@ -252,6 +252,14 @@ export function FetchAnnualStatisticsByMonth(params) { }) } +// 馆藏传阅统计 +export function FetchAnnualStatisticsByBorrow(params) { + return request({ + url: 'api/documentArchives/annualStatisticsByBorrow' + '?' + qs.stringify(params, { indices: false }), + method: 'get' + }) +} + // 读取公文标签 export function FetchReadGW(params) { return request({ @@ -311,6 +319,24 @@ export function FetchLend(data) { }) } +// 归还 +export function FetchDocumentReturn(data) { + return request({ + url: 'api/borrow/documentReturn', + method: 'post', + data + }) +} + +// 阅读者密码初始化 +export function FetchBorrowerPassInit(data) { + return request({ + url: 'api/documentArchives/borrowerPassInit', + method: 'post', + data + }) +} + export default { FetchInitDocumentParam, updateDocumentParam, @@ -340,11 +366,14 @@ export default { FetchFindGroupType, FetchAnnualStatistics, FetchAnnualStatisticsByMonth, + FetchAnnualStatisticsByBorrow, FetchReadGW, FetchReadPatron, FetchBindReadNo, FetchUnbindReadNo, FetchDownloadBorrower, FetchArchivesDetailsBorrowLog, - FetchLend + FetchLend, + FetchDocumentReturn, + FetchBorrowerPassInit } diff --git a/src/views/archivesMIOD/miodLibrary/index.vue b/src/views/archivesMIOD/miodLibrary/index.vue index 2928db0..f330153 100644 --- a/src/views/archivesMIOD/miodLibrary/index.vue +++ b/src/views/archivesMIOD/miodLibrary/index.vue @@ -304,7 +304,7 @@ export default { this.crud.query.docDepartment = this.selectedDocument.label this.crud.query.archiveYear = null } else if (this.selectedDocument.isType === 4) { - this.crud.query.docDepartment = null + this.crud.query.docDepartment = this.selectedDocument.dictionaryName this.crud.query.archiveYear = this.selectedDocument.label } else { this.search = '' diff --git a/src/views/archivesMIOD/miodLibrary/module/detail.vue b/src/views/archivesMIOD/miodLibrary/module/detail.vue index 06d4bff..3832a54 100644 --- a/src/views/archivesMIOD/miodLibrary/module/detail.vue +++ b/src/views/archivesMIOD/miodLibrary/module/detail.vue @@ -33,9 +33,11 @@

文件列表

- - - +
+ + + +
未绑定 - + @@ -686,6 +704,7 @@ export default { const params = { documentId: documentId, archivesId: datas.id, // this.currentArchivesId, + parentsId: datas.parents_id, regNo: datas.reg_no, isDestroy: true, tid: datas.tid ? datas.tid : null // 标签读取的id @@ -733,11 +752,6 @@ export default { }) }, handleComfireDepts() { - // if (this.miodDeptsSelections.length === 0) { - // this.$message.warning('请选择部门/人员') - // return - // } - // this.miodDeptsTags = [...this.miodDeptsSelections] if (this.singleSelectedDept !== null) { const param = { 'borrowDocumentTid': this.currentLendData.reg_no, @@ -746,12 +760,12 @@ export default { console.log('param', param) FetchLend(param).then((res) => { console.log('resLend', res) - if (res.code !== -1) { + if (res.code !== '-1') { this.$message({ message: res.msg, type: 'success', offset: 8 }) - this.getInitDocumentDetailsList() } else { this.$message({ message: res.msg, type: 'error', offset: 8 }) } + this.getInitDocumentDetailsList() this.deptsVisible = false this.$set(this.lendBtnLoading, this.currentLendData.id, false) }).catch(error => { @@ -864,4 +878,5 @@ export default { color: #545B65; } } + diff --git a/src/views/archivesMIOD/miodLibrary/treeList.vue b/src/views/archivesMIOD/miodLibrary/treeList.vue index 55e2149..454188b 100644 --- a/src/views/archivesMIOD/miodLibrary/treeList.vue +++ b/src/views/archivesMIOD/miodLibrary/treeList.vue @@ -69,8 +69,6 @@ export default { }, methods: { refreshData() { - console.log('refreshTreeList', this.currentTreeVal) - // 保存当前选中节点信息用于刷新后重新选中 if (this.currentTreeVal) { this.nodeToSelect = { @@ -115,13 +113,12 @@ export default { documentId: child.id, dictionaryName: department.dictionaryName, label: year, - id: year, + id: year + department.dictionaryName, isType: 4 })) })) })) })) - console.log(' this.crud.data', this.crud.data) // 初始化默认找到第一个document节点选中 // this.$nextTick(() => { // const defaultSelectedNode = this.findFirstIsType2Node(this.crud.data) @@ -137,7 +134,6 @@ export default { // 如果有需要选中的节点信息 console.log('this.nodeToSelect', this.nodeToSelect) if (this.nodeToSelect) { - console.log('this.nodeToSelect.isType', this.nodeToSelect.isType) switch (this.nodeToSelect.isType) { case 4: // 年份节点 targetNode = this.findNodeByDocumentIdAndDictionaryName( @@ -172,11 +168,14 @@ export default { // 如果没有找到目标节点或者没有需要选中的节点，则选择第一个文档节点 if (!targetNode) { + console.log('2222') targetNode = this.findFirstIsType2Node(this.crud.data) } // 如果找到了目标节点，则选中它 if (targetNode) { + console.log('111') + console.log(targetNode.id) this.$refs.tree.setCurrentKey(targetNode.id) this.handleNodeClick(targetNode) } diff --git a/src/views/archivesMIOD/miodRecord/index.vue b/src/views/archivesMIOD/miodRecord/index.vue index f0b73d4..b934356 100644 --- a/src/views/archivesMIOD/miodRecord/index.vue +++ b/src/views/archivesMIOD/miodRecord/index.vue @@ -48,7 +48,7 @@ @cell-dblclick="tableDoubleClick" > - +