From 9e13e384f1e67a1c2aab407be78bb8e45490f33d Mon Sep 17 00:00:00 2001 From: xuhuajiao <13476289682@163.com> Date: Fri, 1 Jul 2022 14:50:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A1=A3=E6=A1=88=E7=AE=A1=E7=90=86=20bug/icon?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0/=E6=99=BA=E8=83=BD=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/icons/svg/bindbiaoqian.svg | 1 - src/assets/icons/svg/chehui.svg | 17 ++ src/assets/icons/svg/huanyuan-fanbai.svg | 1 - src/assets/icons/svg/jieyue.svg | 1 - src/assets/icons/svg/partzhuanghe.svg | 17 ++ src/assets/icons/svg/zhuanghe.svg | 1 - src/assets/styles/archives-manage.scss | 9 +- src/assets/styles/yxk-admin.scss | 3 + .../archivesManage/archivesList/index.vue | 147 ++++++++++++------ .../module/archivesAnjuan/index.vue | 38 ++--- .../module/archivesInfo/index.vue | 1 + .../module/archivesJuannei/index.vue | 22 +-- .../module/archivesProject/index.vue | 15 +- .../archivesList/module/packing/index.vue | 2 +- .../archivesList/module/partPacking/index.vue | 4 +- .../archivesList/module/uploadFile/index.vue | 3 +- src/views/archivesManage/recycleBin/index.vue | 7 +- 17 files changed, 179 insertions(+), 110 deletions(-) create mode 100644 src/assets/icons/svg/chehui.svg create mode 100644 src/assets/icons/svg/partzhuanghe.svg diff --git a/src/assets/icons/svg/bindbiaoqian.svg b/src/assets/icons/svg/bindbiaoqian.svg index ee7a474..70a77b3 100644 --- a/src/assets/icons/svg/bindbiaoqian.svg +++ b/src/assets/icons/svg/bindbiaoqian.svg @@ -3,7 +3,6 @@ + + + + + diff --git a/src/assets/icons/svg/huanyuan-fanbai.svg b/src/assets/icons/svg/huanyuan-fanbai.svg index 9577336..b8c1427 100644 --- a/src/assets/icons/svg/huanyuan-fanbai.svg +++ b/src/assets/icons/svg/huanyuan-fanbai.svg @@ -3,7 +3,6 @@ + + + + + diff --git a/src/assets/icons/svg/zhuanghe.svg b/src/assets/icons/svg/zhuanghe.svg index 772699c..ae8eadc 100644 --- a/src/assets/icons/svg/zhuanghe.svg +++ b/src/assets/icons/svg/zhuanghe.svg @@ -3,7 +3,6 @@ -
+
档案门类
@@ -29,8 +29,6 @@ { if (data) { this.intellClassifyTree = data + // this.intellClassifyTree.filter(item => { + // if (item.childMenus !== null) { + // item.childMenus.map(val => { + // val.ifChild = true + // }) + // } + // }) } }) }, @@ -205,6 +211,7 @@ export default { if (val) { // 初始化智能分类的操作 if (this.$refs.smartTree) { + this.treeCurrentNode = null const smartTreeList = this.intellClassifyTree this.smartQuery = { 'archiveYear': null, @@ -307,6 +314,7 @@ export default { json.id = index json.dicName = item json.childMenus = [] + json.ifChild = true return json }) this.intellClassifyTree.unshift({ id: -1, dicName: '年度', childMenus: newYearArr }) @@ -316,46 +324,77 @@ export default { } }, // 智能分类 - handleIntellNodeClick(val) { - if (val) { + handleIntellNodeClick(data, node, ele) { + if (data) { const selectedKey = this.$refs.smartTree.getCurrentNode() const selectedParentVal = this.$refs.smartTree.getNode(selectedKey).parent.label - switch (selectedParentVal) { - case '年度': - if (selectedKey.dicName !== '年度') { - this.smartQuery.archiveYear = selectedKey.dicName - } - break - case '部门名称': - if (selectedKey.dicName !== '部门名称') { - this.smartQuery.department = selectedKey.dicName - } - break - case '保管期限': - if (selectedKey.dicName !== '保管期限') { - this.smartQuery.retention = selectedKey.dicName - } - break - case '密级': - if (selectedKey.dicName !== '密级') { - this.smartQuery.securityClass = selectedKey.dicName - } - break - case ' 机构（问题）': - if (selectedKey.dicName !== '机构（问题）') { - this.smartQuery.organizationMatter = selectedKey.dicName - } - break - // default: - // this.smartQuery = { - // 'archiveYear': null, - // 'department': null, - // 'retention': null, - // 'securityClass': null, - // 'organizationMatter': null - // } + this.treeCurrentNode = ele.$el + + // if (data.ifChild) { + // this.treeCurrentNode = ele.$el + // const eles = document.querySelectorAll('.el-tree-node__children .el-tree-node.is-focusable') + // for (let i = 0; i < eles.length; i++) { + // eles[i].classList.remove('is-current') + // } + // this.treeCurrentNode.classList.add('is-current') + // } else { + // ele.$el.classList.remove('is-current') + // console.log(this.treeCurrentNode) + // if (this.treeCurrentNode) { + // this.treeCurrentNode.classList.add('is-current') + // } + // } + + if (ele.$el.classList.contains('is-current')) { + this.treeCurrentNode.classList.remove('is-current') + this.smartQuery = { + 'archiveYear': null, + 'department': null, + 'retention': null, + 'securityClass': null, + 'organizationMatter': null + } + this.handleTableList() + } else { + this.treeCurrentNode.classList.add('is-current') + switch (selectedParentVal) { + case '年度': + this.treeCurrentNode.classList.remove('is-current') + if (selectedKey.dicName !== '年度') { + this.smartQuery.archiveYear = selectedKey.dicName + } + break + case '部门名称': + if (selectedKey.dicName !== '部门名称') { + this.smartQuery.department = selectedKey.dicName + } + break + case '保管期限': + if (selectedKey.dicName !== '保管期限') { + this.smartQuery.retention = selectedKey.dicName + } + break + case '密级': + if (selectedKey.dicName !== '密级') { + this.smartQuery.securityClass = selectedKey.dicName + } + break + case ' 机构（问题）': + if (selectedKey.dicName !== '机构（问题）') { + this.smartQuery.organizationMatter = selectedKey.dicName + } + break + default: + this.smartQuery = { + 'archiveYear': null, + 'department': null, + 'retention': null, + 'securityClass': null, + 'organizationMatter': null + } + } + this.handleTableList() } - this.handleTableList() } }, handleTableList() { @@ -368,7 +407,9 @@ export default { this.$refs.file.getTableDisplayFields() } this.$refs.project.getTableList() - this.getYear('project') + if (!this.treeCurrentNode) { + this.getYear('project') + } }) } else if (this.selectedCategory.isType === 3) { this.$nextTick(() => { @@ -379,21 +420,27 @@ export default { this.$refs.file.getTableDisplayFields() } this.$refs.anjuan.getTableList() - this.getYear('anjuan') + if (!this.treeCurrentNode) { + this.getYear('anjuan') + } }) } else if (this.selectedCategory.isType === 4) { this.$nextTick(() => { this.$refs.file.junneiData = [] this.$refs.file.getTableDisplayFields() this.$refs.file.getTableList() - this.getYear('file') + if (!this.treeCurrentNode) { + this.getYear('file') + } }) } else if (this.selectedCategory.isType === 5) { this.$nextTick(() => { this.$refs.anjuan.anjuanData = [] this.$refs.anjuan.getTableDisplayFields() this.$refs.anjuan.getTableList() - this.getYear('anjuan') + if (!this.treeCurrentNode) { + this.getYear('anjuan') + } }) } } diff --git a/src/views/archivesManage/archivesList/module/archivesAnjuan/index.vue b/src/views/archivesManage/archivesList/module/archivesAnjuan/index.vue index 6085d8f..8972e83 100644 --- a/src/views/archivesManage/archivesList/module/archivesAnjuan/index.vue +++ b/src/views/archivesManage/archivesList/module/archivesAnjuan/index.vue @@ -2,7 +2,7 @@
-
+
新增 @@ -24,7 +24,7 @@
- + @@ -40,17 +40,17 @@ 搜索
-
+
- 装盒 + 装盒 - 分卷装盒 - + 分卷装盒 + - 借阅 + 借阅 - 绑定标签 + 绑定标签
@@ -121,26 +121,26 @@ {{ scope.row[field.fieldName] }} - + - + - + - + - + - + - + @@ -101,6 +101,7 @@ export default { mixins: [ form({}) ], + inject: ['recycleMain'], props: { isUploadDetail: { type: Boolean, diff --git a/src/views/archivesManage/recycleBin/index.vue b/src/views/archivesManage/recycleBin/index.vue index bc79606..d43973b 100644 --- a/src/views/archivesManage/recycleBin/index.vue +++ b/src/views/archivesManage/recycleBin/index.vue @@ -1,6 +1,6 @@ @@ -12,6 +12,8 @@ export default { components: { archivesList }, data() { return { + isdel: true, + isRecycle: true } }, created() { @@ -22,4 +24,7 @@ export default {