Merge branch 'feature/act-code' into dev

# Conflicts:
#	src/views/salesleads/actCodeManage/components/select-clerk/select-clerk.vue

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

@@ -173,18 +173,17 @@ export default {
             // 设置导购的禁用状态和选中状态
             el.clerkList = el.clerkList.map(item => {
               item.disabled = this.multiple ? item.hmStatus == 1 || item.hmStatus == 2 : item.hmStatus == 1 || item.hmStatus == 2 || item.hmStatus == 3;
-              item.disabled = false;
               item.selected = this.data.some(clerk => clerk.clerkId == item.clerkId);
               return item;
             });
             // 设置门店禁用状态、选中状态和半选状态
             el.disabled = el.clerkList.length == 0 || el.clerkList.every(el => el.disabled);
-            el.selected = el.clerkList.length > 0 && el.clerkList.every(el => el.selected);
+            el.selected = el.clerkList.length > 0 && el.clerkList.filter(el => !el.disabled).every(el => el.selected);
             el.indeterminate = !el.selected && el.clerkList.some(el => el.selected);
             return el;
           });
           this.selectAll.disabled = this.storeClerkList.length == 0 || this.storeClerkList.every(el => el.disabled);
-          this.selectAll.selected = this.storeClerkList > 0 && this.storeClerkList.every(el => el.selected);
+          this.selectAll.selected = this.storeClerkList > 0 && this.storeClerkList.filter(el => !el.disabled).every(el => el.selected);
           this.selectAll.indeterminate = !this.selectAll.selected && this.storeClerkList.some(el => el.selected || el.indeterminate);
           this.$refs.clerkList.scrollTop = 0;
         })
@@ -224,16 +223,17 @@ export default {
     },
     // 更新全选的复选框样式
     updateAllState() {
+      const storeClerkList = this.storeClerkList.filter(el => !el.disabled);
       // 计算全选的选中状态，计算半选的选中状态
-      this.selectAll.selected = this.storeClerkList.filter(el => !el.disabled).every(el => el.selected);
-      this.selectAll.indeterminate = !this.selectAll.selected && this.storeClerkList.filter(el => !el.disabled).some(el => el.selected || el.indeterminate);
+      this.selectAll.selected = storeClerkList.every(el => el.selected);
+      this.selectAll.indeterminate = !this.selectAll.selected && storeClerkList.some(el => el.selected || el.indeterminate);
     },
     // 更新门店全选的复选框样式
     updateStoreState(store) {
+      const clerkList = store.clerkList.filter(el => !el.disabled);
       // 计算门店的选中状态，计算门店的半选状态
-      store.selected = store.clerkList.filter(el => !el.disabled).every(el => el.selected);
-      store.indeterminate = !store.selected && store.clerkList.some(el => el.selected);
-      console.log(store);
+      store.selected = clerkList.every(el => el.selected);
+      store.indeterminate = !store.selected && clerkList.some(el => el.selected);
     },
     // 全选所有导购
     onSelectAll() {