Merge branch 'bugfix/会员标签异常'

src/components/allCustomers/components/customerlabelDialog.vue

@@ -42,7 +42,7 @@
                 </div>
               </li>
             </ul>
-            <ul class="tags-list" v-if="tab.name==='other'&&tagsList.length">
+            <ul class="tags-list" v-if="tab.name==='other'&&otherTagsList.length">
               <li v-for="(item,index) in otherTagsList" :key="index" class="tag-item-new">
                 <div class="tag-group-name" v-if="item.subTags && item.subTags.length">
                   {{ item.tagsName }}：
@@ -68,7 +68,7 @@
                 </div>
               </li>
             </ul>
-            <ul class="tags-list" v-if="tab.name==='weimo'&&tagsList.length">
+            <ul class="tags-list" v-if="tab.name==='weimo'&&weimobTagsList.length">
               <li v-for="(item,index) in weimobTagsList" :key="index" class="tag-item-new">
                 <div class="tag-group-name" v-if="item.subTags && item.subTags.length">
                   {{ item.tagsName }}：
@@ -192,7 +192,7 @@ export default {
             if (list.isCheck) {
               if (item.isMultiple) checkBox.push(list.tagsName);
               else {
-                checkBox = item.tagsId;
+                checkBox = list.tagsId;
               }
             }
           }

src/components/allCustomers/customerDetail.vue

@@ -560,7 +560,7 @@
                       无
                     </div>
                   </div>
-                  <div class="hand-label-item member-tag-group" :key="item">
+                  <div v-if="tagAndRemarkInfo.memberGroup.showMemberTagGroupList" class="hand-label-item member-tag-group" :key="item">
                     <p>其他分组：</p>
                     <div
                       class="flex-tag-wrap"

src/components/allCustomers/index.js

@@ -72,9 +72,10 @@ export default {
       cliqueMemberGrade: [], // 集团等级列表
       selectTreeOptions: {
         selectOptions: {
+          collapseTags: false,
           allCheckText: '全部客户',
           placeholder: '全部客户',
-          width: 220
+          width: 260
         },
         treeOptions: {
           data: [

src/components/allCustomers/info.js

@@ -302,6 +302,7 @@ export default {
                       memberTagGroupList:
                         ret.tagAndRemarkInfo.memberGroup.memberTagGroupList ||
                         {},
+                      showMemberTagGroupList: ret.tagAndRemarkInfo.memberGroup.showMemberTagGroupList
                     },
                     tag: {
                       tagsList: ret.tagAndRemarkInfo.tag.tagsList || [],

src/components/memberlist/memberReturn.js

@@ -697,6 +697,10 @@ export default {
       this.storeName = "";
     },
     successImport(taskId) {
+      // 修改一个会员的服务门店或者协管门店，不跳转到任务中心
+      if (this.selectObj.multipleList.length == 1) {
+        return;
+      }
       // this.dialogImportVisible = false;
       this.$confirm(
         "任务发起成功，请去【企业管理】-【任务中心】查看处理结果和执行进度",