From 49c0f91ff03af5f3885a8a470c444c69bdf16d71 Mon Sep 17 00:00:00 2001
From: shilixia <2309368887@qq.com>
Date: Tue, 13 Oct 2020 16:24:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/views/ability/cma2.vue | 14 ++++++--------
 server/apps/ability/views.py      |  9 +++++++--
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/client/src/views/ability/cma2.vue b/client/src/views/ability/cma2.vue
index 3309f18..aa0058d 100644
--- a/client/src/views/ability/cma2.vue
+++ b/client/src/views/ability/cma2.vue
@@ -70,15 +70,15 @@
             >
           </el-upload>
         </div>
-
+        
+       
         <el-button slot="reference">导入分子公司能力</el-button>
+         
       </el-popover>
+       <el-button @click="delAll()"  v-if="checkPermission(['cma_deletes'])">批量删除</el-button>
+      
     </div>
-    <div style="margin-top: 20px">
     
-            <el-button @click="delAll()" type="danger" v-if="checkPermission(['cma_deletes'])">批量删除</el-button>
-            <el-button @click="toggleSelection()">取消选择</el-button>
-        </div>
     <el-table
       v-loading="listLoading"
       :data="cmaList.results"
@@ -375,9 +375,7 @@ export default {
           console.error(err);
         });
     },
-    toggleSelection() {
-        this.$refs.filterTable.clearSelection();
-    },
+   
     delAll() {
          this.$confirm("确认删除?", "警告", {
         confirmButtonText: "确认",
diff --git a/server/apps/ability/views.py b/server/apps/ability/views.py
index b6a6307..60de18f 100644
--- a/server/apps/ability/views.py
+++ b/server/apps/ability/views.py
@@ -38,7 +38,13 @@ class CMAViewSet(ModelViewSet):
                 if i[group_by] and i['count']:
                     ret.append({'text':i[group_by]+'('+ str(i['count']) +')','value':i[group_by]})
         return Response(ret)
-
+    @action(methods=['post'], detail=False, url_path='deletes', url_name='cma_deletes', perms_map = {'post':'cma_deletes'})    
+    def deletes(self, request):
+        
+        array = request.data['ids']  
+        CMA.objects.filter(pk__in=array).delete()
+       
+        return Response(status = status.HTTP_200_OK)
     @action(methods=['post'], detail=False, url_path='import', url_name='cma_import', perms_map = {'post':'cma_import'})
     def cma_import(self, request, pk=None):
         """
@@ -75,7 +81,6 @@ class CMAViewSet(ModelViewSet):
                         else:
                             return Response('不支持非xlsx格式', status = status.HTTP_400_BAD_REQUEST)
         return Response(status = status.HTTP_200_OK)
-    
     @action(methods=['post'], detail=False, url_path='import2', url_name='cma_import2', perms_map = {'post':'cma_import2'})
     def cma_import2(self, request, pk=None):
         """