Merge branch 'feature/6/31' into dev

src/components/ruleDetail.vue

@@ -26,7 +26,7 @@
       />
     </el-form-item>
     <el-form-item label="适用人群" prop="memberType">
-      <span v-if="$store.state.product.ruleMemberFilterClose==0" class="tips">【人群筛选器】类型的上架规则最多支持20条,目前已创建 <span style="color:#2F54EB">{{ memberTypeTotal }}</span> 条</span>
+      <span v-if="$store.state.product.ruleMemberFilterClose==0" class="tips">人群筛选和会员分组总共只支持20条，请严格配置。目前已创建 <span style="color:#2F54EB">{{ memberTypeTotal }}</span> 条</span>
       <div>
         <!-- <el-radio v-model="ruleForm.memberType" :label="1" v-if="$store.state.product.ruleMemberFilterClose==0">
           全部客户
@@ -37,12 +37,15 @@
         <el-radio
           v-model="ruleForm.memberType"
           :label="3"
-          :disabled="memberTypeTotal>=20&&isAdd"
+          :disabled="isDisabled"
           v-if="$store.state.product.ruleMemberFilterClose==0"
         >
           人群筛选器
         </el-radio>
-        <el-radio v-model="ruleForm.memberType" :label="2">
+        <el-radio v-model="ruleForm.memberType"
+          :label="2"
+          :disabled="isDisabled"
+          v-if="$store.state.product.ruleMemberFilterClose==0">
           会员分组
         </el-radio>
       </div>
@@ -90,6 +93,7 @@
 
 <script>
 import request from '@/service/request';
+
 export default {
   props: {
     isDialog: {
@@ -112,6 +116,7 @@ export default {
       groupVisible: false,
       selectedGroupIds: '', // 被选中的客户分组id
       fixedWidth: document.documentElement.clientWidth - 200,
+      memberType: 1,
       ruleForm: {
         memberType: 4, //  3 人群筛选 4 门店筛选
         creatorId: '',
@@ -145,6 +150,13 @@ export default {
     storeParams () {
       return !this.isAdd ? { creatorId: this.ruleForm.creatorId } : {};
     },
+    isDisabled () {
+      if (this.isAdd) {
+        return this.memberTypeTotal >= 20;
+      } else {
+        return !(this.memberType == 3 || this.memberType == 2) && this.memberTypeTotal >= 20;
+      }
+    },
   },
   mounted () {
     if (!this.isAdd) {
@@ -174,6 +186,7 @@ export default {
       request.get('/api-integral-mall/get-rule', { params: { integralMallProRuleId } }).then(res => {
         if (res.data.result) {
           this.ruleForm = res.data.result;
+          this.memberType = this.ruleForm.memberType;
           if (this.ruleForm.memberType == 3) { // 人群筛选器回显
             this.hasSearchData = this.ruleForm.filterJson;
             this.useId = this.ruleForm.searchId;
@@ -275,10 +288,14 @@ export default {
     /** 客户分组 */
     confirmGroupDialog (arr, idStr) {
       this.selectedGroupIds = idStr;
+      this.$refs.ruleForm.validateField('selectedGroupIds');
     },
     memberTypeNum () {
-      request.get('/api-integral-mall/list-rule', { params: { memberType: 3 } }).then(res => {
-        this.memberTypeTotal = res.data.result.length || 0;
+      Promise.all([request.get('/api-integral-mall/list-rule', { params: { memberType: 3 } }), request.get('/api-integral-mall/list-rule', { params: { memberType: 2 } })]).then(res => {
+        console.log(res);
+        const total1 = res[0].data.result ? res[0].data.result.length : 0;
+        const total2 = res[1].data.result ? res[1].data.result.length : 0;
+        this.memberTypeTotal = total1 + total2;
       });
     },
   },