From 14d1e0344afa814b9898865ab92defb60197f363 Mon Sep 17 00:00:00 2001 From: xuhuajiao <13476289682@163.com> Date: Fri, 5 Jan 2024 18:20:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E9=9B=86=E5=BA=93-=E7=A7=BB=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/styles/archives-manage.scss | 6 +- .../archiveEditing/module/detail.vue | 5 +- .../archiveEditing/module/material.vue | 2 +- .../archiveEditing/module/onlineEditing.vue | 186 ++++++++++++++++++ .../managementLibrary/anjuan/tableList.vue | 5 + .../managementLibrary/file/index.vue | 1 + .../managementLibrary/juannei/index.vue | 3 +- .../managementLibrary/project/index.vue | 3 +- .../collectionLibrary/anjuan/tableList.vue | 6 + .../collectionLibrary/file/index.vue | 1 + .../collectionLibrary/juannei/index.vue | 1 + .../collectionLibrary/mixins/index.js | 10 +- .../module/collectHeader.vue | 2 +- .../module/collectMoveFile/index.vue | 132 +++++++++++-- .../collectionLibrary/project/index.vue | 1 + 15 files changed, 334 insertions(+), 30 deletions(-) diff --git a/src/assets/styles/archives-manage.scss b/src/assets/styles/archives-manage.scss index 333916e..739c727 100644 --- a/src/assets/styles/archives-manage.scss +++ b/src/assets/styles/archives-manage.scss @@ -464,9 +464,9 @@ .el-button.is-disabled, .el-button.is-disabled:hover, .el-button.is-disabled:focus{ - background-color: #02255F; - color: #13439E; - border-color: #02255F; + color: #b4c8fb; + border-color: #b4c8fb; + background-color: #f2f5fe; } } diff --git a/src/views/archiveUtilize/archiveEditing/module/detail.vue b/src/views/archiveUtilize/archiveEditing/module/detail.vue index 362f6f1..7f4c8a0 100644 --- a/src/views/archiveUtilize/archiveEditing/module/detail.vue +++ b/src/views/archiveUtilize/archiveEditing/module/detail.vue @@ -61,7 +61,7 @@
- 在线编研 +
@@ -73,9 +73,10 @@ + + diff --git a/src/views/archivesManage/managementLibrary/anjuan/tableList.vue b/src/views/archivesManage/managementLibrary/anjuan/tableList.vue index 9e25567..81d092a 100644 --- a/src/views/archivesManage/managementLibrary/anjuan/tableList.vue +++ b/src/views/archivesManage/managementLibrary/anjuan/tableList.vue @@ -9,6 +9,7 @@ :data="anjuanData" highlight-current-row style="width: 100%;" + height="calc(100vh - 352px)" :row-class-name="tableRowClassName" :row-key="rowKey" @select-all="selectAll" @@ -246,6 +247,8 @@ export default { this.page.page = 1 if (this.selectedCategory.arrangeType === 3) { this.getViewTable(2, this.parentsData.parentsProjectId) + } else if (this.selectedCategory.arrangeType === 1) { + this.getViewTable(3, null) } else { this.getViewTable(2, null) } @@ -254,6 +257,8 @@ export default { this.page.page = val if (this.selectedCategory.arrangeType === 3) { this.getViewTable(2, this.parentsData.parentsProjectId) + } else if (this.selectedCategory.arrangeType === 1) { + this.getViewTable(3, null) } else { this.getViewTable(2, null) } diff --git a/src/views/archivesManage/managementLibrary/file/index.vue b/src/views/archivesManage/managementLibrary/file/index.vue index 05853d1..253798f 100644 --- a/src/views/archivesManage/managementLibrary/file/index.vue +++ b/src/views/archivesManage/managementLibrary/file/index.vue @@ -20,6 +20,7 @@ :data="fileData" highlight-current-row style="width: 100%;" + height="calc(100vh - 352px)" :row-class-name="tableRowClassName" :row-key="rowKey" @select-all="selectAll" diff --git a/src/views/archivesManage/managementLibrary/juannei/index.vue b/src/views/archivesManage/managementLibrary/juannei/index.vue index d333f0f..69d31c2 100644 --- a/src/views/archivesManage/managementLibrary/juannei/index.vue +++ b/src/views/archivesManage/managementLibrary/juannei/index.vue @@ -18,6 +18,7 @@ :data="junneiData" highlight-current-row style="width: 100%;" + height="calc(100vh - 352px)" :row-class-name="tableRowClassName" :row-key="rowKey" @select-all="selectAll" @@ -152,7 +153,7 @@ export default { selectedCategory: function(newValue, oldValue) { }, tableDisplayFields(val) { - // this.doLayout() + this.doLayout() } }, created() { diff --git a/src/views/archivesManage/managementLibrary/project/index.vue b/src/views/archivesManage/managementLibrary/project/index.vue index a2faf9d..aeb2820 100644 --- a/src/views/archivesManage/managementLibrary/project/index.vue +++ b/src/views/archivesManage/managementLibrary/project/index.vue @@ -10,6 +10,7 @@ :data="projectData" highlight-current-row style="width: 100%;" + height="calc(100vh - 352px)" :row-key="rowKey" :row-class-name="tableRowClassName" @select-all="selectAll" @@ -110,7 +111,7 @@ export default { selectedCategory: function(newValue, oldValue) { }, tableDisplayFields(val) { - // this.doLayout() + this.doLayout() } }, created() { diff --git a/src/views/collectReorganizi/collectionLibrary/anjuan/tableList.vue b/src/views/collectReorganizi/collectionLibrary/anjuan/tableList.vue index 01610cf..3f7966e 100644 --- a/src/views/collectReorganizi/collectionLibrary/anjuan/tableList.vue +++ b/src/views/collectReorganizi/collectionLibrary/anjuan/tableList.vue @@ -9,6 +9,7 @@ :data="anjuanData" highlight-current-row style="width: 100%;" + height="calc(100vh - 418px)" :row-class-name="tableRowClassName" :row-key="rowKey" @select-all="selectAll" @@ -243,6 +244,7 @@ export default { handleSizeChange(size) { this.page.size = size this.page.page = 1 + console.log('this.activeIndex', this.activeIndex) if (this.activeIndex === 1) { // if (this.selectedCategory.arrangeType === 3) { // this.getViewTable(3, this.parentsData.parentsProjectId) @@ -253,6 +255,8 @@ export default { } else { if (this.selectedCategory.arrangeType === 3) { this.getViewTable(2, this.parentsData.parentsProjectId) + } else if (this.selectedCategory.arrangeType === 1) { + this.getViewTable(3, null) } else { this.getViewTable(2, null) } @@ -270,6 +274,8 @@ export default { } else { if (this.selectedCategory.arrangeType === 3) { this.getViewTable(2, this.parentsData.parentsProjectId) + } else if (this.selectedCategory.arrangeType === 1) { + this.getViewTable(3, null) } else { this.getViewTable(2, null) } diff --git a/src/views/collectReorganizi/collectionLibrary/file/index.vue b/src/views/collectReorganizi/collectionLibrary/file/index.vue index 4510ba0..c7d05fe 100644 --- a/src/views/collectReorganizi/collectionLibrary/file/index.vue +++ b/src/views/collectReorganizi/collectionLibrary/file/index.vue @@ -19,6 +19,7 @@ :data="fileData" highlight-current-row style="width: 100%;" + height="calc(100vh - 418px)" :row-class-name="tableRowClassName" :row-key="rowKey" @select-all="selectAll" diff --git a/src/views/collectReorganizi/collectionLibrary/juannei/index.vue b/src/views/collectReorganizi/collectionLibrary/juannei/index.vue index cffec3f..caa8048 100644 --- a/src/views/collectReorganizi/collectionLibrary/juannei/index.vue +++ b/src/views/collectReorganizi/collectionLibrary/juannei/index.vue @@ -17,6 +17,7 @@ :data="junneiData" highlight-current-row style="width: 100%;" + height="calc(100vh - 418px)" :row-class-name="tableRowClassName" :row-key="rowKey" @select-all="selectAll" diff --git a/src/views/collectReorganizi/collectionLibrary/mixins/index.js b/src/views/collectReorganizi/collectionLibrary/mixins/index.js index a8c13ee..a4bd728 100644 --- a/src/views/collectReorganizi/collectionLibrary/mixins/index.js +++ b/src/views/collectReorganizi/collectionLibrary/mixins/index.js @@ -67,14 +67,22 @@ export const collectionLibraryCrud = { this.$parent.$parent.getTableDisplayFieldsLoading = true this.parentsId = this.parentsData.parentsAnjuanId } else if (this.isTitleType === 6) { - console.log('isTitleType', this.isTitleType) + console.log('isTitleTypehh', this.isTitleType) // 原文 if (this.selectedCategory.arrangeType === 1) { this.parentsId = this.parentsData.parentsAnjuanId + console.log('this.parentsId1', this.parentsId) this.$parent.getTableDisplayFieldsLoading = true } else { this.$parent.$parent.getTableDisplayFieldsLoading = true + console.log('this.parentsData', this.parentsData) + console.log('this.activeIndex', this.activeIndex) + console.log('this.selectedCategory.arrangeType', this.selectedCategory.arrangeType) + console.log('this.parentsData.parentsAnjuanId', this.parentsData.parentsAnjuanId) + console.log('this.parentsData.parentsJuanneiId', this.parentsData.parentsJuanneiId) + console.log('this.categoryLevel', categoryLevel) this.parentsId = this.parentsData.parentsJuanneiId + console.log('this.parentsId2', this.parentsId) } } diff --git a/src/views/collectReorganizi/collectionLibrary/module/collectHeader.vue b/src/views/collectReorganizi/collectionLibrary/module/collectHeader.vue index 8ce71c3..b5a52a1 100644 --- a/src/views/collectReorganizi/collectionLibrary/module/collectHeader.vue +++ b/src/views/collectReorganizi/collectionLibrary/module/collectHeader.vue @@ -497,7 +497,6 @@ export default { this.arcId = null } else if (type === 'edit') { console.log(this.selections) - this.arcId = this.selections[0].id if (this.selections.length === 0) { this.$message('您还未勾选需要操作的条目,请先确认!') return false @@ -505,6 +504,7 @@ export default { this.$message('编辑操作只可勾选唯一目标条目,请先确认!') return false } + this.arcId = this.selections[0].id this.formTitle = '编辑' + this.collectTitle } // this.form.dictionaryConfigId = {} diff --git a/src/views/collectReorganizi/collectionLibrary/module/collectMoveFile/index.vue b/src/views/collectReorganizi/collectionLibrary/module/collectMoveFile/index.vue index 0a24b43..306a668 100644 --- a/src/views/collectReorganizi/collectionLibrary/module/collectMoveFile/index.vue +++ b/src/views/collectReorganizi/collectionLibrary/module/collectMoveFile/index.vue @@ -1,16 +1,24 @@ @@ -118,7 +126,8 @@ export default { total: 0 }, moveFile: true, - isReserve: false + isReserve: false, + tabIndex: 0 } }, mounted() { @@ -134,17 +143,31 @@ export default { handleNodeClick(data) { if (data) { this.currentCategory = data - this.getViewTable() + if (this.currentCategory.isType !== 1) { + this.getViewTable() + } else { + this.tableDisplayFields = [] + this.tableData = [] + } } }, + open() { + this.handleNodeClick() + this.getViewTable() + }, getViewTable() { this.loading = true this.tableDisplayFields = [] - console.log('this.collectLevel', this.currentCategory.arrangeType) if (this.currentCategory.arrangeType === 1) { this.currentLevel = 3 - } else { + } else if (this.currentCategory.arrangeType === 2) { this.currentLevel = 2 + } else { + if (this.tabIndex === 1) { + this.currentLevel = 2 + } else { + this.currentLevel = 1 + } } FetchInitCategoryViewTable({ categoryId: this.currentCategory.id, categoryLevel: this.currentLevel }).then((res) => { if (res) { @@ -182,16 +205,25 @@ export default { this.loading = false }) }, + changeActiveTab(data) { + this.tabIndex = data + this.getViewTable() + this.moveSelections = [] + }, clickRowHandler(row) { this.moveSelections = [] this.$refs.table.clearSelection() this.$refs.table.toggleRowSelection(row) - this.moveSelections.push(row) + // this.moveSelections.push(row) }, selectionChangeHandler(selection, row) { this.moveSelections = selection }, handleComfireCollectMoveFile() { + console.log('this.collectLevel', this.collectLevel) + console.log('this.selectedCategory', this.selectedCategory) + console.log('this.selections', this.selections) + console.log(this.moveSelections) if (this.moveSelections.length > 1) { this.$message('该操作只可勾选唯一目标条目,请先确认!') return false @@ -201,7 +233,24 @@ export default { } else if (this.currentCategory.arrangeType === 2) { this.toCategoryLevel = 2 } else { - this.toCategoryLevel = 1 + console.log(this.collectLevel) + if (this.collectLevel === 3) { + if (this.moveSelections.length === 0) { + this.toCategoryLevel = 3 + } else { + if (this.tabIndex === 1) { + this.toCategoryLevel = 2 + } else { + this.toCategoryLevel = 3 + } + } + } else { + if (this.tabIndex === 1) { + this.toCategoryLevel = 2 + } else { + this.toCategoryLevel = 1 + } + } } if (this.collectLevel === 2) { if (this.toCategoryLevel === 3) { @@ -209,16 +258,39 @@ export default { return false } } + if (this.selectedCategory.id === this.currentCategory.id) { + this.$message('正在移动的档案只可移动到其他位置,不可选择本身!') + return false + } const archivesIds = this.selections.map(item => item.id) - const toArchivesIds = this.moveSelections.map(item => item.id) + // const toArchivesIds = this.moveSelections.map(item => item.id) + let toArchivesId + if (this.moveSelections.length === 0) { + toArchivesId = null + } else { + if (this.collectLevel === 3) { + console.log('this.tabIndex66', this.tabIndex) + if (this.tabIndex === 1) { + toArchivesId = this.moveSelections[0].id + } else { + if (this.selectedCategory.arrangeType === 1) { + toArchivesId = this.moveSelections[0].id + } else { + toArchivesId = null + } + } + } else { + toArchivesId = this.moveSelections[0].id + } + } const params = { - 'isReserve': this.isReserve, // 是否保留原条目 - 'categoryId': this.selectedCategory.id, // 门类id - 'categoryLevel': this.collectLevel, // 门类级别 + 'reserve': this.isReserve, // 是否保留原条目 true 保留 false 删除 + 'categoryId': this.selectedCategory.id, // 需要移动的门类总id + 'categoryLevel': this.collectLevel, // 需要移动的门类级别 + 'archivesIds': archivesIds, // 需要移动的档案id集合 'toCategoryId': this.currentCategory.id, // 移动到的门类id 'toCategoryLevel': this.toCategoryLevel, // 移动到的门类级别 - 'archivesIds': archivesIds, // 移动的档案id - 'toArchivesIds': toArchivesIds // 移动到的档案id (选填) + 'toArchivesId': toArchivesId // 移动到的档案id (选填) } console.log(params) FetchMove(params).then((res) => { @@ -229,7 +301,7 @@ export default { } else { this.$message.error('移动失败') } - this.collectMoveFileVisible = false + this.handleCloseDialog() }) }, handleSizeChange(size) { @@ -249,6 +321,7 @@ export default { this.$refs.table.clearSelection() this.moveSelections = [] this.collectMoveFileVisible = false + this.isReserve = false // 关闭弹框 // done() } @@ -288,8 +361,10 @@ export default { width: 579px; border-left: 1px solid #E6E8ED; .head-search{ - padding: 20px 20px 0 0; + // padding: 0 20px 0 0; + flex: 1; justify-content: flex-end; + margin-bottom: 0; } .table-list{ height: 440px; @@ -324,6 +399,23 @@ export default { } } } + +.collectMove-header{ + display: flex; + justify-content: space-between; + align-items: center; + padding: 20px 20px 20px 0; + .detail-tab .tab-nav{ + margin: 0; + border-bottom: none; + } + .detail-tab .tab-nav li{ + margin-right: 20px; + } + .detail-tab .tab-nav li.active-tab-nav{ + padding-bottom: 0; + } +} .dialog-footer{ margin-top: 20px; } diff --git a/src/views/collectReorganizi/collectionLibrary/project/index.vue b/src/views/collectReorganizi/collectionLibrary/project/index.vue index d8bc2c6..aaf4b34 100644 --- a/src/views/collectReorganizi/collectionLibrary/project/index.vue +++ b/src/views/collectReorganizi/collectionLibrary/project/index.vue @@ -10,6 +10,7 @@ :data="projectData" highlight-current-row style="width: 100%;" + height="calc(100vh - 418px)" :row-key="rowKey" :row-class-name="tableRowClassName" @select-all="selectAll"