From 945a46653f0224614856dbf3ca2bfa763a2bc7eb Mon Sep 17 00:00:00 2001 From: xuhuajiao <13476289682@163.com> Date: Fri, 26 Aug 2022 17:35:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A1=A3=E6=A1=88=E7=AE=A1=E7=90=86=E9=80=89?= =?UTF-8?q?=E4=B8=AD=E7=8A=B6=E6=80=81=E4=BF=9D=E6=8C=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/styles/yxk-admin.scss | 8 +- .../archivesList/archivesAnjuan/index.vue | 10 +- .../archivesList/archivesJuannei/index.vue | 8 +- .../archivesList/archivesProject/index.vue | 10 +- .../archivesManage/archivesList/index.vue | 156 +++++++++++++++--- .../archivesList/mixins/archives.js | 23 ++- .../module/deltArchives/index.vue | 10 ++ .../category/descriptionPreview/index.vue | 7 +- src/views/components/category/PreviewForm.vue | 15 +- 9 files changed, 204 insertions(+), 43 deletions(-) diff --git a/src/assets/styles/yxk-admin.scss b/src/assets/styles/yxk-admin.scss index 9b8a3bc..fd9533d 100644 --- a/src/assets/styles/yxk-admin.scss +++ b/src/assets/styles/yxk-admin.scss @@ -1216,10 +1216,10 @@ input[type='number'] { } // table 选中状态 -// .el-table__body .rowStyle>td { -// color: #fff !important; -// background-color: #13439E !important; -// } +.el-table__body .rowStyle>td { + color: #fff !important; + background-color: #13439E !important; +} // 数据为空 .empty-main{ diff --git a/src/views/archivesManage/archivesList/archivesAnjuan/index.vue b/src/views/archivesManage/archivesList/archivesAnjuan/index.vue index 2ef339c..31b0dff 100644 --- a/src/views/archivesManage/archivesList/archivesAnjuan/index.vue +++ b/src/views/archivesManage/archivesList/archivesAnjuan/index.vue @@ -56,7 +56,7 @@
- +
保存 @@ -77,13 +77,15 @@ highlight-current-row style="width: 100%;" :height="anjuanTableHeight" + :row-class-name="tableRowClassName" + :row-key="rowKey" @select-all="selectAll" @selection-change="crud.selectionChangeHandler" @row-click="clickRowHandler" @cell-dblclick="tableDoubleClick" @select="handleCurrentChange" > - + @@ -158,7 +160,7 @@ - + @@ -310,6 +312,7 @@ export default { handleSizeChange(size) { this.page.size = size this.page.page = 1 + this.getListCommon('anjuanData', 'anjuanTableHeight', 1) }, // list @@ -345,6 +348,7 @@ export default { this.selections = val this.isAnjuan = val.length !== 1 this.$emit('getJnInAjBtnState', this.isAnjuan) + this.$emit('getSelections', val, this.selections) }, // table - 双击查看详情 tableDoubleClick(row) { diff --git a/src/views/archivesManage/archivesList/archivesJuannei/index.vue b/src/views/archivesManage/archivesList/archivesJuannei/index.vue index c73658e..80fe391 100644 --- a/src/views/archivesManage/archivesList/archivesJuannei/index.vue +++ b/src/views/archivesManage/archivesList/archivesJuannei/index.vue @@ -41,7 +41,7 @@
- +
保存 @@ -61,13 +61,15 @@ highlight-current-row style="width: 100%;" :height="juanneiTableHeight" + :row-class-name="tableRowClassName" + :row-key="rowKey" @select-all="selectAll" @selection-change="crud.selectionChangeHandler" @row-click="clickRowHandler" @cell-dblclick="tableDoubleClick" @select="handleCurrentChange" > - + @@ -116,7 +118,7 @@ - + diff --git a/src/views/archivesManage/archivesList/archivesProject/index.vue b/src/views/archivesManage/archivesList/archivesProject/index.vue index 6a2fbfc..7ba0441 100644 --- a/src/views/archivesManage/archivesList/archivesProject/index.vue +++ b/src/views/archivesManage/archivesList/archivesProject/index.vue @@ -37,7 +37,7 @@
- +
保存 @@ -58,13 +58,15 @@ highlight-current-row style="width: 100%;" :height="projectTableHeight" + :row-key="rowKey" + :row-class-name="tableRowClassName" @select-all="selectAll" @selection-change="crud.selectionChangeHandler" @row-click="clickRowHandler" @cell-dblclick="tableDoubleClick" @select="handleCurrentChange" > - + @@ -100,7 +102,7 @@ - +
@@ -196,6 +198,8 @@ export default { this.selections = val this.isProject = val.length !== 1 this.$emit('getAjInProjectBtnState', this.isProject) + console.log('pr', this.selections) + this.$emit('getProjectSelections', val, this.selections) }, // table - 双击查看详情 tableDoubleClick(row) { diff --git a/src/views/archivesManage/archivesList/index.vue b/src/views/archivesManage/archivesList/index.vue index 157469c..28ff8c4 100644 --- a/src/views/archivesManage/archivesList/index.vue +++ b/src/views/archivesManage/archivesList/index.vue @@ -72,6 +72,7 @@ import archivesAnjuan from './archivesAnjuan/index' import archivesJuannei from './archivesJuannei/index' import crudCategory from '@/api/category/category' import CRUD, { presenter } from '@crud/crud' +import { archivesCrud } from './mixins/archives' export default { name: 'ArchivesList', @@ -89,7 +90,7 @@ export default { recycleMain: this } }, - mixins: [presenter()], + mixins: [presenter(), archivesCrud], props: { isdel: { type: Boolean, @@ -126,7 +127,8 @@ export default { 'securityClass': null, 'organizationMatter': null }, - treeCurrentNode: null + treeCurrentNode: null, + nodeClick: false } }, watch: { @@ -196,8 +198,33 @@ export default { if (this.$refs.archivesTree.getNode(selectedKey) && this.$refs.archivesTree.getNode(selectedKey).parent) { this.expandParents(this.$refs.archivesTree.getNode(selectedKey).parent) } + + // 删除刷新 + if (localStorage.getItem('isDelt') === '1') { + if (this.$refs.project) { + this.$refs.project.$refs.table.clearSelection() + } + this.clearAnjuan() + this.clearFile() + } else if (localStorage.getItem('isDelt') === '2') { + if (this.$refs.project) { + this.$refs.project.selections = this.$refs.project.$refs.table.selection + } + if (this.$refs.anjuan) { + this.$refs.anjuan.$refs.table.clearSelection() + } + this.clearFile() + } else if (localStorage.getItem('isDelt') === '3') { + if (this.$refs.anjuan) { + this.$refs.anjuan.selections = this.$refs.anjuan.$refs.table.selection + } + if (this.$refs.file) { + this.$refs.file.$refs.table.clearSelection() + } + } // 选中节点的门类详情 this.handleNodeClick(selectedKey) + localStorage.removeItem('noClick') }) } this.getIntellClassify() @@ -211,9 +238,14 @@ export default { } }) }, - // 选中字典后，设置字典详情数据 + // 选中门类后，设置字典详情数据 handleNodeClick(val) { if (val) { + if (localStorage.getItem('isForm')) { + localStorage.removeItem('noClick') + } else { + localStorage.setItem('noClick', true) + } // 初始化智能分类的操作 if (this.$refs.smartTree) { this.treeCurrentNode = null @@ -233,6 +265,7 @@ export default { this.crud.selectionChangeHandler([val]) this.selectedCategory = val this.handleTableList() + // 缓存当前的选中的 localStorage.setItem('currentArchivesKey', JSON.stringify(val)) } @@ -257,11 +290,11 @@ export default { this.projectSelection = {} this.$nextTick(() => { if (this.$refs.anjuan) { - this.$refs.anjuan.anjuanData = [] - this.$refs.anjuan.anjuanTableHeight = '' + this.$refs.anjuan.$refs.table.clearSelection() + this.clearAnjuan() if (this.$refs.file) { - this.$refs.file.junneiData = [] - this.$refs.file.juanneiTableHeight = '' + this.$refs.file.$refs.table.clearSelection() + this.clearFile() } } }) @@ -269,10 +302,11 @@ export default { this.projectSelection = selectData[0] this.$nextTick(() => { if (this.$refs.anjuan) { + this.$refs.anjuan.$refs.table.clearSelection() this.$refs.anjuan.getTableList() if (this.$refs.file) { - this.$refs.file.junneiData = [] - this.$refs.file.juanneiTableHeight = '' + this.$refs.file.$refs.table.clearSelection() + this.clearFile() } } }) @@ -280,10 +314,11 @@ export default { this.projectSelection = data this.$nextTick(() => { if (this.$refs.anjuan) { + this.$refs.anjuan.$refs.table.clearSelection() this.$refs.anjuan.getTableList() if (this.$refs.file) { - this.$refs.file.junneiData = [] - this.$refs.file.juanneiTableHeight = '' + this.$refs.file.$refs.table.clearSelection() + this.clearFile() } } }) @@ -302,7 +337,8 @@ export default { this.anjuanSelection = {} this.$nextTick(() => { if (this.$refs.file) { - this.$refs.file.junneiData = [] + this.$refs.file.$refs.table.clearSelection() + this.clearFile() } }) } else if (selectData && selectData.length === 1) { @@ -348,6 +384,15 @@ export default { handleIntellNodeClick(data, node, ele) { if (data) { if (node.childNodes.length === 0) { + if (this.$refs.project) { + this.$refs.project.$refs.table.clearSelection() + } + if (this.$refs.anjuan) { + this.$refs.anjuan.$refs.table.clearSelection() + } + if (this.$refs.file) { + this.$refs.file.$refs.table.clearSelection() + } const selectedKey = this.$refs.smartTree.getCurrentNode() const selectedParentVal = this.$refs.smartTree.getNode(selectedKey).parent.data.dicCode this.treeCurrentNode = ele.$el @@ -396,17 +441,23 @@ export default { // 获取档案list handleTableList() { // 门类菜单切换时案卷/卷内'新增'btn不可操作 + localStorage.removeItem('isForm') + localStorage.removeItem('isDelt') this.isProject = true this.isAnjuan = true if (this.selectedCategory.isType === 2) { this.$nextTick(() => { if (this.$refs.anjuan) { - this.$refs.anjuan.anjuanData = [] - this.$refs.anjuan.anjuanTableHeight = '' + if (localStorage.getItem('noClick')) { + this.$refs.anjuan.$refs.table.clearSelection() + } + this.clearAnjuan() } if (this.$refs.file) { - this.$refs.file.junneiData = [] - this.$refs.file.juanneiTableHeight = '' + if (localStorage.getItem('noClick')) { + this.$refs.file.$refs.table.clearSelection() + } + this.clearFile() } this.$refs.project.getTableDisplayFields(0) if (this.selectedCategory.children.length !== 0) { @@ -419,6 +470,25 @@ export default { } setTimeout(() => { this.$refs.project.getTableList() + + if (this.$refs.project.$refs.table.selection.length !== 0) { + this.$refs.project.selections = this.$refs.project.$refs.table.selection + this.$refs.anjuan.getTableList() + this.isProject = false + } else { + this.$refs.anjuan.$refs.table.clearSelection() + } + + if (this.$refs.anjuan.$refs.table.selection.length !== 0) { + this.$refs.anjuan.selections = this.$refs.anjuan.$refs.table.selection + this.$refs.file.getTableList() + this.isAnjuan = false + } else { + this.$refs.anjuan.anjuanData = [] + this.$refs.anjuan.anjuanTableHeight = '' + this.$refs.file.junneiData = [] + this.$refs.file.juanneiTableHeight = '' + } }, 200) if (!this.treeCurrentNode) { this.getYear('project') @@ -427,12 +497,17 @@ export default { } else if (this.selectedCategory.isType === 3) { this.$nextTick(() => { if (this.$refs.anjuan) { + if (localStorage.getItem('noClick')) { + this.$refs.anjuan.$refs.table.clearSelection() + } this.$refs.anjuan.anjuanData = [] this.$refs.anjuan.anjuanTableHeight = '' } if (this.$refs.file) { - this.$refs.file.junneiData = [] - this.$refs.file.juanneiTableHeight = '' + if (localStorage.getItem('noClick')) { + this.$refs.file.$refs.table.clearSelection() + } + this.clearFile() } this.$refs.anjuan.getTableDisplayFields(1) if (this.selectedCategory.children.length !== 0) { @@ -442,6 +517,17 @@ export default { } setTimeout(() => { this.$refs.anjuan.getTableList() + if (this.$refs.anjuan.$refs.table.selection.length !== 0) { + this.$refs.anjuan.selections = this.$refs.anjuan.$refs.table.selection + this.$refs.file.getTableList() + if (this.$refs.file.$refs.table.selection.length !== 0) { + this.$refs.file.selections = this.$refs.file.$refs.table.selection + } + this.isAnjuan = false + } else { + this.$refs.file.junneiData = [] + this.$refs.file.juanneiTableHeight = '' + } }, 200) if (!this.treeCurrentNode) { this.getYear('anjuan') @@ -450,8 +536,8 @@ export default { } else if (this.selectedCategory.isType === 4) { this.$nextTick(() => { if (this.$refs.file) { - this.$refs.file.junneiData = [] - this.$refs.file.juanneiTableHeight = '' + this.$refs.file.$refs.table.clearSelection() + this.clearFile() } this.$refs.file.getTableDisplayFields(2) setTimeout(() => { @@ -463,20 +549,44 @@ export default { }) } else if (this.selectedCategory.isType === 5) { this.$nextTick(() => { - if (this.$refs.anjuan) { - this.$refs.anjuan.anjuanData = [] - this.$refs.anjuan.anjuanTableHeight = '' + if (localStorage.getItem('noClick')) { + this.$refs.anjuan.$refs.table.clearSelection() } + this.clearAnjuan() this.$refs.anjuan.getTableDisplayFields(1) setTimeout(() => { this.$refs.anjuan.getTableList() + this.$refs.anjuan.selections = this.$refs.anjuan.$refs.table.selection }, 200) if (!this.treeCurrentNode) { this.getYear('anjuan') } }) } + }, + clearAnjuan() { + if (this.$refs.anjuan) { + this.$refs.anjuan.anjuanData = [] + this.$refs.anjuan.anjuanTableHeight = '' + this.$refs.anjuan.page = { + page: 1, + size: 10, + total: 0 + } + } + }, + clearFile() { + if (this.$refs.file) { + this.$refs.file.junneiData = [] + this.$refs.file.juanneiTableHeight = '' + this.$refs.file.page = { + page: 1, + size: 10, + total: 0 + } + } } + } } diff --git a/src/views/archivesManage/archivesList/mixins/archives.js b/src/views/archivesManage/archivesList/mixins/archives.js index f586ae1..3c47ee8 100644 --- a/src/views/archivesManage/archivesList/mixins/archives.js +++ b/src/views/archivesManage/archivesList/mixins/archives.js @@ -33,7 +33,8 @@ export const archivesCrud = { parentsId: null, // 父id arcId: null, // 档案ID yearGroup: [], // 智能分类 - 年度 - uploadFileVisible: false // 上传附件 + uploadFileVisible: false, // 上传附件 + isDesFormType: null } }, // 组件共用方法 @@ -42,6 +43,20 @@ export const archivesCrud = { querySelect(name, val) { this[name] = val }, + rowKey(row) { + return row.id + }, + // table选中加上选中状态 + tableRowClassName({ row, rowIndex }) { + // console.log('添加类名', row, rowIndex) + let color = '' + this.selections.forEach(item => { + if (item.id === row.id) { + color = 'rowStyle' + } + }) + return color + }, // 案卷 / 卷内 / 文件 导出 doExport(type) { this.crud.downloadLoading = true @@ -103,7 +118,11 @@ export const archivesCrud = { }, handleCurrentPage(val) { this.page.page = val + // console.log(this.$refs.table.selection) this.getTableList() + this.$nextTick(() => { + this.selections = this.$refs.table.selection + }) }, // table - list getListCommon(name, heightName, type) { @@ -234,7 +253,7 @@ export const archivesCrud = { if (type === 'edit') { this.$refs.previewForm.addOrUpdateForm = data.echo } - this.$refs.previewForm.isType = 'arcives' + this.isDesFormType = 'arcives' this.$refs.previewForm.FetchNoFormatField(this.categoryId) }) }) diff --git a/src/views/archivesManage/archivesList/module/deltArchives/index.vue b/src/views/archivesManage/archivesList/module/deltArchives/index.vue index 3f97c0f..f712c1c 100644 --- a/src/views/archivesManage/archivesList/module/deltArchives/index.vue +++ b/src/views/archivesManage/archivesList/module/deltArchives/index.vue @@ -51,6 +51,12 @@ export default { default: function() { return 0 } + }, + isDeltType: { + type: Number, + default: function() { + return 0 + } } }, inject: ['recycleMain'], @@ -65,6 +71,8 @@ export default { categoryId: function(newValue, oldValue) { }, totalSumAll: function(newValue, oldValue) { + }, + isDeltType: function(newValue, oldValue) { } }, created() { @@ -90,12 +98,14 @@ export default { this.crud.delAllLoading = false this.$message.success('删除成功!') this.crud.refresh() + localStorage.setItem('isDelt', this.isDeltType) }) } else { FetchCompletelyDelete(params).then(res => { this.crud.delAllLoading = false this.$message.success('删除成功!') this.crud.refresh() + localStorage.setItem('isDelt', this.isDeltType) }) } }, diff --git a/src/views/category/descriptionPreview/index.vue b/src/views/category/descriptionPreview/index.vue index 5de8858..1f9ad75 100644 --- a/src/views/category/descriptionPreview/index.vue +++ b/src/views/category/descriptionPreview/index.vue @@ -34,7 +34,7 @@

界面预览效果

- +
@@ -56,7 +56,7 @@
提示：请通过拖动鼠标来调整当前顺序 - +
保存
@@ -92,7 +92,8 @@ export default { thisFields: { dictionaryConfigId: { dicName: null, id: null }}, // 当前项字段内容 editField: {}, isInputFields: [], - loading: false + loading: false, + isDesFormType: 'category' } }, watch: { diff --git a/src/views/components/category/PreviewForm.vue b/src/views/components/category/PreviewForm.vue index 7c848ab..cddfadb 100644 --- a/src/views/components/category/PreviewForm.vue +++ b/src/views/components/category/PreviewForm.vue @@ -71,6 +71,7 @@