异常会员 新增时间筛选

单个点击冻结解冻

src/components/axios/url.js

@@ -107,8 +107,8 @@ const urlConfig = {
   getAbnormalSetting: '/api-member/exception-config-view',// 异常配置详情
   saveAbnormalSetting: '/api-member/exception-config-save',// 保存异常配置
   getUnfreezeCount: '/api-member/no_froze_member_count',// 获取当前选中的异常会员的未冻结数量
-
-  getEnableDownload:'/api-auth/get-enable-download-data-config-by-user'
+  getEnableDownload:'/api-auth/get-enable-download-data-config-by-user',
+  updateFrozen: '/api-member/exception-frozen',
 }
 
 const defaultUrl = Object.assign({}, urlConfig);

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

@@ -16,7 +16,7 @@
             ></el-input>
             <el-select
               v-model="searchData.memberCardStatus"
-              style="width: 135px; margin-left: 10px"
+              style="width: 160px; margin-left: 10px"
               placeholder="全部会员状态"
               @change="onSearchDataChange"
             >
@@ -24,6 +24,15 @@
               <el-option label="正常" :value="1"></el-option>
               <el-option label="冻结" :value="2"></el-option>
             </el-select>
+            <el-date-picker v-model="dateValue" 
+              style="margin-left: 10px"
+              format="yyyy 年 MM 月 dd 日"
+              type="daterange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :default-time="['00:00:00', '23:59:59']"
+              @change="dateRangeChange"></el-date-picker>
           </el-row>
           <span
             class="right-btn"
@@ -40,7 +49,7 @@
               v-if="getCodeAuth('batchFreeze')"
               :limit-code="getCode('batchFreeze')"
              -->
-            <el-button @click="batchFreeze" plain>批量冻结</el-button>
+            <el-button @click="clickBatchFreeze" plain>批量冻结</el-button>
             <!-- 
               v-if="getCodeAuth('abnormalSetting')"
               :limit-code="getCode('abnormalSetting')"
@@ -469,11 +478,8 @@
     />
 
     <freeze-dialog
-      :visible.sync="freezeDialogOptions.visible"
-      :count="freezeDialogOptions.count"
-      :isBatchFreeze="freezeDialogOptions.isBatchFreeze"
+      v-bind.sync="freezeDialogOptions"
       v-if="freezeDialogOptions.visible"
-      @submit="sureFreeze"
     />
   </div>
 </template>

src/components/wechatmembers/abnormal-member-list/components/dialog/freeze.vue

@@ -9,9 +9,10 @@
       </div>
       <el-form :model="submitData" ref="submitForm" :rules="rules">
         <el-form-item label="冻结原因" prop="frozenType" required>
-          <el-select v-model="submitData.frozenType" placeholder="" disabled 
+          <el-select v-model="submitData.frozenType" placeholder="" :disabled="isBatchFreeze" 
             style="width: 550px;">
-            <el-option :label="'异常冻结'" :value="1"></el-option>
+            <el-option label="异常冻结" :value="1"></el-option>
+            <el-option label="会员主动冻结" :value="2"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="原因备注" prop="remark" required>
@@ -22,22 +23,20 @@
 
       <el-row type="flex" justify="end">
         <el-button @click="onClose">取消</el-button>
-        <el-button type="primary" @click="submit('submitForm')">确定</el-button>
+        <el-button type="primary" @click="sure('submitForm')">确定</el-button>
       </el-row>
     </el-dialog>
   </div>
 </template>
 
 <script>
-const ONE_M = 60 * 1000;
-const ONE_HOUR = 60 * ONE_M;
-const ONE_DAY = 24 * ONE_HOUR;
-const ONE_YEAR = 365 * ONE_DAY;
-
 export default {
   name: 'FreezeDialog',
   components: {},
   props: {
+    submit: {
+      type: Function
+    },
     visible: false,
     count: 0,
     isBatchFreeze: false,// 是否批量冻结
@@ -57,10 +56,11 @@ export default {
     onClose() {
       this.$emit('update:visible', false);
     },
-    submit(formName) {
+    sure(formName) {
       this.$refs[formName].validate((valid) => {
           if (valid) {
             this.onClose();
+            this.submit && this.submit(this.submitData);
             this.$emit('submit', this.submitData);
           } else {
             console.log('error submit!!');
@@ -71,25 +71,7 @@ export default {
     }
   },
   watch: {
-    detailItem: {
-      immediate: true,
-      deep: true,
-      handler(detailItem) {
-        this.serviceList.map((item, index) => {
-          if (!detailItem.enterpriseServices) {
-            return;
-          }
-          let service = detailItem.enterpriseServices[item.key] || {};
-          item = Object.assign(item, service);
-          if (service.serviceEndDate && service.serviceStartDate) {
-            this.$set(item, 'dateValue', [new Date(service.serviceStartDate), new Date(service.serviceEndDate)]);
-          } else {
-            this.$set(item, 'dateValue', ['', '']);
-          }
-          this.serviceList[index] = item;
-        });
-      }
-    }
+
   }
 };
 </script>

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

@@ -524,7 +524,6 @@ export default {
             checkFalse(message);
             return;
           }else{
-            sessionStorage.setItem('AbnormalSettingSave',1)
             this.$router.go(-1);
           }
         })