Merge branch 'feature/act-code' into dev

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

 <template>
-  <el-dialog :visible.sync="show" v-if="show" title="选择成员" width="1030px" append-to-body @close="onCancel">
+  <div>
+    <el-dialog :visible="visible" v-if="visible" title="选择成员" width="1030px" append-to-body @close="onCancel">
       <div class="select-clerk" v-loading="loading">
         <!-- 选择导购 -->
         <div class="clerk-list">
@@ -82,10 +83,11 @@
         </div>
       </div>
       <template slot="footer">
-      <el-button @click="show = false">取消</el-button>
+        <el-button @click="onCancel">取消</el-button>
         <el-button type="primary" @click="onSave">确定</el-button>
       </template>
     </el-dialog>
+  </div>
 </template>
 
 <script>
@@ -95,7 +97,10 @@ export default {
   name: 'SelectClerk',
   components: { GicSelectGroup },
   props: {
-    visible: Boolean,
+    visible: {
+      type: Boolean,
+      default: false
+    },
     data: {
       type: Array,
       default: () => []
@@ -118,7 +123,6 @@ export default {
   watch: {
     visible(flag) {
       if (flag) {
-        this.show = true;
         this.selected = JSON.parse(JSON.stringify(this.data));
         this.getStoreClerkList();
       }
@@ -126,7 +130,6 @@ export default {
   },
   data() {
     return {
-      show: false,
       params: {
         storeGroup: [],
         storeGroupId: '', // 分组ID
@@ -356,7 +359,7 @@ export default {
     },
     onSave() {
       this.$emit('save', JSON.parse(JSON.stringify(this.selected)));
-      this.show = false;
+      this.$emit('update:visible', false);
     }
   }
 };