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

* feature/7月基础一异常冻结会员:
  异常规则配置 保存交互

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

@@ -293,6 +293,7 @@ export default {
         ]
       },
       isFirstSave: true,
+      haveClickSave: false,
       submitData: {
         frozen: 2,
         configs: []
@@ -311,6 +312,7 @@ export default {
         let { configs } = formData;
         let submitConfigs = [];
         let canSave = true;
+        let haveData = false;
         configs.forEach(item => {
           let configsItem = {
             configType: item.configType
@@ -330,6 +332,9 @@ export default {
                 ) {
                   canSave = false;
                 }
+                if(configsItem[item1.count.key] || configsItem[item1.amount.key]){
+                  haveData = true;
+                }
               });
               break;
 
@@ -354,6 +359,10 @@ export default {
               if(!item.setting.value && (configsItem[item.count.key] || configsItem[item.amount.key])){
                 canSave = false;
               }
+
+              if(configsItem[item.setting.key] && (configsItem[item.count.key] || configsItem[item.amount.key])){
+                haveData = true;
+              }
               break;
 
             case 4:
@@ -368,6 +377,9 @@ export default {
               ) {
                 canSave = false;
               }
+              if(configsItem[item.goodsCount.key] && configsItem[item.orderCount.key]){
+                haveData = true;
+              }
               break;
 
             case 5:
@@ -377,6 +389,9 @@ export default {
                 if (item1.checked && !item1.value) {
                   canSave = false;
                 }
+                if(configsItem[item1.key]){
+                  haveData = true;
+                }
               });
               break;
 
@@ -386,12 +401,16 @@ export default {
           submitConfigs.push(configsItem);
         });
         this.submitData.configs = submitConfigs;
-        this.canSave = canSave;
+        this.canSave = canSave && haveData;
+        this.haveData = haveData;
       }
     }
   },
   methods: {
     change(value) {
+      if(value){
+        return;
+      }
       setTimeout(() => {
         this.$refs["submitForm"].validate(valid => {
           if (valid) {
@@ -507,7 +526,18 @@ export default {
     },
     save() {
       this.$refs.submitForm.validate(valid => {
+        this.haveClickSave = true;
         if (valid) {
+          if(!this.haveData){
+            this.$message({
+              message: "表单内容不能为空",
+              type: "warning"
+            });
+            return;
+          }
+          if(!this.canSave){
+            return;
+          }
           if (this.isFirstSave) {
             this.submit();
           } else {

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

@@ -90,7 +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>
+                  <div class="el-form-item__error" v-if="haveClickSave && item.checked && !item.count.checked && !item.amount.checked">请完善此表单</div>
                 </el-form-item>
               </div>
             </el-form-item>
@@ -159,7 +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>
+              <div class="el-form-item__error" v-if="haveClickSave && formData.configs[1].setting.value && !formData.configs[1].count.checked && !formData.configs[1].amount.checked">请完善此表单</div>
             </el-form-item>
           </div>
         </el-form-item>
@@ -228,7 +228,7 @@
                   <span>元</span>
                 </el-row>
               </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>
+              <div class="el-form-item__error" v-if="haveClickSave && formData.configs[2].setting.value && !formData.configs[2].count.checked && !formData.configs[2].amount.checked">请完善此表单</div>
             </el-form-item>
           </div>
         </el-form-item>
@@ -313,6 +313,7 @@
                   <el-form-item
                     class="input-form-item"
                     :rules="{
+
                       required: item.checked,
                       message: `${ item.name }订单金额不能为空`,
                     }"
@@ -334,7 +335,7 @@
     </div>
     <el-row type="flex" class="page-bottom" justify="center" align="middle">
       <el-button @click="cancel">取消</el-button>
-      <el-button type="primary" @click="save" :disabled="!canSave"
+      <el-button type="primary" @click="save"
         :loading="isSave"
         >保存</el-button
       >

src/components/wechatmembers/frozen-member/frozen-member/frozen-member.js

@@ -79,21 +79,34 @@ export default {
       this.loadData();
     },
     handleSelectionChange(selectionList){
-      selectionList = selectionList || [];
-      this.multipleList = selectionList;
+      this.multipleList = selectionList || [];
     },
     resetSelected(){
       this.$refs.selectedForm.resetFields();
       this.$refs.multipleTable.clearSelection();
     },
     submitForm() {
-      this.$confirm("是否冻结所选会员?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      }).then(() => {
-        this.frozenMethod();
+      if(!this.multipleList.length){
+        this.$message({
+          message: "请选择要冻结的会员",
+          type: "warning"
+        });
+        return;
+      }
+      this.$refs.selectedForm.validate(valid => {
+        if (valid) {
+          this.$confirm("是否冻结所选会员?", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          }).then(() => {
+            this.frozenMethod();
+          });
+        } else {
+          return false;
+        }
       });
+      
     },
     frozenMethod() {
       let memberIds = this.multipleList.map((item)=>{

src/components/wechatmembers/frozen-member/frozen-member/frozen-member.vue

@@ -28,11 +28,13 @@
         class="member-table"
         @selection-change="handleSelectionChange"
         v-loading="load"
+        row-key="memberId"
       >
         <el-table-column
           type="selection"
           min-width="30"
           fixed="left"
+          reserve-selection
         ></el-table-column>
         <el-table-column label="会员信息" :min-width="200">
           <template slot-scope="{ row }">
@@ -161,14 +163,6 @@
         <el-button
           type="primary"
           @click="submitForm('selectedForm')"
-          :disabled="
-            !(
-              multipleList &&
-              multipleList.length &&
-              formData.frozenType &&
-              formData.remark
-            )
-          "
           >冻结选中会员</el-button
         >
       </div>