fix:修复筛选条件和确认变更弹窗回调

src/router/routers/production-safety-router/productionSafetySystem.ts

@@ -8,7 +8,7 @@ const productionSafetySystemRoutes: RouteComponent[] = [{
   redirect: '/work-safety/production-safety-system/safety-assessment',
   meta: {
     title: '生产安全体系',
-    icon: 'CircuitBoard',
+    icon: 'Newspaper',
     isRoot: false,
     hidden: false,
     noCache: false,

src/router/routers/production-safety-router/responsibility-implementation.ts

@@ -9,7 +9,7 @@ const responsibilityImplementationRoutes: RouteComponent[] = [{
       redirect: '',
       meta: {
         title: '安全责任落实',
-        icon: 'Newspaper',
+        icon: 'BookOpenText',
         isRoot: false,
         hidden: false,
         noCache: false,

src/router/routers/production-safety-router/safetyCulture.ts

@@ -8,7 +8,7 @@ const safetyCultureRoutes: RouteComponent[] = [{
   redirect: '/work-safety/safety-culture/accident-case-management',
   meta: {
     title: '安全文化',
-    icon: 'BookText',
+    icon: 'CircuitBoard',
     isRoot: false,
     hidden: false,
     noCache: false,

src/router/routers/production-safety-router/safetyTrainingAndEducation.ts

@@ -8,7 +8,7 @@ const safetyTrainingAndEducationRoutes: RouteComponent[] = [{
   redirect: '/work-safety/safety-training-and-education/education-training-plan-management',
   meta: {
     title: '安全教育培训',
-    icon: 'BookOpenText',
+    icon: 'BookText',
     isRoot: false,
     hidden: false,
     noCache: false,

src/views/production-safety/implement-safety-duty/non-public-area-responsibilities/list.vue

@@ -218,6 +218,7 @@
     areaCheckListExportArea,
     queryChangedList,
   } from '@/api/production-safety/responsibility-implementation';
+  import confirmChange from './confirmChange.vue';
   import urlJoin from 'url-join';
   import { BatchImport } from '@/components/batch-import';
   import { Plus } from '@element-plus/icons-vue';
@@ -339,6 +340,7 @@ const changedVisible = ref(false)
   // 确认回调
   const handleConfirmChange = ()=>{
     changedDialogState.value = false
+    queryTableList();
   }
   const handleCancelChange = ()=>{
     changedDialogState.value = false

src/views/production-safety/implement-safety-duty/non-public-list-responsibilities/list.vue

@@ -218,6 +218,8 @@
             </div>
         </div>
     </el-dialog>
+    <!-- 确认弹窗 -->
+    <confirmChange :visible="changedDialogState" :params="changedParams" @confirm="handleConfirmChange" @cancel="handleCancelChange" />
   </div>
   <BatchImport
     :visible="batchImportVisible"
@@ -243,7 +245,7 @@
   } from '@/api/production-safety/responsibility-implementation';
   import urlJoin from 'url-join';
   import { BatchImport } from '@/components/batch-import';
-
+  import confirmChange from './confirmChange.vue';
   import { unformatAttachment } from '@/components/UploadFiles/utils';
   import { downloadFile } from '@/views/disaster/utils';
   import { useGlobSetting } from '@/hooks/setting';
@@ -312,9 +314,9 @@
       });
     }
   };
+  
   const changedVisible = ref(false)
 
-
   const changedListData = reactive({
   currentRecord:[],
   historiesRecords: {
@@ -368,20 +370,37 @@
     }
   }
 
+  const changedDialogState = ref(false)
+  const changedParams = reactive({})
+  // 弹出弹窗，修改必填项
   const handleAreaCheckListApprove = (scope, approveType) => {
+    if(approveType===1){
+        changedDialogState.value = true
+        Object.assign(changedParams, {
+            id: scope.row.id,
+            approveType
+        })
+        return 
+    }
     areaCheckListApprove({
       id: scope.row.id,
       approveType,
       refuseReason: null,
-    }).then(() => {
-      if (approveType === 1) {
-        ElMessage.success('请尽快修改该责任清单的安全责任所/中心、安全责任部门及相关负责人信息');
-      } else {
-        ElMessage.success('操作成功!');
-      }
+    }).then((res) => {
+      ElMessage.success('操作成功!');
       queryTableList();
     });
   };
+
+    // 确认回调
+  const handleConfirmChange = ()=>{
+    changedDialogState.value = false
+    queryTableList();
+  }
+  const handleCancelChange = ()=>{
+    changedDialogState.value = false
+  }
+
   const handleQueryAvailableUserList = (deptName = '', realname = '') => {
     queryAvailableUserList({
       pageNumber: 1,
@@ -420,6 +439,7 @@
       queryTableList();
     });
   };
+  
   const queryTableList = () => {
     areaCheckListQueryPage(queryParams).then((res) => {
       tableData.data = res.records;

src/views/production-safety/implement-safety-duty/public-area-responsibilities/list.vue

@@ -344,6 +344,7 @@
   // 确认回调
   const handleConfirmChange = ()=>{
     changedDialogState.value = false
+    queryTableList();
   }
   const handleCancelChange = ()=>{
     changedDialogState.value = false

src/views/production-safety/implement-safety-duty/public-list-responsibilities/list.vue

@@ -241,7 +241,7 @@
   import urlJoin from 'url-join';
   import { BatchImport } from '@/components/batch-import';
   import { Plus } from '@element-plus/icons-vue';
-
+  import confirmChange from './confirmChange.vue';
   import { downloadFile } from '@/views/disaster/utils';
   import { useGlobSetting } from '@/hooks/setting';
   import { formatDeptTree } from '@/views/disaster/utils/formatDeptTree';
@@ -373,8 +373,8 @@
       }));
     });
   };
+
   const changedDialogState = ref(false)
-  
   const changedParams = reactive({})
   // 弹出弹窗，修改必填项
   const handleAreaCheckListApprove = (scope, approveType) => {
@@ -398,6 +398,7 @@
   // 确认回调
   const handleConfirmChange = ()=>{
     changedDialogState.value = false
+    queryTableList();
   }
   const handleCancelChange = ()=>{
     changedDialogState.value = false

src/views/production-safety/safetyTrainingAndEducation/educationTrainingPlanManagement/configs/tables.ts

@@ -2,7 +2,7 @@
  * @Author: liuJie
  * @Date: 2026-02-03 17:55:50
  * @LastEditors: liuJie
- * @LastEditTime: 2026-03-13 11:31:24
+ * @LastEditTime: 2026-03-22 16:15:49
  * @Describe: file describe
  */
 import type { TableColumnProps } from '@/types/basic-table';
@@ -24,7 +24,7 @@ export interface DistributeParameters {
 
 // 状态选项
 export const STATUS_OPTIONS = [
-  { label: '全部', value: undefined },
+  { label: '全部', value: '全部' },
   { label: '未下发', value: 1 },
   { label: '进行中', value: 2 },
   { label: '已完成', value: 3 },

src/views/production-safety/safetyTrainingAndEducation/educationTrainingPlanManagement/educationTrainingPlanManagement.vue

@@ -31,7 +31,7 @@
               <div class="select-box--item">
                 <span>分类名称：</span>
                 <el-select
-                  v-model="tableQuery.queryParam.ClassifyName"
+                  v-model="tableQuery.queryParam.classifyName"
                   placeholder="请选择分类名称"
                   filterable
                   clearable
@@ -209,9 +209,19 @@
   async function getTableData() {
     tableConfig.loading = true;
     try {
-      tableQuery.queryParam.startDate = dateRange.value ? dateRange.value[0] : undefined;
-      tableQuery.queryParam.endDate = dateRange.value ? dateRange.value[1] : undefined;
-      const res = await getEducationAndTrainingProgramList(tableQuery);
+      let params = {
+        pageNumber: tableQuery.pageNumber,
+        pageSize: tableQuery.pageSize,
+        queryParam: {
+            // ...tableQuery.queryParam,
+            startTime: dateRange.value ? dateRange.value[0] : undefined,
+            endTime: dateRange.value ? dateRange.value[1] : undefined,
+            keyword: tableQuery.queryParam.keyword === ''?undefined: tableQuery.queryParam.keyword,
+            classifyName: tableQuery.queryParam.classifyName==='全部'? undefined :tableQuery.queryParam.classifyName,
+            status: tableQuery.queryParam.status==='全部'? undefined :tableQuery.queryParam.status
+        }
+      }
+      const res = await getEducationAndTrainingProgramList(params);
       if (res) {
         // 映射返回数据字段到表格字段
         tableData.value = res.records;

src/views/production-safety/safetyTrainingAndEducation/educationTrainingPlanManagementDept/configs/tables.ts

@@ -17,7 +17,7 @@ export const TABLE_OPTIONS = {
 
 // 状态选项
 export const STATUS_OPTIONS = [
-  { label: '全部', value: undefined },
+  { label: '全部', value: '全部' },
   { label: '未下发', value: 1 },
   { label: '进行中', value: 2 },
   { label: '已完成', value: 3 },

src/views/production-safety/safetyTrainingAndEducation/educationTrainingPlanManagementDept/educationTrainingPlanManagementDept.vue

@@ -311,9 +311,17 @@
   async function getTableData() {
     tableConfig.loading = true;
     try {
-      tableQuery.queryParam.datePlanStart = dateRange.value ? dateRange.value[0] : undefined;
-      tableQuery.queryParam.datePlanEnd = dateRange.value ? dateRange.value[1] : undefined;
-      const res = await getEducationAndTrainingProgramList(tableQuery);
+      let params = {
+        pageNumber: tableQuery.pageNumber,
+        pageSize: tableQuery.pageSize,
+        queryParam: {
+            ...tableQuery.queryParam,
+            datePlanStart: dateRange.value ? dateRange.value[0] : undefined,
+            datePlanEnd: dateRange.value ? dateRange.value[1] : undefined,
+            status: tableQuery.queryParam.status==='全部'? undefined :tableQuery.queryParam.status
+        }
+      }
+      const res = await getEducationAndTrainingProgramList(params);
       if (res) {
         // 映射返回数据字段到表格字段
         tableData.value = res.records;