Pārlūkot izejas kodu

fix: 修改导出,调整筛选参数

xiaweibo 1 mēnesi atpakaļ
vecāks
revīzija
e9082ab333

+ 4 - 4
src/api/production-safety-system/index.ts

@@ -1526,16 +1526,16 @@ export function exportAreaCheckPlanList (params: AreaCheckPlanQuery) {
  * 导出区域检查计划清单
  * @returns Promise<any> 导出的区域检查计划清单数据
  */
-export function exportAreaCheckInspectionRecord (id:number) {
+export function exportAreaCheckInspectionRecord (params: AreaCheckPlanQuery) {
   return http.request({
-    url: '/areaCheckPlanManageDept/exportAreaCheckRecord?id=' + id,
-    method: 'get',
+    url: '/areaCheckPlanManageDept/exportAreaCheckPlanDetail',
+    method: 'post',
     responseType: 'blob',
+    data: params,
   }, {
     isTransformResponse: false,
   });
 }
-
 /**
  * 导出区域检查计划管理
  * @returns Promise<any> 导出的区域检查计划管理数据

+ 10 - 1
src/views/production-safety/hiddenTroubleInvestigationAndGovernance/areaCheckPlanManagementDept/components/areaCheckPlanManagementDeptDetail.vue

@@ -674,7 +674,16 @@
   };
   const onRecordExport = async () => {
     try {
-      const response = await exportAreaCheckInspectionRecord(currentId.value);
+      const [start, end] = recordDateRange.value && recordDateRange.value.length === 2
+        ? recordDateRange.value
+        : ['', ''];
+      const queryParam = {
+          searchKey: recordSearchKeyword.value || undefined,
+          startDate: start || undefined,
+          endDate: end || undefined,
+          id: currentId.value || undefined,
+      };
+      const response = await exportAreaCheckInspectionRecord(queryParam);
       if (response) {
         const fileName = `检查记录_${new Date().toISOString().split('T')[0]}.xlsx`;
         downloadByData(response, fileName);

+ 4 - 4
src/views/production-safety/hiddenTroubleInvestigationAndGovernance/employeeReportHiddenTroubleManagement/employeeReportHiddenTroubleManagement.vue

@@ -16,7 +16,7 @@
               <div class="select-box--item">
                 <span>隐患问题:</span>
                 <el-input
-                  v-model="tableQuery.queryParam.keyword"
+                  v-model="tableQuery.queryParam.hazardDesc"
                   placeholder="请输入隐患问题"
                   class="act-search-input"
                 />
@@ -164,7 +164,7 @@
     pageNumber: pagination.pageNumber,
     pageSize: pagination.pageSize,
     queryParam: {
-      keyword: '',
+      hazardDesc: '',
       statusType: undefined,
       sourceTypeName: '',
     },
@@ -206,7 +206,7 @@
   };
 
   const handleReset = () => {
-    tableQuery.queryParam.keyword = '';
+    tableQuery.queryParam.hazardDesc = '';
     tableQuery.queryParam.statusType = undefined;
     tableQuery.queryParam.sourceTypeName = '';
     handleSearch();
@@ -230,7 +230,7 @@
   const handleDownload = async () => {
     try {
       const exportParams: QueryHiddenDangerReq = {
-        keyword: tableQuery.queryParam.keyword || undefined,
+        keyword: tableQuery.queryParam.hazardDesc || undefined,
         statusType: tableQuery.queryParam.statusType,
         sourceTypeName: tableQuery.queryParam.sourceTypeName || undefined,
       };