From 5dc82ff6ee034c2589e6c0eea357730a8bfcff87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E5=BB=B6=E7=A6=8F?= <>
Date: Tue, 4 Jul 2023 10:07:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E8=8D=89=E7=A8=BF?=
 =?UTF-8?q?=E4=BC=9A=E5=8F=91=E8=B5=B7=E6=B5=81=E7=A8=8B=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/service/task.service.ts                   |  4 +--
 src/views/hiddenDanger/manager.component.vue  |  2 +-
 .../hiddenDanger/safe/action.component.vue    | 26 ++++++++++++++++---
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/service/task.service.ts b/src/service/task.service.ts
index 9f685b2..be5726f 100644
--- a/src/service/task.service.ts
+++ b/src/service/task.service.ts
@@ -11,9 +11,9 @@ export default class TaskService extends BaseService<any>{
         return this.get(url,params,true)
     }
     // 批量删除
-    public deleteByIds(params):Promise<AxiosResponse<ActionResult<any>>>{
+    public deleteByIds(params,showLoading?):Promise<AxiosResponse<ActionResult<any>>>{
         const url = this.prefix.prevention+'/danger/trouble';
-        return this.deleteBatch(url,params,{},true)
+        return this.deleteBatch(url,params,{},showLoading)
     }
     public selectById(id:any,showLoading?:boolean):Promise<AxiosResponse<ActionResult<any>>>{
         const url = this.prefix.prevention+'/danger/task/'+id;
diff --git a/src/views/hiddenDanger/manager.component.vue b/src/views/hiddenDanger/manager.component.vue
index c4e02ef..5cd7867 100644
--- a/src/views/hiddenDanger/manager.component.vue
+++ b/src/views/hiddenDanger/manager.component.vue
@@ -983,7 +983,7 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
         
         this.tableService.addOrUpdate(this.updateParams,!this.updateParams.id).then(res=>{
             this.$message.success(!this.updateParams.id?"新增成功":"编辑成功");
-            if(!preStatus){
+            if(!preStatus && isSubmit){
                 this.startWorkFlow([res.data],[this.updateParams.reformUserId])
             }else{
                 this.workFlowService.taskHandle(handleParams).then((data)=>{
diff --git a/src/views/hiddenDanger/safe/action.component.vue b/src/views/hiddenDanger/safe/action.component.vue
index 758b7d9..17c2c20 100644
--- a/src/views/hiddenDanger/safe/action.component.vue
+++ b/src/views/hiddenDanger/safe/action.component.vue
@@ -386,8 +386,10 @@ export default class RulesManagerComponent extends BaseRecordComponent<any> {
         }else if(data.value === "selectAll"){
             this.selectAll()
         }else if(data.value === "delete"){
-            this.deleteData(this.selectData.map((item:any)=>item.id))
-            this.getTroubleList();
+            this.deleteData(this.selectData.map((item:any)=>item.id));
+            setTimeout(()=>{
+                this.getTroubleList()
+            })
         }else if(data.value ==="fixed"){
             this.showMap = true
 
@@ -398,6 +400,23 @@ export default class RulesManagerComponent extends BaseRecordComponent<any> {
         }
     }
 
+    public deleteData(ids){
+        if(!ids.length){
+            return
+        }else{
+            this.$confirm("确认删除所选数据？","确认数据",{
+                type: 'warning'
+            }).then(()=>{
+              this.tableService.deleteByIds(ids,true).then((res:any)=>{
+                this.$message.success("删除成功！");
+                this.getTroubleList();
+              })
+            }).catch(()=>{
+              //
+            })
+        }
+    }
+
     public doSave(){
         this.updateParams.resourceId = this.photoList.map(item=>item.id).join(",")
         this.updateParams.resourceName = this.photoList.map(item=>item.name).join(",")
@@ -532,7 +551,7 @@ export default class RulesManagerComponent extends BaseRecordComponent<any> {
                 delete this.updateParams.photo;
             }
 
-            Object.assign(this.updateParams,{
+            this.updateParams = Object.assign({
                 classifyName:this.$store.getters.prevention_dangrous_type_map[row.classify],
                 dangerTypeName:this.$store.getters.prevention_danger_type_map[row.dangerType],
                 inspectTypeName:this.$store.getters.prevention_danger_check_type_map[row.inspectType],
@@ -615,7 +634,6 @@ export default class RulesManagerComponent extends BaseRecordComponent<any> {
     public getTroubleList(){
         this.tableService.getTroubleList(this.recordParams).then((res:any)=>{
             this.troubleTableData =res.data.map(data=>{
-
                 data.urls = data.resources.map(source=>source.resourceUrl) || [];
                 return data
             });