fix: 修改举一反三参数,修改安全文化活动管理相关字段

src/api/drawLessons/index.ts

@@ -180,7 +180,7 @@ export interface IssueDrawLessonsRequest {
   /** 计划开始日期（下发弹窗） */
   planStartDate?: string;
   /** 计划结束时间（下发弹窗） */
-  planEndTime?: string;
+  planEndDate?: string;
 }
 
 export function issueDrawLessons(data: IssueDrawLessonsRequest) {

src/views/production-safety/hiddenTroubleInvestigationAndGovernance/oneByOneManagement/oneByOneManagement.vue

@@ -165,9 +165,9 @@
             style="width: 100%"
           />
         </el-form-item>
-        <el-form-item label="计划结束时间" prop="planEndTime" required>
+        <el-form-item label="计划结束时间" prop="planEndDate" required>
           <el-date-picker
-            v-model="issueForm.planEndTime"
+            v-model="issueForm.planEndDate"
             type="date"
             value-format="YYYY-MM-DD"
             placeholder="选择计划结束日期"
@@ -394,12 +394,12 @@
     groupDeptId: undefined as number | undefined,
     groupDeptName: '',
     planStartDate: '',
-    planEndTime: '',
+    planEndDate: '',
   });
   const issueRules: FormRules = {
     groupDeptId: [{ required: true, message: '请选择分组名称', trigger: 'change' }],
     planStartDate: [{ required: true, message: '请选择计划开始日期', trigger: 'change' }],
-    planEndTime: [{ required: true, message: '请选择计划结束时间', trigger: 'change' }],
+    planEndDate: [{ required: true, message: '请选择计划结束时间', trigger: 'change' }],
   };
   const groupOptions = ref<Array<{ id: number; deptName: string }>>([]);
 
@@ -453,14 +453,14 @@
       groupDeptId: undefined,
       groupDeptName: '',
       planStartDate: '',
-      planEndTime: '',
+      planEndDate: '',
     };
     currentIssueRow.value = null;
   }
 
   function handleSend(row: { id: number; dangerId?: number; associationOneThree?: string }) {
     currentIssueRow.value = { id: row.id, dangerId: row.dangerId, associationOneThree: row.associationOneThree };
-    issueForm.value = { groupDeptId: undefined, groupDeptName: '', planStartDate: '', planEndTime: '' };
+    issueForm.value = { groupDeptId: undefined, groupDeptName: '', planStartDate: '', planEndDate: '' };
     showIssueDialog.value = true;
   }
 
@@ -474,9 +474,9 @@
         executGroupIds: issueForm.value.groupDeptId,
         associationOtObligationDeptName: issueForm.value.groupDeptName,
         associationOneThree: currentIssueRow.value.associationOneThree,
-        associationOtTimeLimit: issueForm.value.planEndTime || undefined,
+        associationOtTimeLimit: issueForm.value.planEndDate || undefined,
         planStartDate: issueForm.value.planStartDate || undefined,
-        planEndTime: issueForm.value.planEndTime || undefined,
+        planEndDate: issueForm.value.planEndDate || undefined,
       });
       ElMessage.success('下发成功');
       showIssueDialog.value = false;

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

@@ -17,7 +17,7 @@
             <section class="select-box">
               <div class="select-box--item">
                 <span>员工工号/名称：</span>
-                <el-input v-model="tableQuery.queryParam.userName" placeholder="搜索员工工号或名称" class="act-search-input" />
+                <el-input v-model="tableQuery.queryParam.keyword" placeholder="搜索员工工号或名称" class="act-search-input" />
               </div>
               <div class="select-box--item">
                 <span>报名日期：</span>
@@ -31,9 +31,9 @@
               <el-button type="primary" style="margin:0 10px;" @click="selectDeptType">
                 添加
               </el-button>
-              <el-button plain @click="handleExport">
+              <!-- <el-button plain @click="handleExport">
                 导出
-              </el-button>
+              </el-button> -->
             </section>
           </div>
         </header>
@@ -60,7 +60,7 @@
         <!-- 普通部门表单 -->
         <el-form ref="normalFormRef" :model="normalForm" :rules="normalFormRules" label-width="140px">
           <el-form-item label="部门名称" prop="employeeDeptName">
