Merge branch 'feature/4月-菜单和权限' into dev

src/components/common/gic-select-group.vue

@@ -90,7 +90,8 @@ export default {
       groupDataCopy: [],
       defaultProps: {
         children: 'children',
-        label: 'storeGroupName'
+        label: 'storeGroupName',
+        disabled: data => !data.hasRight
       },
       checkedKeys: this.selectData.length ? this.selectData.map(ele => ele.departmentId) : []
     };

src/components/company/org-tree.vue

@@ -114,7 +114,9 @@ export default {
         item.children = await that.getChildData(item);
         item.loading = false;
       } */
-      that.$emit('getSelectData', item);
+      if (item.hasRight) {
+        that.$emit('getSelectData', item);
+      }
     },
     /**
      * 获取下级数据

src/views/apps/customerApp/add-member-show-rules.vue

@@ -61,6 +61,9 @@ export default {
   data() {
     const valiStoreType = (rules, value, callback) => {
       const data = value.filter(el => !this.selectedTypes.includes(el));
+      if (this.storeTypes.every(el => this.selectedTypes.includes(el.value))) {
+        return callback(new Error('一种门店类型仅能包含在一个特殊策略中，当前所有门店类型已被其它特殊策略占用，无法创建'));
+      }
       if (data.length == 0) {
         return callback(new Error('请选择门店类型'));
       }
@@ -110,9 +113,6 @@ export default {
           errMsg.errorMsg(res.data);
           return;
         }
-        this.$nextTick(() => {
-          this.rules.storeType.trigger = 'change';
-        });
         // storeType = -1时为通用策略
         // 通用策略不能修改门店类型
         if (this.myCustomData.storeType.includes('-1')) return;
@@ -127,6 +127,9 @@ export default {
           }, []);
           this.myCustomData.storeType = this.myCustomData.storeType.concat(this.selectedTypes);
         }
+        this.$nextTick(() => {
+          this.rules.storeType.trigger = 'change';
+        });
       });
     },
     onSave() {