From 03dc95ca3654e5a02ede19413a8d0db87de3ed5a Mon Sep 17 00:00:00 2001
From: zhoulingpo <zhoulingpo>
Date: Fri, 28 Apr 2023 23:18:03 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E7=9B=91?=
 =?UTF-8?q?=E6=8E=A7=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/reportTable.vue                 | 18 +++++++++---------
 src/views/permissionApplication/launch.vue     | 12 +++++++++++-
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/views/permissionApplication/components/reportTable.vue b/src/views/permissionApplication/components/reportTable.vue
index 7016468..eb9b908 100644
--- a/src/views/permissionApplication/components/reportTable.vue
+++ b/src/views/permissionApplication/components/reportTable.vue
@@ -179,15 +179,15 @@ export default {
                 reportList=reportList.map(item=>{
                   return item.reportId
                 })
-                this.$api.permissionProcess.deletReport({ids:idsList}).then(()=>{
+                // this.$api.permissionProcess.deletReport({ids:idsList}).then(()=>{
                   if(reportList.length>0){
                     let reportids= row.map(item=>item.reportId)
                     newValue=this.value.filter(item =>
                         reportids.indexOf(item.reportId)==-1
                       )
-                    this.$emit('updateTable', newValue)
+                    this.$emit('updateTable', newValue,reportids)
                   }
-                })
+                // })
               }else{
                 if(reportList.length>0){
                   reportList=reportList.map(item=>{
@@ -195,7 +195,7 @@ export default {
                   })
                   newValue=this.value.filter(item => reportList.indexOf(item.reportId)==-1
                   )
-                  this.$emit('updateTable', newValue)
+                  this.$emit('updateTable', newValue,[])
                 }
               }
 
@@ -214,14 +214,14 @@ export default {
           }).then(() => {
             if (this.$route.query.taskDefinitionKey == 'aid4' ){
               if(row.id && row.id !=''){
-                this.$api.permissionProcess.deletReport({ids:[row.id]}).then(()=>{
-                  this.$emit('updateTable',this.value.filter(item => item.id !== row.id))
-                })
+                // this.$api.permissionProcess.deletReport({ids:[row.id]}).then(()=>{
+                  this.$emit('updateTable',this.value.filter(item => item.id !== row.id),[row.id])
+                // })
               }else{
-                this.$emit('updateTable', this.value.filter(item => item.reportId !== row.reportId))
+                this.$emit('updateTable', this.value.filter(item => item.reportId !== row.reportId),[])
               }
             }else{
-              this.$emit('updateTable', this.value.filter(item => item.reportId !== row.reportId))
+              this.$emit('updateTable', this.value.filter(item => item.reportId !== row.reportId),[])
             }
 
           })
diff --git a/src/views/permissionApplication/launch.vue b/src/views/permissionApplication/launch.vue
index 05bfc93..87fc481 100644
--- a/src/views/permissionApplication/launch.vue
+++ b/src/views/permissionApplication/launch.vue
@@ -19,7 +19,7 @@
             </el-row>
           </el-form>
           <el-row>
-            <report-table v-model="tableData" @updateTable="(newValue)=>{tableData=newValue}" :disabled="showTableD"></report-table>
+            <report-table v-model="tableData" @updateTable="(newValue,jiaVlue)=>{tableData=newValue;delData=jiaVlue}" :disabled="showTableD"></report-table>
           </el-row>
           <el-row>
             <el-form ref="applicationFormRef" :model="applicationForm" label-width="150px"
@@ -123,6 +123,7 @@ export default {
   mixins: [processMixin],
   data() {
     return {
+      delData:[],
       showTableD: false,
       initShow: false, // 控制审批历史是否显示 只有在不是第一次的时候才是true
       treeType: '',
@@ -295,6 +296,12 @@ export default {
     }
   },
   methods: {
+    // 真删除接口
+    delDatas(){
+
+        this.$api.permissionProcess.deletReport({ids:this.delData}).then(()=>{})
+
+    },
     handleCheck(name) {
       if (this.formControl) {
         return false
@@ -429,6 +436,9 @@ export default {
                 if (this.initShow) {
                   this.JuggleSub(this.taskId).then(res=>{
                     if(res){
+                      if(this.delData){
+                        this.delDatas()
+                      }
                       let dataJson = JSON.stringify(this.tableData)
                       let submitJson = JSON.stringify({...this.assignForm, userId: this.$store.getters.userInfo.usid,approvalOpinion:this.assignForm.remark})
                       this.completeProcess({