Bläddra i källkod

Merge branch 'fix/production-safety' into 'dev'

fix:修复员工上报筛选数据问题

See merge request product-group-fe/sfy-safety-group/sfy-safety!384
ai0197(吴云丰) 3 veckor sedan
förälder
incheckning
7fd4290747

+ 9 - 9
src/views/production-safety/hiddenTroubleInvestigationAndGovernance/hiddenTroubleReviewManagement/hiddenTroubleReviewManagement.vue

@@ -18,8 +18,8 @@
               <div class="select-box--item">
                 <span>隐患问题:</span>
                 <el-input
-                  v-model="tableQuery.queryParam.keyword"
-                  placeholder="请输入隐患问题、地点、姓名、工号或联系电话"
+                  v-model="tableQuery.queryParam.hazardDesc"
+                  placeholder="请输入隐患问题"
                   class="act-search-input"
                 />
               </div>
@@ -148,9 +148,9 @@
     pageNumber: pagination.pageNumber,
     pageSize: pagination.pageSize,
     queryParam: {
-      keyword: '',
+      hazardDesc: undefined,
       statusType: undefined,
-      sourceTypeName: '',
+      sourceTypeName: undefined,
     },
   });
 
@@ -190,9 +190,9 @@
   };
 
   const handleReset = () => {
-    tableQuery.queryParam.keyword = '';
+    tableQuery.queryParam.hazardDesc = undefined;
     tableQuery.queryParam.statusType = undefined;
-    tableQuery.queryParam.sourceTypeName = '';
+    tableQuery.queryParam.sourceTypeName = undefined;
     handleSearch();
   };
 
@@ -213,7 +213,7 @@
   const handleDownload = async () => {
     try {
       const exportParams: QueryHiddenDangerReq = {
-        keyword: tableQuery.queryParam.keyword || undefined,
+        hazardDesc: tableQuery.queryParam.hazardDesc || undefined,
         statusType: tableQuery.queryParam.statusType,
         sourceTypeName: tableQuery.queryParam.sourceTypeName || undefined,
       };
@@ -223,7 +223,7 @@
         downloadByData(response, fileName);
         ElMessage.success('导出成功');
       }
-    } catch (e) {
+    } catch (e:any) {
       console.error('导出隐患上报失败:', e);
       ElMessage.error(e?.message || e?.data || '导出失败,请重试');
     }
@@ -263,7 +263,7 @@
       await accountEmployeeHazardReport(hazardId);
       ElMessage.success('入账成功');
       getTableData();
-    } catch (e) {
+    } catch (e:any) {
       console.error('入账失败:', e);
       ElMessage.error(e?.message || e?.data || '入账失败,请重试');
     }