From 103f1215236f4b0f90fb371e1154a6ade036308b Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmial.com>
Date: Thu, 10 Dec 2020 20:54:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E4=BF=AE=E6=94=B9=E5=88=B0?=
 =?UTF-8?q?=E6=9C=9F=E6=97=B6=E9=97=B4=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test_client/src/api/crm.js             |  4 ++--
 test_client/src/views/crm/consumer.vue | 14 +++++++++-----
 test_server/crm/views.py               | 11 +++++++++++
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/test_client/src/api/crm.js b/test_client/src/api/crm.js
index 50eb444..24f5de4 100644
--- a/test_client/src/api/crm.js
+++ b/test_client/src/api/crm.js
@@ -145,8 +145,8 @@ export function getConsumerPermAll(query) {
 }
 export function updateendConsumers(data) {
   return request({
-    url: `/crm/consumer/updateends/`,
-    method: 'post',
+    url: `/crm/consumer/exceeddates/`,
+    method: 'put',
     data
   })
 }
\ No newline at end of file
diff --git a/test_client/src/views/crm/consumer.vue b/test_client/src/views/crm/consumer.vue
index 0f24b04..f858abe 100644
--- a/test_client/src/views/crm/consumer.vue
+++ b/test_client/src/views/crm/consumer.vue
@@ -168,7 +168,7 @@
       >批量删除</el-button>
       <el-button
         @click="handleUpdateends"
-        v-if="checkPermission(['consumer__updateends'])"
+        v-if="checkPermission(['consumer_exceeddates'])"
       >批量修改到期</el-button>
       <!-- <el-button
         type="primary"
@@ -203,9 +203,6 @@
       <el-table-column label="手机号" sortable="custom" prop="username">
         <template slot-scope="scope">{{ scope.row.username }}</template>
       </el-table-column>
-      <el-table-column label="小程序OpenId" :show-overflow-tooltip="true">
-        <template slot-scope="scope">{{ scope.row.openid }}</template>
-      </el-table-column>
       <el-table-column label="用户类型">
         <template slot-scope="scope">{{ scope.row.role_name }}</template>
       </el-table-column>
@@ -231,6 +228,9 @@
           <span>{{ scope.row.create_time.substring(0,10) }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="过期日期">
+        <template slot-scope="scope">{{ scope.row.exceed_date }}</template>
+      </el-table-column>
       <el-table-column align="left" label="操作" fixed="right" width="260">
         <template slot-scope="scope">
           <el-button-group>
@@ -805,9 +805,13 @@ export default {
       }
     },
     confirmupdateend(){
-      if(this.exceed_date.length()>0){
+      if(this.exceed_date.length>0){
         updateendConsumers({ ids: this.selects,exceed_date:this.exceed_date }).then(res=>{
+          this.getList()
+          this.dateVisible = false
           this.$message.success('成功')
+        }).catch(e=>{
+          this.dateVisible = false
         })
       }
     }
diff --git a/test_server/crm/views.py b/test_server/crm/views.py
index fdab242..9781cbc 100644
--- a/test_server/crm/views.py
+++ b/test_server/crm/views.py
@@ -244,6 +244,17 @@ class ConsumerViewSet(ModelViewSet):
             Consumer.objects.filter(id__in = ids).delete()
             return Response(status=status.HTTP_200_OK)
 
+    @action(methods=['put'], detail=False, url_name='consumer_exceeddates',perms_map=[{'*':'consumer_exceeddates'}])
+    def exceeddates(self, request):
+        """
+        批量用户截至期限
+        """
+        ids = request.data.get('ids', None)
+        exceed_date = request.data.get('exceed_date')
+        if ids:
+            Consumer.objects.filter(id__in = ids).update(exceed_date=exceed_date)
+            return Response(status=status.HTTP_200_OK)
+
     @action(methods=['get'], detail=False,
             url_path='subjectpaid', url_name='subject_paid',perms_map=[{'*':'my_subject'}])
     def has_paid(self, request):