Merge branch 'ch/dongwu1.4' of eta_mini/eta_mini_crm_front into master_dw

src/views/pushReportList/components/bulkOperations.vue

@@ -113,7 +113,7 @@
             reqData.SelectedIds = props.allHandUncheckDataId
             reqData.IsSelectAll = true
         } else {
-            const selectedRowsId = props.selectedRows.map(item => item.ReportId)
+            const selectedRowsId = props.selectedRows.map(item => item.ReportPushStatusId)
             reqData.SelectedIds = selectedRowsId
             reqData.IsSelectAll = false
         }
@@ -143,7 +143,7 @@
             reqData.SelectedIds = props.allHandUncheckDataId
             reqData.IsSelectAll = true
         } else {
-            const selectedRowsId = props.selectedRows.map(item => item.ReportId)
+            const selectedRowsId = props.selectedRows.map(item => item.ReportPushStatusId)
             reqData.SelectedIds = selectedRowsId
             reqData.IsSelectAll = false
         }

src/views/pushReportList/index.vue

@@ -163,7 +163,7 @@ import { tr } from 'element-plus/es/locale/index.mjs';
     console.log(selectAll);
     // 反选的数据
 
-    allHandUncheckDataId.value = [...allHandUncheckData._value, ...uncheckData._value].map(item => item.ReportId) // 获取当前表格选中数据中，手动未选中的数据
+    allHandUncheckDataId.value = [...allHandUncheckData._value, ...uncheckData._value].map(item => item.ReportPushStatusId) // 获取当前表格选中数据中，手动未选中的数据
     selectedRows.value.length > 0 ? showBulkOperations.value = true : ElMessage.warning('请选择报告');
   }
 
@@ -171,7 +171,7 @@ import { tr } from 'element-plus/es/locale/index.mjs';
   async function handleReportCancelPublish(e){
     await ElMessageBox.confirm('是否确认撤销改报告','提示')
     const res=await apiReportPush.reportPushCancel({
-      ReportId:e.ReportId
+      ReportPushStatusId:e.ReportPushStatusId
     })
     if(res.Ret===200){
       ElMessage.success('撤销成功')
@@ -182,7 +182,7 @@ import { tr } from 'element-plus/es/locale/index.mjs';
   // 推送
   async function handleReportPublish(e){
     const res=await apiReportPush.reportPush({
-      ReportId:e.ReportId
+      ReportPushStatusId:e.ReportPushStatusId
     })
     if(res.Ret===200){
       ElMessage.success('推送APP成功')