fix: 修改参数信息

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

@@ -4,7 +4,7 @@
       <div class="evaluation-header">
         <h1 class="evaluation-title">{{ activityRegistrationDetail.planName || '' }}</h1>
         <div class="evaluation-meta">
-          <span>考核部门: {{ activityRegistrationDetail.responsibleDeptName || '-' }}</span>
+          <span>分类名称: {{ activityRegistrationDetail.categoryName || '-' }}</span>
           <span>创建人: {{ activityRegistrationDetail.createdByName || '-' }}</span>
           <span>创建时间: {{ formatDateTime(activityRegistrationDetail.createdAt) || '-' }}</span>
         </div>
@@ -16,14 +16,27 @@
           <div class="act-search">
             <section class="select-box">
               <div class="select-box--item">
-                <span>员工工号/名称：</span>
-                <el-input v-model="tableQuery.queryParam.keyword" placeholder="搜索员工工号或名称" class="act-search-input" />
+                <span>部门名称：</span>
+                <el-cascader
+                  v-model="tableQuery.queryParam.responsibleDepartmentId"
+                  style="width: 170px"
+                  ref="cascaderRef"
+                  :options="firstLevelDepts"
+                  :props="cascaderProp"
+                  :show-all-levels="false"
+                  filterable
+                  @change="(val) => handleChangeDept(val, 'responsibleDepartmentId')"
+                />
               </div>
               <div class="select-box--item">
                 <span>报名日期：</span>
                 <el-date-picker v-model="tableQuery.queryParam.dateRange" type="daterange" range-separator="至"
                   start-placeholder="开始日期" end-placeholder="结束日期" value-format="YYYY-MM-DD" format="YYYY-MM-DD" />
               </div>
+              <div class="select-box--item">
+                <span>员工工号/名称：</span>
+                <el-input v-model="tableQuery.queryParam.keyword" placeholder="搜索员工工号或名称" class="act-search-input" />
+              </div>
             </section>
             <section class="search-btn">
               <el-button type="primary" @click="handleSearch">查询</el-button>
@@ -74,8 +87,8 @@
             <el-input v-model="normalForm.employeeContact" placeholder="请输入11位手机号码" maxlength="11"
               @input="handlePhoneInput" />
           </el-form-item>
-          <el-form-item label="个人先进描述：" prop="remark">
-            <el-input v-model="normalForm.remark" type="textarea" :rows="4" placeholder="请填写个人先进获取内容描述。" maxlength="300"
+          <el-form-item label="备注：" prop="remark">
+            <el-input v-model="normalForm.remark" type="textarea" :rows="4" placeholder="请填写备注。" maxlength="300"
               show-word-limit />
           </el-form-item>
         </el-form>
@@ -135,6 +148,8 @@ const tableQuery = reactive<QueryPageRequest<any>>({
     dateRange: null as any,
     startTime: '',
     endTime: '',
+    responsibleDepartmentId: '',
+    deptName: '',
   },
 });
 
@@ -179,16 +194,16 @@ const normalFormRules: FormRules = {
     { required: true, message: '请输入员工联系方式', trigger: 'blur' },
     { pattern: /^1[3-9]\d{9}$/, message: '请输入正确的11位手机号码', trigger: 'blur' },
   ],
-  remark: [
-    { required: true, message: '请输入个人先进描述', trigger: 'blur' },
-    { max: 300, message: '最多输入300个字符', trigger: 'blur' },
-  ],
+  // remark: [
+  //   { required: true, message: '请输入备注', trigger: 'blur' },
+  //   { max: 300, message: '最多输入300个字符', trigger: 'blur' },
+  // ],
 };
 
 const cascaderProp = {
   expandTrigger: 'click',
   checkStrictly: true,
-  // emitPath: false,
+  emitPath: false,
   value: 'id',
   label: 'deptName',
 };
@@ -217,6 +232,9 @@ async function getTableData() {
         keyword: tableQuery.queryParam.keyword,
         startDate: tableQuery.queryParam.startTime,
         endDate: tableQuery.queryParam.endTime,
+        deptId: tableQuery.queryParam.responsibleDepartmentId,
+        deptName: tableQuery.queryParam.deptName,
+        activityId: activityRegistrationId.value,
       },
     };
 
