Merge branch 'feature/act-code' into dev

src/components/layout/bread-menu.vue

@@ -2,7 +2,7 @@
   <div class="bread-menu">
     <span class="bread-menu-item" v-for="(el, index) in menuList" :key="el.menuCode">
       <i v-if="index > 0" class="bread-menu-icon iconfont-hb3 iconnavigate_next"></i>
-      <span :class="['bread-menu-text', index == menuList.length - 1 ? 'bread-menu-actived' : 'is-link']" @click="toPage">{{ el.menuName }}</span>
+      <span :class="['bread-menu-text', index == menuList.length - 1 ? 'bread-menu-actived' : 'is-link']" @click="toPage(index)">{{ el.menuName }}</span>
     </span>
   </div>
 </template>
@@ -17,7 +17,8 @@ export default {
     }
   },
   methods: {
-    toPage() {
+    toPage(index) {
+      if (index == this.menuList.length - 1) return;
       this.$router.go(-1);
     }
   }

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

@@ -2,7 +2,7 @@
   <div>
     <setActCode ref="setActCodePage" @sumbit="onSubmit" :actCodeData="detailCode">
       <template #typeCode>
-        <el-form-item label="活码类型" prop="hmType" :rules="[{ required: true, message: '请选择活码类型', trigger: 'blur' }]">
+        <el-form-item label="活码类型" :rules="[{ required: true, message: '请选择活码类型', trigger: 'blur' }]">
           <el-radio-group v-model="form.hmType" @change="changeEvent" :disabled="$route.query.hmId">
             <el-radio :label="1">单人活码</el-radio>
             <el-radio :label="2">多人活码</el-radio>
@@ -10,12 +10,12 @@
         </el-form-item>
       </template>
       <template #codeName>
-        <el-form-item label="活码名称" prop="name" :rules="[{ required: true, message: '请输入活码名称', trigger: 'blur' }]">
+        <el-form-item label="活码名称" :rules="[{ required: true, message: '请输入活码名称', trigger: 'blur' }]">
           <el-input class="w340" v-model="form.name" placeholder="请输入活码名称，默认使用成员名称" maxlength="20" show-word-limit></el-input>
         </el-form-item>
       </template>
       <template #member>
-        <el-form-item label="关联导购" prop="clerkIdList" :rules="[{ required: true, message: '请选择使用成员', trigger: 'blur' }]">
+        <el-form-item label="关联导购" :rules="[{ required: true, message: '请选择使用成员', trigger: 'blur' }]">
           <p class="tabs" v-if="form.hmType == 1">单人活码仅可选择一名成员</p>
           <p class="tabs" v-if="form.hmType == 2">若选择多名成员，则随机分配企微员工</p>
           <select-clerk :multiple="multiple" :data="data" @change="onChange" :disabled="clerkDisabled"></select-clerk>

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

@@ -5,7 +5,7 @@
       <el-form class="mt20" ref="form" :model="form" :rules="rules" label-width="110px">
         <slot name="typeCode"></slot>
         <slot name="codeName"></slot>
-        <el-form-item label="活码分组" prop="hmGroupId">
+        <el-form-item label="活码分组" prop="hmGroupId" class="code-group">
           <el-select class="w340" v-model="form.hmGroupId" v-loadmore="onLoadmore" clearable filterable :filter-method="remoteMethod">
             <el-option v-for="item in groupList" :key="item.groupId" :label="item.groupName" :value="item.groupId"></el-option>
           </el-select>
@@ -145,9 +145,6 @@ export default {
     },
     // 保存按钮
     save() {
-      if (!this.$refs.welcomeItem.submit()) {
-        return;
-      }
       if (this.form.memberLabelStatus == 0) {
         this.$confirm('关联的标签在GIC中已被删除，无法统计和查看添加好友客户数据，为确保后续客户数据统计，请重新关联标签', '关联的标签已被删除，请重新关联标签', {
           confirmButtonText: '选择标签',
@@ -176,6 +173,9 @@ export default {
           this.saveLoading = true;
           this.$emit('sumbit', this.form);
         }
+        if (!this.$refs.welcomeItem.submit()) {
+          return;
+        }
       });
     }
   },
@@ -202,6 +202,11 @@ export default {
 };
 </script>
 <style lang="less" scoped>
+/deep/ .is-error.code-group {
+  .el-icon-circle-close {
+    display: none !important;
+  }
+}
 /deep/ .el-table__body-wrapper .el-table__row .cell {
   padding-left: 10px !important;
   // line-height: 16px;