From 06af4c3dbf36fb5de85f45ef00c6fed7d3280b27 Mon Sep 17 00:00:00 2001
From: hs <873121290@qq.com>
Date: Thu, 21 May 2026 15:39:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=B1=E9=99=A9=E4=BD=9C=E4=B8=9Abug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B90521?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/pages/home/Tap/special_header.dart        |  2 +-
 .../special_work/dh_work/hot_delay_page.dart  |  2 ++
 .../Tap/special_work_apply_base_page.dart     | 21 ++++++++++++++++++-
 .../home/Tap/special_work_task_page_base.dart |  8 ++++---
 4 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/lib/pages/home/Tap/special_header.dart b/lib/pages/home/Tap/special_header.dart
index c3677f3..e229b42 100644
--- a/lib/pages/home/Tap/special_header.dart
+++ b/lib/pages/home/Tap/special_header.dart
@@ -139,4 +139,4 @@ class SpecialListInitData {
   }
 }
 
-bool isKF = true;
+bool isKF = false;
diff --git a/lib/pages/home/Tap/special_work/dh_work/hot_delay_page.dart b/lib/pages/home/Tap/special_work/dh_work/hot_delay_page.dart
index 4b90e23..bd53ec7 100644
--- a/lib/pages/home/Tap/special_work/dh_work/hot_delay_page.dart
+++ b/lib/pages/home/Tap/special_work/dh_work/hot_delay_page.dart
@@ -193,6 +193,8 @@ class _HotDelayPageState extends State<HotDelayPage> {
           ToastUtil.showNormal(context, '已转发');
           Navigator.of(context).pop();
         } else if (type == SubmitType.complete || type == SubmitType.close) {
+          Navigator.of(context).pop();
+
           ToastUtil.showNormal(
             context,
             type == SubmitType.complete ? '已完成' : '已关闭',
diff --git a/lib/pages/home/Tap/special_work_apply_base_page.dart b/lib/pages/home/Tap/special_work_apply_base_page.dart
index 0ddfac4..09391e1 100644
--- a/lib/pages/home/Tap/special_work_apply_base_page.dart
+++ b/lib/pages/home/Tap/special_work_apply_base_page.dart
@@ -214,6 +214,8 @@ abstract class SpecialWorkApplyBaseState<T extends SpecialWorkApplyBasePage>
         if (FormUtils.hasValue(pd, 'xgfId')) {
           _getRelatedPartiesUserList(true);
         }
+        _getWorkLevel();// 获取作业级别
+
       } else {
         pd = _toMap(initRes['data']);
         pd['xgfFlag'] = 1;
@@ -256,7 +258,24 @@ abstract class SpecialWorkApplyBaseState<T extends SpecialWorkApplyBasePage>
       LoadingDialogHelper.dismiss();
     }
   }
-
+// 获取作业级别
+  Future<void> _getWorkLevel() async {
+    try {
+      final response = await SpecialWorkApi.specialWorkLevelList(
+        workType.code,
+      );
+      if (response['success']) {
+        final List<dynamic> data = response['data'];
+        setState(() {
+          levelList.addAll(
+            data.map((item) => item as Map<String, dynamic>),
+          );
+        });
+      }
+    } catch (e) {
+      print(e);
+    }
+  }
   /// 安全措施加载
   Future<void> _loadSafeMeasures() async {
     final reqData = {'eqWorkId': form['workId'] ?? ''};
diff --git a/lib/pages/home/Tap/special_work_task_page_base.dart b/lib/pages/home/Tap/special_work_task_page_base.dart
index b07a294..f22e3dc 100644
--- a/lib/pages/home/Tap/special_work_task_page_base.dart
+++ b/lib/pages/home/Tap/special_work_task_page_base.dart
@@ -179,7 +179,9 @@ class _SpecialWorkTaskPageBaseState extends State<SpecialWorkTaskPageBase> {
         _measures = measuresData['data'] ?? [];
         for (final measure in _measures) {
           measure['workId'] = pd['workId'];
-          measure['status'] = 1;
+          if (!FormUtils.hasValue(measure, 'status')) {
+            measure['status'] = 1;
+          }
         }
       }
     }
@@ -463,7 +465,7 @@ class _SpecialWorkTaskPageBaseState extends State<SpecialWorkTaskPageBase> {
       children: [
         if (item['selectLevel'] == 1) ...[
           ItemListWidget.selectableLineTitleTextRightButton(
-            isRequired: (canSkip == 0),
+            isRequired: (canSkip == 2),
             label: deptLabel,
             isEditable: true,
             isClean: (canSkip == 1),
@@ -485,7 +487,7 @@ class _SpecialWorkTaskPageBaseState extends State<SpecialWorkTaskPageBase> {
           ),
         ] else ...[
           ItemListWidget.selectableLineTitleTextRightButton(
-            isRequired: (canSkip == 0),
+            isRequired: (canSkip == 2),
             label: personLabel,
             isEditable: true,
             text: (item['actUserName'] as String?)?.isNotEmpty == true