Merge branch 'feature/7月基础一异常冻结会员' into dev

* feature/7月基础一异常冻结会员:
  异常规则配置  提示优化
  其他页面 影响到了 组件里subtitle标签 问题

src/components/wechatmembers/abnormal-member/abnormal-setting/abnormal-setting.js

@@ -310,7 +310,7 @@ export default {
       handler(formData) {
         let { configs } = formData;
         let submitConfigs = [];
-        let canSave = false;
+        let canSave = true;
         configs.forEach(item => {
           let configsItem = {
             configType: item.configType
@@ -324,11 +324,11 @@ export default {
                   item1.checked && item1.amount.checked
                     ? item1.amount.value
                     : undefined;
-                if (
-                  configsItem[item1.count.key] ||
-                  configsItem[item1.amount.key]
+                if (item1.checked &&
+                  (!configsItem[item1.count.key] &&
+                  !configsItem[item1.amount.key])
                 ) {
-                  canSave = true;
+                  canSave = false;
                 }
               });
               break;
@@ -346,10 +346,13 @@ export default {
                 ? item.amount.value
                 : undefined;
               if (
-                configsItem[item.setting.key] &&
-                (configsItem[item.count.key] || configsItem[item.amount.key])
+                item.setting.value &&
+                (!configsItem[item.count.key] && !configsItem[item.amount.key])
               ) {
-                canSave = true;
+                canSave = false;
+              }
+              if(!item.setting.value && (configsItem[item.count.key] || configsItem[item.amount.key])){
+                canSave = false;
               }
               break;
 
@@ -360,11 +363,10 @@ export default {
               configsItem[item.orderCount.key] = item.checked
                 ? item.orderCount.value
                 : undefined;
-              if (
-                configsItem[item.goodsCount.key] ||
-                configsItem[item.orderCount.key]
+              if (item.checked &&(!item.goodsCount.value ||
+                !item.orderCount.value)
               ) {
-                canSave = true;
+                canSave = false;
               }
               break;
 
@@ -372,8 +374,8 @@ export default {
             case 6:
               item.list.forEach(item1 => {
                 configsItem[item1.key] = item1.checked ? item1.value : undefined;
-                if (configsItem[item1.key]) {
-                  canSave = true;
+                if (item1.checked && !item1.value) {
+                  canSave = false;
                 }
               });
               break;

src/components/wechatmembers/abnormal-member/abnormal-setting/abnormal-setting.vue

@@ -90,6 +90,7 @@
                       <span>元</span>
                     </el-row>
                   </el-checkbox>
+                  <div class="el-form-item__error" v-if="item.checked && !item.count.checked && !item.amount.checked">请完善此表单</div>
                 </el-form-item>
               </div>
             </el-form-item>
@@ -158,6 +159,7 @@
                   <span>元</span>
                 </el-row>
               </el-checkbox>
+              <div class="el-form-item__error" v-if="formData.configs[1].setting.value && !formData.configs[1].count.checked && !formData.configs[1].amount.checked">请完善此表单</div>
             </el-form-item>
           </div>
         </el-form-item>
@@ -225,7 +227,8 @@
                   </el-form-item>
                   <span>元</span>
                 </el-row>
-              </el-checkbox>
+              </el-checkbox>              
+              <div class="el-form-item__error" v-if="formData.configs[2].setting.value && !formData.configs[2].count.checked && !formData.configs[2].amount.checked">请完善此表单</div>
             </el-form-item>
           </div>
         </el-form-item>