'renqun'

package-lock.json

@@ -99,9 +99,9 @@
       }
     },
     "@gic-test/vue-gic-group-people": {
-      "version": "1.1.24",
-      "resolved": "http://www.gicdev.com:7001/@gic-test/vue-gic-group-people/download/@gic-test/vue-gic-group-people-1.1.24.tgz",
-      "integrity": "sha1-DcnnxHXM1FMssTndejgY9fXMIa8=",
+      "version": "1.1.26",
+      "resolved": "http://www.gicdev.com:7001/@gic-test/vue-gic-group-people/download/@gic-test/vue-gic-group-people-1.1.26.tgz",
+      "integrity": "sha1-5tJwgy/NLjycvVLuQuWQ4xGqTYY=",
       "requires": {
         "@gic-test/vue-gic-store-new": "^1.3.1",
         "@riophae/vue-treeselect": "0.0.35",

package.json

@@ -13,7 +13,7 @@
     "@gic-test/vue-area-ab": "^1.4.5",
     "@gic-test/vue-gic-aside-menu": "^1.1.45",
     "@gic-test/vue-gic-footer": "^1.0.10",
-    "@gic-test/vue-gic-group-people": "^1.1.24",
+    "@gic-test/vue-gic-group-people": "^1.1.26",
     "@gic-test/vue-gic-header": "^1.3.31",
     "@gic-test/vue-gic-img-preview": "^1.0.13",
     "@gic-test/vue-gic-store-new": "^1.2.7",

src/main.js

@@ -23,7 +23,7 @@ import {gicStoreGroup} from '@gic-test/vue-gic-store-new'
 import deleteTip from 'components/com/deleteTip'
 Vue.component('delete-tip', deleteTip);
 // 人群筛选器
-import vueGicGroupPeople from '@gic-test/vue-gic-group-people/src/lib'
+import vueGicGroupPeople from '@gic-test/vue-gic-group-people/src/lib';
 
 Vue.use(vueGicImgPreview)
 Vue.use(vueGicFooter)

src/view/companyGroup/membershipSystem/addPointSystem.vue

@@ -356,7 +356,7 @@
       :visible.sync="dialogVisiblePeople"
       width="980px">
       <div class="select-people">
-        <vue-gic-group-people :projectName="repProjectName" :useId="useId" :hasSearchData="hasSearchData" :sceneValue="sceneValue" ref="peopleFilter" @findFilter="findFilter" @getBackData="getBackData" @editHide= "editHide" @editShow="editShow" @hideBtn="hideBtn"></vue-gic-group-people>
+        <vue-gic-group-people :useId="useId" :hasSearchData="hasSearchData" :sceneValue="sceneValue" ref="peopleFilter" @findFilter="findFilter" @getBackData="getBackData" @editHide= "editHide" @editShow="editShow" @hideBtn="hideBtn"></vue-gic-group-people>
         <div v-show="toggleTag" class="people-btn-wrap">
           <el-row>
             <el-button @click="getData" type="primary" size="small">确定</el-button>

src/view/companyGroup/membershipSystem/editPointSystem.vue

@@ -367,9 +367,10 @@
     <el-dialog
       title="自定义人群"
       :visible.sync="dialogVisiblePeople"
+      :close-on-click-modal="false"
       width="980px">
       <div class="select-people">
-        <vue-gic-group-people :projectName="repProjectName" :useId="useId" :hasSearchData="hasSearchData" :sceneValue="sceneValue" ref="peopleFilter" @findFilter="findFilter" @getBackData="getBackData" @editHide= "editHide" @editShow="editShow" @hideBtn="hideBtn"></vue-gic-group-people>
+        <vue-gic-group-people :projectName="repProjectName" :useId="useId" :hasSearchData="hasSearchData" :sceneValue="sceneValue" ref="peopleFilter" @findFilter="findFilter" @getBackData="getBackData" @editHide="editHide" @editShow="editShow" @hideBtn="hideBtn"></vue-gic-group-people>
         <div v-show="toggleTag" class="people-btn-wrap">
           <el-row>
             <el-button @click="getData" type="primary" size="small">确定</el-button>
@@ -1359,13 +1360,19 @@ export default {
       this.toggleTag= false
     },
     getPeopleData(){  // 筛选器 弹框的确认按钮
-      var that = this;
-      that.$refs.peopleFilter.confirmSet();
-      setTimeout(function(){
-        if(that.searchParams){
-          that.dialogVisiblePeople = false;
+      this.$refs.peopleFilter.confirmSet().then(res => {
+        console.log(res);
+        if (!res) {
+          return;
+        } else {
+          setTimeout(_ => {
+            if(this.searchParams) {
+              this.dialogVisiblePeople = false;
             }
-      },500)
+          }, 500);
+        }
+      });
+    
     },
     /* end */