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

src/router/actCodeManageRouter/staffActCodeRouter.js

@@ -21,7 +21,8 @@ const staffActCodeRouter = [
     name: '新增活码',
     component: _import('salesleads/actCodeManage/staffActCode/views', 'setActCode'),
     meta: {
-      keepAlive: true
+      keepAlive: true,
+      fromPath: ['/salutatorySet']
     }
   },
   {
@@ -29,7 +30,8 @@ const staffActCodeRouter = [
     name: '编辑活码',
     component: _import('salesleads/actCodeManage/staffActCode/views', 'setActCode'),
     meta: {
-      keepAlive: true
+      keepAlive: true,
+      fromPath: ['/salutatorySet']
     }
   },
   {
@@ -37,7 +39,8 @@ const staffActCodeRouter = [
     name: '批量创建活码',
     component: _import('salesleads/actCodeManage/staffActCode/views', 'batchAddCode'),
     meta: {
-      keepAlive: true
+      keepAlive: true,
+      fromPath: ['/salutatorySet']
     }
   }
 ];

src/views/salesleads/actCodeManage/staffActCode/views/act-code-table.vue

@@ -476,6 +476,7 @@ export default {
         inFields: this.inFields,
         ...this.pageParam
       };
+      this.selectPage.dataReady = false;
       actCodeListApi(obj)
         .then(res => {
           if (res.data.code == 0) {
@@ -485,6 +486,7 @@ export default {
         })
         .finally(_ => {
           this.loadingStatus = false;
+          this.selectPage.dataReady = true;
         });
     }
   },

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

@@ -10,13 +10,13 @@
       </template>
       <template #member>
         <el-form-item label="使用成员" :rules="[{ required: true, message: '请选择使用成员', trigger: 'blur' }]">
-          <el-radio-group v-model="form.memberType" @change="radioChange">
+          <el-radio-group v-model="memberType" @change="radioChange">
             <el-radio :label="1">全部成员</el-radio>
             <el-radio :label="2">部分成员</el-radio>
           </el-radio-group>
           <br />
-          <p v-if="form.memberType == 1" class="tips">当前已选择 {{ hmMemberNum }} 个成员 <span>(活码名称默认为使用成员名称)</span></p>
-          <select-clerk v-if="form.memberType == 2" :multiple="true" :data="data" @change="onChange"></select-clerk>
+          <p v-if="memberType == 1" class="tips">当前已选择 {{ hmMemberNum }} 个成员 <span>(活码名称默认为使用成员名称)</span></p>
+          <select-clerk v-if="memberType == 2" :multiple="true" :data="data" @change="onChange"></select-clerk>
         </el-form-item>
       </template>
     </setActCode>
@@ -24,7 +24,7 @@
 </template>
 
 <script>
-import setActCode from '@/views/salesleads/components/actCodeSet.vue';
+import setActCode from '@/views/salesleads/components/act-code-set.vue';
 import SelectClerk from '../../components/select-clerk/index.vue';
 import { postJsonRequest, getRequest } from '@/api/api';
 export default {
@@ -36,9 +36,10 @@ export default {
         hmType: 1,
         // name: '',
         clerkIdList: [],
-        memberType: 1,
         hmUserNum: null
       },
+
+      memberType: 1,
       data: [],
       storeClerkList: []
     };
@@ -67,6 +68,10 @@ export default {
       this.form.hmUserNum = data.length;
     },
     async onSubmit(event) {
+      if (this.memberType == 1) {
+        this.form.clerkIdList = ['-1'];
+        this.form.hmUserNum = this.hmMemberNum;
+      }
       let obj = {
         ...event,
         ...this.form

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

@@ -25,7 +25,7 @@
   </div>
 </template>
 <script>
-import setActCode from '@/views/salesleads/components/actCodeSet.vue';
+import setActCode from '@/views/salesleads/components/act-code-set.vue';
 import SelectClerk from '../../components/select-clerk/index.vue';
 import { getRequest, postJsonRequest } from '@/api/api';
 export default {
@@ -93,15 +93,13 @@ export default {
         ...event,
         ...this.form
       };
-      console.log(obj, '父组件，整体表单数据');
       if (this.$route.query.hmId) {
         obj = {
           ...obj,
-          hm_id: this.$route.query.hmId
+          hmId: this.$route.query.hmId
         };
         // 编辑
         await postJsonRequest('/haoban-manage3-web/hm/qrcode/update', obj).then(res => {
-          console.log(res, '编辑');
           if (res.data.code == 0) {
             this.form = {
               hmType: 1,
@@ -117,7 +115,6 @@ export default {
       } else {
         // 新增
         await postJsonRequest('/haoban-manage3-web/hm/qrcode/add', obj).then(res => {
-          console.log(res, '新增');
           if (res.data.code == 0) {
             this.form = {
               hmType: 1,
@@ -125,7 +122,7 @@ export default {
               clerkIdList: [],
               hmUserNum: null //多人活码人数
             };
-            this.$router.go(-1);
+            // this.$router.go(-1);
           } else {
             return this.$message.error(res.data.message);
           }

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

@@ -59,10 +59,10 @@ export default {
       form: {
         // hmType: 1, //1单人 2多人
         // name: '', // 名称
-        hmGroupId: null, //活码分组id
+        hmGroupId: '', //活码分组id
         passFlag: true, // 1自动通过 0否
-        memberLabelId: '', //会员活动标签id
-        welcomeId: null // 欢迎语id
+        memberLabelId: 'fd6b44967aa647bcadfad10706244c56', //会员活动标签id
+        welcomeId: '' // 欢迎语id
         // clerkIdList: '', // 选择导购id
         // storeId: '' //门店id
         // hmUserNum: null //多人活码人数
@@ -88,7 +88,6 @@ export default {
   },
   methods: {
     saveTagPop(data) {
-      console.log(data);
       this.data = data;
     },
     onLoadmore() {
@@ -135,7 +134,6 @@ export default {
     save() {
       this.$refs.form.validate(async valid => {
         if (valid) {
-          console.log(this.form, '子组件');
           this.form.passFlag = this.form.passFlag ? 1 : 0;
           this.$emit('sumbit', this.form);
         }
@@ -146,10 +144,9 @@ export default {
     actCodeData: {
       handler: function(val) {
         if (val) {
-          console.log(val, 'val');
           this.form.hmGroupId = val.hmGroupId;
           this.form.passFlag = val.passFlag == 1 ? true : false;
-          this.form.memberLabelId = val.memberLabelId;
+          this.form.memberLabelId = val.memberLabelId ? val.memberLabelId : '';
           this.form.welcomeId = val.welcomeId;
         }
       },

src/views/salesleads/components/welcomesItem.vue

@@ -90,7 +90,7 @@ export default {
       isFlag: false
     };
   },
-  mounted() {
+  activated() {
     this.getWelcomeTable();
     console.log(this.welcomeIdP, 'ppp');
   },