Merge branch 'feature/act-code' of http://git.gicdev.com/office/haoban-3 into feature/act-code

src/views/salesleads/actCodeManage/staffActCode/views/setActCode.vue

@@ -33,7 +33,10 @@ export default {
   data() {
     return {
       loading: false,
+      welcomeType: 1,
       form: {
+        passFlag: true,
+        welcomeId: '1',
         hmType: 1,
         name: '',
         clerkIdList: [],

src/views/salesleads/components/act-code-set.vue

@@ -200,8 +200,6 @@ export default {
           }
         }
       }
-      // immediate: true,
-      // deep: true
     }
   }
 };