-            <el-cascader style="width: 50%" size="large" :ref="(el) => (cascaderRef['employeeDeptName'] = el)"
+            <el-cascader style="width: 100%" size="large" :ref="(el) => (cascaderRef['employeeDeptName'] = el)"
               :options="firstLevelDepts" :props="cascaderProp" :show-all-levels="false" placeholder="请选择安全责任部门"
               filterable v-model="normalForm.deptId" @change="(val) => handleChangeDept(val, 'employeeDeptName')" />
           </el-form-item>
@@ -131,7 +131,7 @@ const tableQuery = reactive<QueryPageRequest<any>>({
   pageNumber: pagination.pageNumber,
   pageSize: pagination.pageSize,
   queryParam: {
-    userName: '',
+    keyword: '',
     dateRange: null as any,
     startTime: '',
     endTime: '',
@@ -166,7 +166,7 @@ const normalForm = reactive({
 const firstLevelDepts = ref<any[]>([]);
 
 const normalFormRules: FormRules = {
-  deptId: [
+  employeeDeptName: [
     { required: true, message: '请选择部门名称', trigger: 'blur' },
   ],
   employeeCode: [
@@ -214,9 +214,9 @@ async function getTableData() {
       pageNumber: tableQuery.pageNumber,
       pageSize: tableQuery.pageSize,
       queryParam: {
-        employeeKeyword: tableQuery.queryParam.userName,
-        registrationDateStart: tableQuery.queryParam.startTime,
-        registrationDateEnd: tableQuery.queryParam.endTime,
+        keyword: tableQuery.queryParam.keyword,
+        startDate: tableQuery.queryParam.startTime,
+        endDate: tableQuery.queryParam.endTime,
       },
     };
 
@@ -247,7 +247,7 @@ function handleSearch() {
 }
 
 const handleReset = () => {
-  tableQuery.queryParam.userName = '';
+  tableQuery.queryParam.keyword = '';
   tableQuery.queryParam.dateRange = null;
   handleSearch();
 };

src/views/production-safety/safety-culture/safetyCultureActivityManagement/configs/activityTargetTables.ts

@@ -153,12 +153,12 @@ export const ACTIVITY_REGISTRATION_ADVANCED_PERSON_TABLE_COLUMNS: TableColumnPro
     align: 'left',
     minWidth: '150px',
   },
-  {
-    label: '部门负责人',
-    prop: 'departmentLeader',
-    align: 'left',
-    minWidth: '140px',
-  },
+  // {
+  //   label: '部门负责人',
+  //   prop: 'departmentLeader',
+  //   align: 'left',
+  //   minWidth: '140px',
+  // },
   {
     label: '先进个人描述',
     prop: 'remark',

src/views/production-safety/safety-culture/safetyCultureActivityManagement/safetyCultureActivityManagement.vue

@@ -55,11 +55,11 @@
         <div class="batch-table">
           <BasicTable ref="basicTableRef" :tableData="tableData" :tableConfig="tableConfig"
             @update:pageSize="handleSizeChange" @update:pageNumber="handleCurrentChange">
-            <template #actionContent="scope">
+            <!-- <template #actionContent="scope">
               <span class="action-content" @click="activityRegistration(scope.row.id)">
                 {{ scope.row.actionContent || '-'}}
               </span>
-            </template>
+            </template> -->
             <template #action="scope">
               <div class="action-container--div" style="justify-content: left">
                 <ActionButton text="编辑" v-if="scope.row.status === 1" @click="handleEdit(scope.row.id)" />
@@ -68,7 +68,7 @@
                 }" @confirm="handleDelete(scope.row.id)" />
                 <ActionButton text="查看" @click="handleView(scope.row.id)" />
                 <ActionButton text="下发" @click="handleDispatch(scope.row.id)" v-if="scope.row.status === 1"/>
-                <ActionButton text="活动报名" @click="" v-if="scope.row.status !== 1"/>
+                <ActionButton text="活动报名" @click="activityRegistration(scope.row.id)" v-if="scope.row.status !== 1"/>
               </div>
             </template>
           </BasicTable>