Sfoglia il codice sorgente

fix: 修改参数问题

xiaweibo 1 mese fa
parent
commit
be9025b1ef

+ 2 - 2
src/api/safety-culture/index.ts

@@ -37,8 +37,8 @@ export interface safetyCultureFileQuery {
   keyword?: string; // 文件名称/编号(模糊查询)
   status?: number; // 状态:1-启用,0-禁用
   classifyName?: string; // 分类名称
-  startDate?: string; // 上传日期范围-开始日期
-  endDate?: string; // 上传日期范围-结束日期
+  startTime?: string; // 上传日期范围-开始日期
+  endTime?: string; // 上传日期范围-结束日期
 }
 
 /**

+ 1 - 1
src/views/production-safety/safety-culture/safetyCultureActivityManagement/components/activityRegistrationManagement.vue

@@ -6,7 +6,7 @@
         <div class="evaluation-meta">
           <span>考核部门: {{ activityRegistrationDetail.responsibleDeptName || '-' }}</span>
           <span>创建人: {{ activityRegistrationDetail.createdByName || '-' }}</span>
-          <span>创建时间: {{ formatDateTime(activityRegistrationDetail.startTime) || '-' }}</span>
+          <span>创建时间: {{ formatDateTime(activityRegistrationDetail.createdAt) || '-' }}</span>
         </div>
       </div>
     </header>

+ 1 - 1
src/views/production-safety/safety-culture/safetyCultureActivityManagementExecutor/components/activityRegistrationManagement.vue

@@ -6,7 +6,7 @@
         <div class="evaluation-meta">
           <span>考核部门: {{ activityRegistrationDetail.responsibleDeptName || '-' }}</span>
           <span>创建人: {{ activityRegistrationDetail.createdByName || '-' }}</span>
-          <span>创建时间: {{ formatDateTime(activityRegistrationDetail.startTime) || '-' }}</span>
+          <span>创建时间: {{ formatDateTime(activityRegistrationDetail.createdAt) || '-' }}</span>
         </div>
       </div>
     </header>

+ 1 - 1
src/views/production-safety/safety-culture/safetyPublicityBoardManagement/components/safetyPublicityBoardManagementDetail.vue

@@ -220,7 +220,7 @@
         ruleFormData.materialName = res.materialName || '';
         ruleFormData.categoryName = res.categoryName || '';
         ruleFormData.description = res.description || '';
-       ruleFormData.attachmentUrl = JSON.parse(res.attachmentUrl || res.fileUrl || '');
+        ruleFormData.attachmentUrl = JSON.parse(res.attachmentUrl || res.fileUrl || '');
         ruleFormData.status = res.status ?? 1;
       }
       cloneRuleFormData();

+ 1 - 0
src/views/production-safety/safety-culture/safetyPublicityBoardManagement/configs/form.ts

@@ -47,4 +47,5 @@ export const ACADEMY_FILE_FORM_RULES = {
   materialName: [{ required: true, message: '请输入宣传资料名称', trigger: 'blur' }],
   categoryName: [{ required: true, message: '请选择分类名称', trigger: 'change' }],
   description: [{ required: true, message: '请输入资料描述', trigger: 'blur' }],
+  attachmentUrl: [{ required: true, message: '请上传文档', trigger: 'change' }],
 };

+ 13 - 13
src/views/production-safety/safety-culture/safetyPublicityBoardManagement/safetyPublicityBoardManagement.vue

@@ -113,8 +113,8 @@ const queryParams = reactive<safetyCultureFileQuery>({
   keyword: '', // 文件名称/编号(模糊查询)
   status: undefined, // 状态:1-启用,0-禁用
   classifyName: '', // 分类名称:外部院级文件/内部院级文件
-  startDate: '', // 上传日期范围-开始日期
-  endDate: '', // 上传日期范围-结束日期
+  startTime: '', // 上传日期范围-开始日期
+  endTime: '', // 上传日期范围-结束日期
 });
 
 // 上传日期范围(用于日期选择器)
@@ -141,8 +141,8 @@ async function getTableData() {
         keyword: queryParams.keyword || undefined,
         status: queryParams.status,
         classifyName: queryParams.classifyName || undefined,
-        startDate: queryParams.startDate || undefined,
-        endDate: queryParams.endDate || undefined,
+        startTime: queryParams.startTime || undefined,
+        endTime: queryParams.endTime || undefined,
       },
     };
     const res = await querySafetyPublicityBoardPage(pageQuery);
@@ -153,7 +153,7 @@ async function getTableData() {
         status: item.status,
         categoryName: item.categoryName || item.classifyName,
         fileCode: item.description || '-',
-        fileVersion: item.uploadTime || item.createdAt || item.updatedAt || '-',
+        fileVersion: item.createdAt,
         attachmentUrl: item.attachmentUrl,
         fileUrl: item.fileUrl,
       }));
@@ -171,11 +171,11 @@ async function getTableData() {
 const handleSearch = () => {
   // 处理日期范围
   if (uploadDateRange.value && uploadDateRange.value.length === 2) {
-    queryParams.startDate = uploadDateRange.value[0];
-    queryParams.endDate = uploadDateRange.value[1];
+    queryParams.startTime = uploadDateRange.value[0];
+    queryParams.endTime = uploadDateRange.value[1];
   } else {
-    queryParams.startDate = '';
-    queryParams.endDate = '';
+    queryParams.startTime = '';
+    queryParams.endTime = '';
   }
 
   pagination.pageNumber = 1;
@@ -186,8 +186,8 @@ const handleReset = () => {
   queryParams.keyword = '';
   queryParams.status = undefined;
   queryParams.classifyName = '';
-  queryParams.startDate = '';
-  queryParams.endDate = '';
+  queryParams.startTime = '';
+  queryParams.endTime = '';
   uploadDateRange.value = null;
   handleSearch();
 };
@@ -213,8 +213,8 @@ const handleDownload = async () => {
       keyword: queryParams.keyword || undefined,
       status: queryParams.status,
       classifyName: queryParams.classifyName || undefined,
-      startDate: queryParams.startDate || undefined,
-      endDate: queryParams.endDate || undefined,
+      startTime: queryParams.startTime || undefined,
+      endTime: queryParams.endTime || undefined,
     };
     // const response = await exportSafetyCultureMaterials(exportParams, queryParams.classifyName || undefined);
     // if (response) {