Merge branch 'develop' into 'FOTON'

Develop See merge request LAWS/laws-system-front-FOTON!253
2021-12-27 09:03:33 +08:00
parent 4582e7e3ed 8e1837bee0
commit 2cac11d178
32 changed files with 2628 additions and 737 deletions
@@ -317,6 +317,7 @@
                              :show-checkBox="showCheckBox"
                              :url="url"
                              :urlChild="urlChild"
+                              @popoverHideCancel = "modalShowFlag2 = false"
                              :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
                              :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select-new>
                    </el-form-item>
@@ -342,6 +343,7 @@
                              :drawerTitle="drawerTitle"
                              :show-checkBox="showCheckBox"
                              :url="url"
+                              @popoverHideCancel = "modalShowFlag3 = false"
                              :urlChild="urlChild"
                              :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
                              :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"></tree-select-new>