diff --git a/src/components/treeSelect/treeSelectNew.vue b/src/components/treeSelect/treeSelectNew.vue index 9656955c2..8e8c3a0ea 100644 --- a/src/components/treeSelect/treeSelectNew.vue +++ b/src/components/treeSelect/treeSelectNew.vue @@ -264,7 +264,7 @@ this.$emit('popoverHide', this.checkedIds, this.checkedData,false); }, cancelUserInfo () { - this.$emit('popoverHide', this.checkedIds, this.checkedData,false); + this.$emit('popoverHideCancel', this.checkedIds, this.checkedData,false); }, }, watch: { diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index c2548b25e..0e8e4fc56 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -549,7 +549,7 @@ :url="url" :urlChild="urlChild" :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1" - :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"> + :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs" @popoverHideCancel="popoverHideBusVsCancel"> @@ -565,7 +565,7 @@ :url="url" :urlChild="urlChild" :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2" - :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"> + :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs" @popoverHideCancel="popoverHideCarVsCancel"> @@ -581,7 +581,7 @@ :show-checkBox="showCheckBox" :urlChild="urlChild" :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3" - :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"> + :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel" @popoverHideCancel="popoverHideModelCancel"> @@ -2313,19 +2313,23 @@ this.modalShowFlag1 = false }, popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) { - if(checkedData) { - if(checkedData.length > 0){ + if(checkedData && checkedData.length != 0) { + if(checkedData.length > 0 && checkedData.length != 0){ this.form.cycvppsbm = checkedData.map(item => item.code).join(",") this.form.cycvppscn = checkedData.map(item => item.chineseName).join(",") }else { this.form.cycvppsbm = checkedData.code this.form.cycvppscn = checkedData.chineseName } + this.modalShowFlag2 = false } - this.modalShowFlag2 = false + + }, + popoverHideBusVsCancel(){ + this.modalShowFlag2 = false }, popoverHideCarVs (checkedIds, checkedData,isShow,isLoadChild,topId) { - if(checkedData) { + if(checkedData && checkedData.length != 0) { if(checkedData.length > 0){ this.form.kccvppsbm = checkedData.map(item => item.code).join(",") this.form.kccvppscn = checkedData.map(item => item.chineseName).join(",") @@ -2333,11 +2337,15 @@ this.form.kccvppsbm = checkedData.code this.form.kccvppscn = checkedData.chineseName } + this.modalShowFlag3 = false + } + }, + popoverHideCarVsCancel(){ this.modalShowFlag3 = false }, popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) { - if(checkedData) { + if(checkedData && checkedData.length != 0) { if(checkedData.length > 0){ this.form.dybxh = checkedData.map(item => item.model).join(",") this.form.dymc = checkedData.map(item => item.name).join(",") @@ -2345,7 +2353,11 @@ this.form.dybxh = checkedData.model this.form.dymc = checkedData.name } + this.modalShowFlag4 = false } + + }, + popoverHideModelCancel(){ this.modalShowFlag4 = false }, closeDrawer() {