Merge branch 'feature/act-code' into dev

src/views/salesleads/actCodeManage/components/select-clerk/select-clerk.vue

 <template>
-  <el-dialog :visible="visible" title="选择成员" width="1000px" @close="onCancel">
+  <el-dialog :visible.sync="show" title="选择成员" width="1000px" @close="onCancel">
     <div class="select-clerk" v-loading="loading">
       <!-- 选择导购 -->
       <div class="clerk-list">
@@ -78,7 +78,7 @@
       </div>
     </div>
     <template slot="footer">
-      <el-button @click="onCancel">取消</el-button>
+      <el-button @click="show = false">取消</el-button>
       <el-button type="primary" @click="onSave">确定</el-button>
     </template>
   </el-dialog>
@@ -108,6 +108,7 @@ export default {
   watch: {
     visible(flag) {
       if (flag) {
+        this.show = true;
         this.params.storeGroup = [];
         this.params.storeGroupId = '';
         this.params.storeSearchParams = '';
@@ -120,6 +121,7 @@ export default {
   },
   data() {
     return {
+      show: false,
       params: {
         storeGroup: [],
         storeGroupId: '', // 分组ID