From e5b432cdb7604cb0abc2d361b5b06666721fdc32 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Mon, 30 Aug 2021 16:36:52 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=9B=BD=E5=A4=96=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E6=99=AE=E9=80=9A=E6=9F=A5=E8=AF=A2=E6=B8=85=E7=A9=BA=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../foreignStandardsAndRegulations/index.vue               | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index 3ee6d83d5..c1acaa477 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -2613,6 +2613,13 @@ export default {
     },
     // 清空搜索框
     clearAllSearch (flag) {
+      if (flag==='standCommonlySearch'){
+        this.standCommonlySearch.standNumber='';
+        this.standCommonlySearch.standSort='';
+        this.standCommonlySearch.page=1;
+
+      }
+      this.getDomesticStandardTable(this.standCommonlySearch)
 
       if (flag === 'sarStandardsSearch') {
         this.sarStandardsSearch.standSort = ''

From 9e729793e3921b123ce8119283a0780a5476d0f5 Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Mon, 30 Aug 2021 16:48:21 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/config/pages/roleManage/index.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/pages/config/pages/roleManage/index.vue b/src/pages/config/pages/roleManage/index.vue
index 022c01a12..b8c79cdbc 100644
--- a/src/pages/config/pages/roleManage/index.vue
+++ b/src/pages/config/pages/roleManage/index.vue
@@ -471,7 +471,6 @@ export default {
       if (selected !== -1) {
         // 子节点只要被选中父节点就被选中
         this.selectedParent(currentObj)
-        this.selectedParent2(currentObj)
         // 统一处理子节点为相同的勾选状态
         this.uniteChildSame(currentObj, true)
       } else {
@@ -483,8 +482,7 @@ export default {
     },
     // 统一处理子节点为相同的勾选状态
     uniteChildSame(treeList, isSelected) {
-      // this.$refs.tree3.setChecked(treeList.id, isSelected)
-      this.$refs.tree2.setChecked(treeList.id, isSelected)
+      this.$refs.tree3.setChecked(treeList.id, isSelected)
       for (let i = 0; i < treeList.children.length; i++) {
         this.uniteChildSame(treeList.children[i], isSelected)
       }