Merge branch 'develop' into 'test'

Develop

See merge request !110

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.tree3.setChecked(treeList.id, isSelected)
-      this.$refs.tree2.setChecked(treeList.id, isSelected)
       for (let i = 0; i < treeList.children.length; i++) {
         this.uniteChildSame(treeList.children[i], isSelected)
       }

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 = ''