危险作业bug修改0521

lib/pages/home/Tap/special_header.dart

@@ -139,4 +139,4 @@ class SpecialListInitData {
   }
 }
 
-bool isKF = true;
+bool isKF = false;

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 ? '已完成' : '已关闭',

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'] ?? ''};

lib/pages/home/Tap/special_work_task_page_base.dart

@@ -179,10 +179,12 @@ class _SpecialWorkTaskPageBaseState extends State<SpecialWorkTaskPageBase> {
         _measures = measuresData['data'] ?? [];
         for (final measure in _measures) {
           measure['workId'] = pd['workId'];
+          if (!FormUtils.hasValue(measure, 'status')) {
             measure['status'] = 1;
           }
         }
       }
+    }
 
     if (mounted) setState(() {});
   }
@@ -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