Merge remote-tracking branch 'origin/develop' into develop

2021-12-16 19:35:06 +08:00
parent edea0e61f4 484ac891f0
commit fa37c9c314
29 changed files with 768 additions and 231 deletions
@@ -1338,7 +1338,7 @@
              width = "500"
              :data="standSystemOptions"
              :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
-              :nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select-new>
+              :nodeKey="nodeKey" @popoverHide="popoverHide"  @popoverHideCancel="popoverHideCancel"></tree-select-new>
      <tree-select-new
              width = "500"
              :lazy=true
@@ -2226,6 +2226,9 @@ export default {
    },
    popoverHideModelCancel() {
      this.modalShowFlag4 = false
+    },
+    popoverHideCancel() {
+      this.modalShowFlag1 = false
    },
      popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
          if(checkedData) {