@@ -249,6 +267,8 @@ function handleSearch() {
 const handleReset = () => {
   tableQuery.queryParam.keyword = '';
   tableQuery.queryParam.dateRange = null;
+  tableQuery.queryParam.responsibleDepartmentId = '';
+  tableQuery.queryParam.deptName = '';
   handleSearch();
 };
 
@@ -423,7 +443,8 @@ const handleChangeDept = (val, prop) => {
   const deptInfo = cascader?.getCheckedNodes();
   if (deptInfo && deptInfo.length > 0) {
     normalForm.employeeDeptName = deptInfo[0].label;
-    normalForm.deptId = val[val.length - 1]
+    normalForm.deptId = val[val.length - 1];
+    // normalForm.deptName = deptInfo[0].label;
   } else {
     normalForm.employeeDeptName = '';
   }

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

@@ -160,13 +160,13 @@ export const ACTIVITY_REGISTRATION_ADVANCED_PERSON_TABLE_COLUMNS: TableColumnPro
   //   minWidth: '140px',
   // },
   {
-    label: '先进个人描述',
+    label: '备注',
     prop: 'remark',
     align: 'left',
     minWidth: '160px',
   },
   {
-    label: '上报日期',
+    label: '报名日期',
     prop: 'createdAt',
     align: 'left',
     minWidth: '150px',

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

@@ -60,7 +60,7 @@ export const INVENTORY_TABLE_COLUMNS: TableColumnProps[] = [
   },
   {
     label: '计划完成时间',
-    prop: 'createdAt',
+    prop: 'endTime',
     align: 'left',
     minWidth: '160px',
   },

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

@@ -4,7 +4,7 @@
       <div class="evaluation-header">
         <h1 class="evaluation-title">{{ activityRegistrationDetail.planName || '' }}</h1>
         <div class="evaluation-meta">
-          <span>考核部门: {{ activityRegistrationDetail.responsibleDeptName || '-' }}</span>
+          <span>分类名称: {{ activityRegistrationDetail.categoryName || '-' }}</span>
           <span>创建人: {{ activityRegistrationDetail.createdByName || '-' }}</span>
           <span>创建时间: {{ formatDateTime(activityRegistrationDetail.createdAt) || '-' }}</span>
         </div>
@@ -16,14 +16,27 @@
           <div class="act-search">
             <section class="select-box">
               <div class="select-box--item">
-                <span>员工工号/名称：</span>
-                <el-input v-model="tableQuery.queryParam.keyword" placeholder="搜索员工工号或名称" class="act-search-input" />
+                <span>部门名称：</span>
+                <el-cascader
+                  v-model="tableQuery.queryParam.responsibleDepartmentId"
+                  style="width: 170px"
+                  ref="cascaderRef"
+                  :options="firstLevelDepts"
+                  :props="cascaderProp"
+                  :show-all-levels="false"
+                  filterable
+                  @change="(val) => handleChangeDept(val, 'responsibleDepartmentId')"
+                />
               </div>
               <div class="select-box--item">
                 <span>报名日期：</span>
                 <el-date-picker v-model="tableQuery.queryParam.dateRange" type="daterange" range-separator="至"
                   start-placeholder="开始日期" end-placeholder="结束日期" value-format="YYYY-MM-DD" format="YYYY-MM-DD" />
               </div>
+              <div class="select-box--item">
+                <span>员工工号/名称：</span>
+                <el-input v-model="tableQuery.queryParam.keyword" placeholder="搜索员工工号或名称" class="act-search-input" />
+              </div>
             </section>
             <section class="search-btn">
               <el-button type="primary" @click="handleSearch">查询</el-button>
@@ -74,8 +87,8 @@
             <el-input v-model="normalForm.employeeContact" placeholder="请输入11位手机号码" maxlength="11"
               @input="handlePhoneInput" />
           </el-form-item>
-          <el-form-item label="个人先进描述：" prop="remark">
-            <el-input v-model="normalForm.remark" type="textarea" :rows="4" placeholder="请填写个人先进获取内容描述。" maxlength="300"
+          <el-form-item label="备注：" prop="remark">
+            <el-input v-model="normalForm.remark" type="textarea" :rows="4" placeholder="请填写备注。" maxlength="300"
               show-word-limit />
           </el-form-item>
         </el-form>
@@ -135,6 +148,7 @@ const tableQuery = reactive<QueryPageRequest<any>>({
     dateRange: null as any,
     startTime: '',
     endTime: '',
+    responsibleDepartmentId: null as any,
   },
 });
 
@@ -179,16 +193,16 @@ const normalFormRules: FormRules = {
     { required: true, message: '请输入员工联系方式', trigger: 'blur' },
     { pattern: /^1[3-9]\d{9}$/, message: '请输入正确的11位手机号码', trigger: 'blur' },
   ],
-  remark: [
-    { required: true, message: '请输入个人先进描述', trigger: 'blur' },
-    { max: 300, message: '最多输入300个字符', trigger: 'blur' },
-  ],
+  // remark: [
+  //   { required: true, message: '请输入个人先进描述', trigger: 'blur' },
+  //   { max: 300, message: '最多输入300个字符', trigger: 'blur' },
+  // ],
 };
 
 const cascaderProp = {
   expandTrigger: 'click',
   checkStrictly: true,
-  // emitPath: false,
+  emitPath: false,
   value: 'id',
   label: 'deptName',
 };
@@ -218,6 +232,7 @@ async function getTableData() {
         startDate: tableQuery.queryParam.startTime,
         endDate: tableQuery.queryParam.endTime,
         activityId: activityRegistrationId.value,
+        deptId: tableQuery.queryParam.responsibleDepartmentId,
       },
     };
 

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

@@ -160,13 +160,13 @@ export const ACTIVITY_REGISTRATION_ADVANCED_PERSON_TABLE_COLUMNS: TableColumnPro
   //   minWidth: '140px',
   // },
   {
-    label: '先进个人描述',
+    label: '备注',
     prop: 'remark',
     align: 'left',
     minWidth: '160px',
   },
   {
-    label: '上报日期',
+    label: '报名日期',
     prop: 'createdAt',
     align: 'left',
     minWidth: '150px',

src/views/production-safety/safety-culture/safetyCultureActivityManagementExecutor/configs/tables.ts

@@ -60,7 +60,7 @@ export const INVENTORY_TABLE_COLUMNS: TableColumnProps[] = [
   },
   {
     label: '计划完成时间',
-    prop: 'createdAt',
+    prop: 'endTime',
     align: 'left',
     minWidth: '160px',
   },

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

@@ -27,7 +27,7 @@
               <div class="select-box--item">
                 <span>状态：</span>
                 <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
-                  <el-option label="未下发" :value="1" />
+                  <!-- <el-option label="未下发" :value="1" /> -->
                   <el-option label="待反馈" :value="2" />
                   <el-option label="已完成" :value="3" />
                 </el-select>