From 818021df6e63d38afefcd27e46e6042ce3b3ba4b Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Tue, 7 Mar 2023 11:22:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4=E6=89=80?=
 =?UTF-8?q?=E5=B1=9E=E5=85=AC=E5=8F=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/views/ability/cma2.vue | 33 +++++++++++++++++++++++++++++--
 server/apps/ability/views.py      | 10 +++++++---
 2 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/client/src/views/ability/cma2.vue b/client/src/views/ability/cma2.vue
index 4ef2396..9175972 100644
--- a/client/src/views/ability/cma2.vue
+++ b/client/src/views/ability/cma2.vue
@@ -72,7 +72,8 @@
         </div>
         <el-button slot="reference">导入分子公司能力</el-button>
       </el-popover>
-       <el-button @click="delAll()"  v-if="checkPermission(['cma_deletes'])">批量删除</el-button>
+       <el-button @click="delAll()"  v-if="checkPermission(['cma_deletes'])" type="danger" plain>批量删除</el-button>
+       <el-button @click="delAll2()"  v-if="checkPermission(['cma_deletes'])" type="danger" plain>批量删除所属公司</el-button>
     </div>
     </el-card>
     <el-card style="margin-top: 10px">
@@ -388,7 +389,35 @@ export default {
         .catch((err) => {
         });
     },
-            
+    delAll2() {
+      let sszx = this.listQuery.sszx
+          if(sszx==null || sszx==='' || sszx == undefined){
+            this.$message({
+            message: "请选中所属公司",
+            type: "warning",
+          });
+          return
+          }
+         this.$confirm("确认删除?", "警告", {
+        confirmButtonText: "确认",
+        cancelButtonText: "取消",
+        type: "error",
+      })
+        .then(async () => {
+          
+      let data = { sszx: sszx };
+      deletes(data)
+        .then((res) => {
+          this.$message({
+            message: "删除成功",
+            type: "success",
+          });
+           this.getList();
+        })
+     })
+        .catch((err) => {
+        });
+    },
     handleSelectionChange(val) {
                 this.multipleSelection = val;
             },
diff --git a/server/apps/ability/views.py b/server/apps/ability/views.py
index 16a02ee..fa1a002 100644
--- a/server/apps/ability/views.py
+++ b/server/apps/ability/views.py
@@ -186,10 +186,14 @@ class CMAViewSet(RecordMixin, ModelViewSet):
     @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()
-       
+        array = request.data.get('ids', []) 
+        sszx = request.data.get('sszx', None)
+        if array:
+            CMA.objects.filter(sszx__id=sszx).delete()
+        elif sszx:
+            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):
         """