diff --git a/lib/customWidget/photo_picker_row.dart b/lib/customWidget/photo_picker_row.dart index d4ae8a1..1ada751 100644 --- a/lib/customWidget/photo_picker_row.dart +++ b/lib/customWidget/photo_picker_row.dart @@ -1,3 +1,4 @@ +// .dart import 'dart:async'; import 'dart:io'; import 'package:device_info_plus/device_info_plus.dart'; @@ -66,12 +67,13 @@ bool _isNetworkPath(String? p) { } /// 把路径列表转换为存在的本地 File 列表（过滤掉网络路径与空路径与不存在的本地文件） +/// 注意：这个函数**可能**会同步访问文件系统（existsSync），它只应在用户触发后调用，不应在 build() 中被频繁调用。 List _localFilesFromPaths(List? paths) { if (paths == null) return []; return paths .map((e) => (e ?? '').toString().trim()) .where((s) => s.isNotEmpty && !_isNetworkPath(s)) - .where((s) => File(s).existsSync()) // 只回调真实存在的本地文件 + .where((s) => File(s).existsSync()) .map((s) => File(s)) .toList(); } @@ -82,7 +84,6 @@ List _normalizePaths(List? src) { return src.map((e) => (e ?? '').toString().trim()).where((s) => s.isNotEmpty).toList(); } -/// ---------- MediaPickerRow ---------- /// ---------- MediaPickerRow ---------- class MediaPickerRow extends StatefulWidget { final int maxCount; @@ -120,12 +121,29 @@ class _MediaPickerGridState extends State { late List _mediaPaths; bool _isProcessing = false; + /// 缓存每个本地路径是否存在（避免在 build 中反复同步 IO） + final Map _localExistsCache = {}; + @override void initState() { super.initState(); // 初始化内部路径（保留网络路径与本地路径） _mediaPaths = _normalizePaths(widget.initialMediaPaths).take(widget.maxCount).toList(); + // 预先检查一次本地文件是否存在（只在 init 时做一次同步检查） + for (final pth in _mediaPaths) { + final t = pth.trim(); + if (!_isNetworkPath(t)) { + try { + _localExistsCache[t] = File(t).existsSync(); + } catch (_) { + _localExistsCache[t] = false; + } + } else { + _localExistsCache[pth] = false; + } + } + // 仅在存在本地真实文件时才把 File 列表回调给外部（避免父组件用这个回调覆盖只有网络路径的数据） final initialLocalFiles = _localFilesFromPaths(_mediaPaths); if (initialLocalFiles.isNotEmpty) { @@ -145,6 +163,23 @@ class _MediaPickerGridState extends State { if (!listEquals(oldList, newList)) { _mediaPaths = newList.take(widget.maxCount).toList(); + + // 更新本地存在缓存（同步检查，仅在更新时执行） + for (final pth in _mediaPaths) { + final t = pth.trim(); + if (!_localExistsCache.containsKey(t)) { + if (!_isNetworkPath(t)) { + try { + _localExistsCache[t] = File(t).existsSync(); + } catch (_) { + _localExistsCache[t] = false; + } + } else { + _localExistsCache[t] = false; + } + } + } + if (mounted) setState(() {}); WidgetsBinding.instance.addPostFrameCallback((_) { widget.onChanged(_localFilesFromPaths(_mediaPaths)); @@ -190,6 +225,18 @@ class _MediaPickerGridState extends State { if (_mediaPaths.length < widget.maxCount) { setState(() => _mediaPaths.add(finalPath)); + + // 记录缓存（只在添加时检查一次文件是否真实存在） + if (!_isNetworkPath(finalPath)) { + try { + _localExistsCache[finalPath] = File(finalPath).existsSync(); + } catch (_) { + _localExistsCache[finalPath] = false; + } + } else { + _localExistsCache[finalPath] = false; + } + // 回调仅包含本地真实存在的文件（网络路径不会出现在此回调中） widget.onChanged(_localFilesFromPaths(_mediaPaths)); widget.onMediaAdded?.call(finalPath); @@ -248,6 +295,14 @@ class _MediaPickerGridState extends State { if (picked != null) { final path = picked.path; setState(() => _mediaPaths.add(path)); + + // 记录存在 + try { + _localExistsCache[path] = File(path).existsSync(); + } catch (_) { + _localExistsCache[path] = false; + } + widget.onChanged(_localFilesFromPaths(_mediaPaths)); widget.onMediaAdded?.call(path); } @@ -394,6 +449,11 @@ class _MediaPickerGridState extends State { if (picked != null) { final path = picked.path; setState(() => _mediaPaths.add(path)); + try { + _localExistsCache[path] = File(path).existsSync(); + } catch (_) { + _localExistsCache[path] = false; + } widget.onChanged(_localFilesFromPaths(_mediaPaths)); widget.onMediaAdded?.call(path); } @@ -421,10 +481,12 @@ class _MediaPickerGridState extends State { if (!ok) return; final removed = _mediaPaths[index]; - final wasNetwork = _isNetworkPath(removed); setState(() => _mediaPaths.removeAt(index)); + // 从缓存中移除 + _localExistsCache.remove(removed); + // 始终通知 onMediaRemoved（用于父端业务逻辑） widget.onMediaRemoved?.call(removed); @@ -438,6 +500,10 @@ class _MediaPickerGridState extends State { final showAddButton = widget.isEdit && _mediaPaths.length < widget.maxCount; final itemCount = _mediaPaths.length + (showAddButton ? 1 : 0); + // 预计算缩略图解码宽度（减少内存开销） + final tileLogicalW = (MediaQuery.of(context).size.width / 4).round(); + final cacheWidth = (tileLogicalW * MediaQuery.of(context).devicePixelRatio).round(); + return Stack( children: [ GridView.builder( @@ -472,24 +538,27 @@ class _MediaPickerGridState extends State { ? Image.network( raw, fit: BoxFit.cover, + // request a scaled decode to reduce memory + width: tileLogicalW.toDouble(), + height: tileLogicalW.toDouble(), + // errorBuilder for network errors errorBuilder: (_, __, ___) => Container( color: Colors.grey.shade200, child: const Center(child: Icon(Icons.broken_image)), ), ) - : (File(raw).existsSync() - ? Image.file( + : Image.file( File(raw), fit: BoxFit.cover, + width: tileLogicalW.toDouble(), + height: tileLogicalW.toDouble(), + // Use cacheWidth to ask the engine to decode a smaller bitmap (reduces memory). + cacheWidth: cacheWidth, errorBuilder: (_, __, ___) => Container( color: Colors.grey.shade200, child: const Center(child: Icon(Icons.broken_image)), ), - ) - : Container( - color: Colors.grey.shade200, - child: const Center(child: Icon(Icons.broken_image)), - ))) + )) : Container( color: Colors.black12, child: const Center( diff --git a/lib/pages/home/home_page.dart b/lib/pages/home/home_page.dart index 311171d..cf9362b 100644 --- a/lib/pages/home/home_page.dart +++ b/lib/pages/home/home_page.dart @@ -563,7 +563,6 @@ class HomePageState extends State { break; } - _onRefresh(); }, ); }).toList(), diff --git a/lib/pages/home/study/study_detail_page.dart b/lib/pages/home/study/study_detail_page.dart index 29438ed..fd98a5d 100644 --- a/lib/pages/home/study/study_detail_page.dart +++ b/lib/pages/home/study/study_detail_page.dart @@ -191,7 +191,6 @@ class _StudyDetailPageState extends State debugPrint('_onVideoTap ignored because a video is loading'); return; } - // 后端清除人脸计时 await ApiService.fnClearUserFaceTime(); _faceTimer?.cancel(); @@ -214,7 +213,6 @@ class _StudyDetailPageState extends State ); } - // 暂停已有播放器（安全） try { if (_videoController != null && _videoController!.value.isPlaying) { diff --git a/lib/pages/home/tap/tabList/special_wrok/MeasuresListWidget.dart b/lib/pages/home/tap/tabList/special_wrok/MeasuresListWidget.dart index b9bc170..3eea840 100644 --- a/lib/pages/home/tap/tabList/special_wrok/MeasuresListWidget.dart +++ b/lib/pages/home/tap/tabList/special_wrok/MeasuresListWidget.dart @@ -68,7 +68,7 @@ class MeasuresListWidget extends StatelessWidget { // 期望的固定列宽（可以根据需要微调） double col0Fixed = 40; // 第一列：序号（较窄） - double col2Fixed = 60; // 第三列：操作（保留较宽以放按钮） + double col2Fixed = 80; // 第三列：操作（保留较宽以放按钮） double col3Fixed = 80; // 第四列：确认人（头像列） // 如果不显示第4列（isAllowEdit == true），则第4列宽为0，不计入固定总和 @@ -420,7 +420,7 @@ class MeasuresListWidget extends StatelessWidget { '$baseImgPath${rowPaths[i]}', width: imageSize, height: imageSize, - fit: BoxFit.cover, + fit: BoxFit.fill, errorBuilder: (_, __, ___) => Container( width: imageSize, @@ -768,7 +768,7 @@ class SignaturesListWidget extends StatelessWidget { fullUrl, width: 50, height: 50, - fit: BoxFit.cover, + fit: BoxFit.fill, errorBuilder: (ctx, err, st) => Container( width: 50, @@ -1443,7 +1443,7 @@ class SignItemWidget extends StatelessWidget { fullUrl, width: smallThumbSize, height: smallThumbSize, - fit: BoxFit.cover, + fit: BoxFit.fill, errorBuilder: (_, __, ___) => Container( width: smallThumbSize, @@ -1897,7 +1897,7 @@ class SignRowImageTitle extends StatelessWidget { fullUrl, width: imageSize, height: imageSize, - fit: BoxFit.cover, + fit: BoxFit.fill, errorBuilder: (_, __, ___) => Container( width: imageSize, diff --git a/lib/pages/home/tap/tabList/special_wrok/dangerous_options_page.dart b/lib/pages/home/tap/tabList/special_wrok/dangerous_options_page.dart index 93a76d9..7602476 100644 --- a/lib/pages/home/tap/tabList/special_wrok/dangerous_options_page.dart +++ b/lib/pages/home/tap/tabList/special_wrok/dangerous_options_page.dart @@ -93,7 +93,6 @@ class _DangerousOptionsPageState extends State { /// 拍照或选图后的回调（上传） Future _onImageAdded(String localPath) async { - if (!mounted) return; LoadingDialogHelper.show(); try { @@ -101,8 +100,6 @@ class _DangerousOptionsPageState extends State { final res = await ApiService.uploadSaveFile(localPath).timeout(const Duration(seconds: 30)); LoadingDialogHelper.hide(); - if (!mounted) return; - if (res['result'] == 'success') { final url = res['FILE_PATH'] as String; setState(() { @@ -444,7 +441,6 @@ class _DangerousOptionsPageState extends State { onChanged: (paths) {}, onMediaAdded: _onImageAdded, onMediaRemoved: (path) { - // 原逻辑保持：通过包含 localPath 的方式匹配 try { final item = imgList.firstWhere((e) => path.contains(e.localPath)); _onImageRemoved(item); diff --git a/lib/pages/home/tap/tabList/special_wrok/dh_work/aqcs_work_detail/hotwork_safe_func_sure.dart b/lib/pages/home/tap/tabList/special_wrok/dh_work/aqcs_work_detail/hotwork_safe_func_sure.dart index 6fd01e7..f4887e0 100644 --- a/lib/pages/home/tap/tabList/special_wrok/dh_work/aqcs_work_detail/hotwork_safe_func_sure.dart +++ b/lib/pages/home/tap/tabList/special_wrok/dh_work/aqcs_work_detail/hotwork_safe_func_sure.dart @@ -371,7 +371,7 @@ class _HotworkSafeFuncSureState extends State { ], ), ItemListWidget.singleLineTitleText( - isNumericInput: true, + label: '其他安全措施:', isEditable: true, hintText: '请输入其他安全措施', diff --git a/lib/pages/home/tap/tabList/special_wrok/dh_work/aqgl_work_detail/hotwork_aqgl_detail.dart b/lib/pages/home/tap/tabList/special_wrok/dh_work/aqgl_work_detail/hotwork_aqgl_detail.dart index 1e566e1..482b574 100644 --- a/lib/pages/home/tap/tabList/special_wrok/dh_work/aqgl_work_detail/hotwork_aqgl_detail.dart +++ b/lib/pages/home/tap/tabList/special_wrok/dh_work/aqgl_work_detail/hotwork_aqgl_detail.dart @@ -132,11 +132,12 @@ class _HotworkAqglDetailState extends State { String reasonText = ''; String DESCR = _contentController.text.trim(); - if (DESCR.isEmpty) { - ToastUtil.showNormal(context, '请输入负责人意见'); - return; - } + if (status == '1') { + if (DESCR.isEmpty) { + ToastUtil.showNormal(context, '请输入负责人意见'); + return; + } } else { reasonText = await CustomAlertDialog.showInput( context, diff --git a/lib/pages/home/tap/tabList/special_wrok/dh_work/dbbz_work_detail/hotwork_dbbz_detail.dart b/lib/pages/home/tap/tabList/special_wrok/dh_work/dbbz_work_detail/hotwork_dbbz_detail.dart index f0aaa09..9c02ed4 100644 --- a/lib/pages/home/tap/tabList/special_wrok/dh_work/dbbz_work_detail/hotwork_dbbz_detail.dart +++ b/lib/pages/home/tap/tabList/special_wrok/dh_work/dbbz_work_detail/hotwork_dbbz_detail.dart @@ -134,11 +134,12 @@ class _HotworkDbbzDetailState extends State { String reasonText = ''; String DESCR = _contentController.text.trim(); - if (DESCR.isEmpty) { - ToastUtil.showNormal(context, '请输入负责人意见'); - return; - } + if (status == '1') { + if (DESCR.isEmpty) { + ToastUtil.showNormal(context, '请输入负责人意见'); + return; + } } else { reasonText = await CustomAlertDialog.showInput( context, diff --git a/lib/pages/home/tap/tabList/special_wrok/dh_work/dhsp_work_detail/hotwork_dhsp_detail.dart b/lib/pages/home/tap/tabList/special_wrok/dh_work/dhsp_work_detail/hotwork_dhsp_detail.dart index c758b72..349ce69 100644 --- a/lib/pages/home/tap/tabList/special_wrok/dh_work/dhsp_work_detail/hotwork_dhsp_detail.dart +++ b/lib/pages/home/tap/tabList/special_wrok/dh_work/dhsp_work_detail/hotwork_dhsp_detail.dart @@ -132,11 +132,12 @@ class _HotworkDhspDetailState extends State { String reasonText = ''; String DESCR = _contentController.text.trim(); - if (DESCR.isEmpty) { - ToastUtil.showNormal(context, '请输入负责人意见'); - return; - } + if (status == '1') { + if (DESCR.isEmpty) { + ToastUtil.showNormal(context, '请输入负责人意见'); + return; + } } else { reasonText = await CustomAlertDialog.showInput( context, diff --git a/lib/pages/home/tap/tabList/special_wrok/dh_work/szaq_work_detail/hotwork_set_safe_detail.dart b/lib/pages/home/tap/tabList/special_wrok/dh_work/szaq_work_detail/hotwork_set_safe_detail.dart index 2aa4b04..1f62d28 100644 --- a/lib/pages/home/tap/tabList/special_wrok/dh_work/szaq_work_detail/hotwork_set_safe_detail.dart +++ b/lib/pages/home/tap/tabList/special_wrok/dh_work/szaq_work_detail/hotwork_set_safe_detail.dart @@ -161,82 +161,6 @@ class _HotworkSetSafeDetailState extends State { ).then((_) {}); } - /// 签字 - Future _sign() async { - await NativeOrientation.setLandscape(); - final path = await Navigator.push( - context, - MaterialPageRoute(builder: (context) => MineSignPage()), - ); - await NativeOrientation.setPortrait(); - if (path != null) { - final now = DateFormat('yyyy-MM-dd HH:mm').format(DateTime.now()); - - setState(() { - imagePaths.add(path); - signTimes.add(now); - }); - } - } - - Widget _signListWidget() { - return Column( - children: - imagePaths.map((path) { - return Column( - children: [ - const SizedBox(height: 10), - const Divider(), - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - GestureDetector( - child: // 用一个 ConstrainedBox 限制最大尺寸，并改为 BoxFit.contain - ConstrainedBox( - constraints: const BoxConstraints( - maxWidth: 200, - maxHeight: 150, - ), - child: Image.file( - File(path), - // 改为完整显示 - fit: BoxFit.contain, - ), - ), - onTap: () { - presentOpaque( - SingleImageViewer(imageUrl: path), - context, - ); - }, - ), - Column( - children: [ - Container( - padding: const EdgeInsets.only(right: 5), - child: CustomButton( - text: 'X', - height: 30, - padding: const EdgeInsets.symmetric(horizontal: 10), - backgroundColor: Colors.red, - onPressed: () { - setState(() { - imagePaths.remove(path); - }); - }, - ), - ), - const SizedBox(height: 80), - ], - ), - ], - ), - ], - ); - }).toList(), - ); - } - /// 作废 -1 通过 1 Future _submit(String status) async { List> signers = []; diff --git a/lib/pages/home/tap/tabList/special_wrok/dh_work/szdw_work_detail/hotwork_szdw_detail.dart b/lib/pages/home/tap/tabList/special_wrok/dh_work/szdw_work_detail/hotwork_szdw_detail.dart index 2d7c775..b3fc4e3 100644 --- a/lib/pages/home/tap/tabList/special_wrok/dh_work/szdw_work_detail/hotwork_szdw_detail.dart +++ b/lib/pages/home/tap/tabList/special_wrok/dh_work/szdw_work_detail/hotwork_szdw_detail.dart @@ -132,11 +132,11 @@ class _HotworkSzdwDetailState extends State { String reasonText = ''; String DESCR = _contentController.text.trim(); - if (DESCR.isEmpty) { - ToastUtil.showNormal(context, '请输入所在单位负责人意见'); - return; - } if (status == '1') { + if (DESCR.isEmpty) { + ToastUtil.showNormal(context, '请输入所在单位负责人意见'); + return; + } } else { reasonText = await CustomAlertDialog.showInput( context, diff --git a/lib/pages/home/tap/tabList/special_wrok/dh_work/ysgd_work_detail/hotwork_ysgd_detail.dart b/lib/pages/home/tap/tabList/special_wrok/dh_work/ysgd_work_detail/hotwork_ysgd_detail.dart index e0c398e..b7ed08b 100644 --- a/lib/pages/home/tap/tabList/special_wrok/dh_work/ysgd_work_detail/hotwork_ysgd_detail.dart +++ b/lib/pages/home/tap/tabList/special_wrok/dh_work/ysgd_work_detail/hotwork_ysgd_detail.dart @@ -185,12 +185,12 @@ class _HotworkYsgdDetailState extends State { } String DESCR = _contentController.text.trim(); - if (DESCR.isEmpty) { - ToastUtil.showNormal(context, '请输入负责人意见'); - return; - } String reasonText = ''; if (status == '1') { + if (DESCR.isEmpty) { + ToastUtil.showNormal(context, '请输入负责人意见'); + return; + } if (startTime.isEmpty) { ToastUtil.showNormal(context, '请选择验收时间'); return; diff --git a/lib/pages/home/tap/tabList/special_wrok/dh_work/zyfz_work_detail/hotwork_zyfz_detail.dart b/lib/pages/home/tap/tabList/special_wrok/dh_work/zyfz_work_detail/hotwork_zyfz_detail.dart index 831f311..3edcfd6 100644 --- a/lib/pages/home/tap/tabList/special_wrok/dh_work/zyfz_work_detail/hotwork_zyfz_detail.dart +++ b/lib/pages/home/tap/tabList/special_wrok/dh_work/zyfz_work_detail/hotwork_zyfz_detail.dart @@ -132,11 +132,11 @@ class _HotworkZyfzDetailState extends State { String reasonText = ''; String DESCR = _contentController.text.trim(); - if (DESCR.isEmpty) { - ToastUtil.showNormal(context, '请输入负责人意见'); - return; - } if (status == '1') { + if (DESCR.isEmpty) { + ToastUtil.showNormal(context, '请输入负责人意见'); + return; + } } else { reasonText = await CustomAlertDialog.showInput( context, diff --git a/lib/pages/home/tap/tabList/special_wrok/dl_work/aqcs_work_detail/cutroad_safe_func_sure.dart b/lib/pages/home/tap/tabList/special_wrok/dl_work/aqcs_work_detail/cutroad_safe_func_sure.dart index 0526219..81c52b0 100644 --- a/lib/pages/home/tap/tabList/special_wrok/dl_work/aqcs_work_detail/cutroad_safe_func_sure.dart +++ b/lib/pages/home/tap/tabList/special_wrok/dl_work/aqcs_work_detail/cutroad_safe_func_sure.dart @@ -424,7 +424,7 @@ class _CutroadSafeFuncSureState extends State { ], ), ItemListWidget.singleLineTitleText( - isNumericInput: true, + label: '其他安全措施:', isEditable: true, hintText: '请输入其他安全措施', diff --git a/lib/pages/home/tap/tabList/special_wrok/dt_work/aqcs_work_detail/breakground_safe_func_sure.dart b/lib/pages/home/tap/tabList/special_wrok/dt_work/aqcs_work_detail/breakground_safe_func_sure.dart index 3ad6d6d..a3d2595 100644 --- a/lib/pages/home/tap/tabList/special_wrok/dt_work/aqcs_work_detail/breakground_safe_func_sure.dart +++ b/lib/pages/home/tap/tabList/special_wrok/dt_work/aqcs_work_detail/breakground_safe_func_sure.dart @@ -383,7 +383,7 @@ class _BreakgroundSafeFuncSureState extends State { ], ), ItemListWidget.singleLineTitleText( - isNumericInput: true, + label: '其他安全措施:', isEditable: true, hintText: '请输入其他安全措施', diff --git a/lib/pages/home/tap/tabList/special_wrok/dt_work/dzzh_work_detail/breakground_dzzh_detail.dart b/lib/pages/home/tap/tabList/special_wrok/dt_work/dzzh_work_detail/breakground_dzzh_detail.dart index 47bf7f1..63a4b4b 100644 --- a/lib/pages/home/tap/tabList/special_wrok/dt_work/dzzh_work_detail/breakground_dzzh_detail.dart +++ b/lib/pages/home/tap/tabList/special_wrok/dt_work/dzzh_work_detail/breakground_dzzh_detail.dart @@ -131,12 +131,11 @@ class _BreakgroundDzzhDetailState extends State { } String reasonText = ''; String DESCR = _contentController.text.trim(); - - if (DESCR.isEmpty) { - ToastUtil.showNormal(context, '请输入负责人意见'); - return; - } if (status == '1') { + if (DESCR.isEmpty) { + ToastUtil.showNormal(context, '请输入负责人意见'); + return; + } } else { reasonText = await CustomAlertDialog.showInput( context, diff --git a/lib/pages/home/tap/tabList/special_wrok/dt_work/shbm_work_detail/breakground_shbm_detail.dart b/lib/pages/home/tap/tabList/special_wrok/dt_work/shbm_work_detail/breakground_shbm_detail.dart index 2d4e10b..ac9b8a9 100644 --- a/lib/pages/home/tap/tabList/special_wrok/dt_work/shbm_work_detail/breakground_shbm_detail.dart +++ b/lib/pages/home/tap/tabList/special_wrok/dt_work/shbm_work_detail/breakground_shbm_detail.dart @@ -130,12 +130,11 @@ class _BreakgroundShbmDetailState extends State { } String reasonText = ''; String DESCR = _contentController.text.trim(); - - if (DESCR.isEmpty) { - ToastUtil.showNormal(context, '请输入负责人意见'); - return; - } if (status == '1') { + if (DESCR.isEmpty) { + ToastUtil.showNormal(context, '请输入负责人意见'); + return; + } } else { reasonText = await CustomAlertDialog.showInput( context, diff --git a/lib/pages/home/tap/tabList/special_wrok/dt_work/spbm_work_detail/breakground_spbm_detail.dart b/lib/pages/home/tap/tabList/special_wrok/dt_work/spbm_work_detail/breakground_spbm_detail.dart index b7fb181..1be1361 100644 --- a/lib/pages/home/tap/tabList/special_wrok/dt_work/spbm_work_detail/breakground_spbm_detail.dart +++ b/lib/pages/home/tap/tabList/special_wrok/dt_work/spbm_work_detail/breakground_spbm_detail.dart @@ -130,12 +130,11 @@ class _BreakgroundSpbmDetailState extends State { } String reasonText = ''; String DESCR = _contentController.text.trim(); - - if (DESCR.isEmpty) { - ToastUtil.showNormal(context, '请输入负责人意见'); - return; - } if (status == '1') { + if (DESCR.isEmpty) { + ToastUtil.showNormal(context, '请输入负责人意见'); + return; + } } else { reasonText = await CustomAlertDialog.showInput( context, diff --git a/lib/pages/home/tap/tabList/special_wrok/dt_work/szdw_work_detail/breakground_szdw_detail.dart b/lib/pages/home/tap/tabList/special_wrok/dt_work/szdw_work_detail/breakground_szdw_detail.dart index cd87d7c..c7e541b 100644 --- a/lib/pages/home/tap/tabList/special_wrok/dt_work/szdw_work_detail/breakground_szdw_detail.dart +++ b/lib/pages/home/tap/tabList/special_wrok/dt_work/szdw_work_detail/breakground_szdw_detail.dart @@ -132,11 +132,11 @@ class _BreakgroundSzdwDetailState extends State { String reasonText = ''; String DESCR = _contentController.text.trim(); - if (DESCR.isEmpty) { - ToastUtil.showNormal(context, '请输入所在单位负责人意见'); - return; - } if (status == '1') { + if (DESCR.isEmpty) { + ToastUtil.showNormal(context, '请输入所在单位负责人意见'); + return; + } } else { reasonText = await CustomAlertDialog.showInput( context, diff --git a/lib/pages/home/tap/tabList/special_wrok/dt_work/ysgd_work_detail/breakground_ysgd_detail.dart b/lib/pages/home/tap/tabList/special_wrok/dt_work/ysgd_work_detail/breakground_ysgd_detail.dart index e88fd79..4568a46 100644 --- a/lib/pages/home/tap/tabList/special_wrok/dt_work/ysgd_work_detail/breakground_ysgd_detail.dart +++ b/lib/pages/home/tap/tabList/special_wrok/dt_work/ysgd_work_detail/breakground_ysgd_detail.dart @@ -185,12 +185,12 @@ class _BreakgroundYsgdDetailState extends State { } String DESCR = _contentController.text.trim(); - if (DESCR.isEmpty) { - ToastUtil.showNormal(context, '请输入负责人意见'); - return; - } String reasonText = ''; if (status == '1') { + if (DESCR.isEmpty) { + ToastUtil.showNormal(context, '请输入负责人意见'); + return; + } if (startTime.isEmpty) { ToastUtil.showNormal(context, '请选择验收时间'); return; diff --git a/lib/pages/home/tap/tabList/special_wrok/dt_work/zyfz_work_detail/breakground_zyfz_detail.dart b/lib/pages/home/tap/tabList/special_wrok/dt_work/zyfz_work_detail/breakground_zyfz_detail.dart index 608ee6e..f86ac36 100644 --- a/lib/pages/home/tap/tabList/special_wrok/dt_work/zyfz_work_detail/breakground_zyfz_detail.dart +++ b/lib/pages/home/tap/tabList/special_wrok/dt_work/zyfz_work_detail/breakground_zyfz_detail.dart @@ -132,11 +132,11 @@ class _BreakgroundZyfzDetailState extends State { String reasonText = ''; String DESCR = _contentController.text.trim(); - if (DESCR.isEmpty) { - ToastUtil.showNormal(context, '请输入负责人意见'); - return; - } if (status == '1') { + if (DESCR.isEmpty) { + ToastUtil.showNormal(context, '请输入负责人意见'); + return; + } } else { reasonText = await CustomAlertDialog.showInput( context, diff --git a/lib/pages/home/tap/tabList/special_wrok/dz_work/HoistworkDetailFormWidget.dart b/lib/pages/home/tap/tabList/special_wrok/dz_work/HoistworkDetailFormWidget.dart index c684e5b..1745dba 100644 --- a/lib/pages/home/tap/tabList/special_wrok/dz_work/HoistworkDetailFormWidget.dart +++ b/lib/pages/home/tap/tabList/special_wrok/dz_work/HoistworkDetailFormWidget.dart @@ -427,18 +427,6 @@ class _HoistworkDetailFormWidgetState extends State { onTap: widget.onChooseVideoManager ?? () {}, text: pd['VIDEONAME'] ?? '', ), - if (FormUtils.hasValue(widget.signs, 'SISUO')) ...[ - const Divider(), - ConfirmWithSignWidget( - signs: widget.signs, - pd: pd, - baseImgPath: ApiService.baseImgPath, - sectionKey: 'SISUO', - nameKey: 'SISUO_USER_NAME', - headerTitle: '司索人', - roleTitle: '司索人', - ), - ] ], ), diff --git a/lib/pages/home/tap/tabList/special_wrok/dz_work/aqcs_work_detail/hoistwork_safe_func_sure.dart b/lib/pages/home/tap/tabList/special_wrok/dz_work/aqcs_work_detail/hoistwork_safe_func_sure.dart index be4d3b3..3f0688a 100644 --- a/lib/pages/home/tap/tabList/special_wrok/dz_work/aqcs_work_detail/hoistwork_safe_func_sure.dart +++ b/lib/pages/home/tap/tabList/special_wrok/dz_work/aqcs_work_detail/hoistwork_safe_func_sure.dart @@ -382,7 +382,7 @@ class _HoistworkSafeFuncSureState extends State { ], ), ItemListWidget.singleLineTitleText( - isNumericInput: true, + label: '其他安全措施:', isEditable: true, hintText: '请输入其他安全措施', diff --git a/lib/pages/home/tap/tabList/special_wrok/dz_work/dzzh_work_detail/hoistwork_dzzh_detail.dart b/lib/pages/home/tap/tabList/special_wrok/dz_work/dzzh_work_detail/hoistwork_dzzh_detail.dart index 6513e59..0b4fb40 100644 --- a/lib/pages/home/tap/tabList/special_wrok/dz_work/dzzh_work_detail/hoistwork_dzzh_detail.dart +++ b/lib/pages/home/tap/tabList/special_wrok/dz_work/dzzh_work_detail/hoistwork_dzzh_detail.dart @@ -132,11 +132,11 @@ class _HoistworkDzzhDetailState extends State { String reasonText = ''; String DESCR = _contentController.text.trim(); - if (DESCR.isEmpty) { - ToastUtil.showNormal(context, '请输入负责人意见'); - return; - } if (status == '1') { + if (DESCR.isEmpty) { + ToastUtil.showNormal(context, '请输入负责人意见'); + return; + } } else { reasonText = await CustomAlertDialog.showInput( context, diff --git a/lib/pages/home/tap/tabList/special_wrok/dz_work/hoistwork_list_page.dart b/lib/pages/home/tap/tabList/special_wrok/dz_work/hoistwork_list_page.dart index e1b5fe3..14c277b 100644 --- a/lib/pages/home/tap/tabList/special_wrok/dz_work/hoistwork_list_page.dart +++ b/lib/pages/home/tap/tabList/special_wrok/dz_work/hoistwork_list_page.dart @@ -404,7 +404,7 @@ class _HoistworkListPageState extends State { ), Expanded( child: Text( - "作业人: ${item['WORK_USER_USER_NAME'] ?? ''}", + "吊装作业人: ${item['WORK_USER_USER_NAME'] ?? ''}", softWrap: true, textAlign: TextAlign.right, maxLines: null, // 不限制行数 diff --git a/lib/pages/home/tap/tabList/special_wrok/dz_work/shbm_work_detail/hoistwork_shbm_detail.dart b/lib/pages/home/tap/tabList/special_wrok/dz_work/shbm_work_detail/hoistwork_shbm_detail.dart index fafab3b..9a5d04e 100644 --- a/lib/pages/home/tap/tabList/special_wrok/dz_work/shbm_work_detail/hoistwork_shbm_detail.dart +++ b/lib/pages/home/tap/tabList/special_wrok/dz_work/shbm_work_detail/hoistwork_shbm_detail.dart @@ -131,11 +131,11 @@ class _HoistworkShbmDetailState extends State { String reasonText = ''; String DESCR = _contentController.text.trim(); - if (DESCR.isEmpty) { - ToastUtil.showNormal(context, '请输入负责人意见'); - return; - } if (status == '1') { + if (DESCR.isEmpty) { + ToastUtil.showNormal(context, '请输入负责人意见'); + return; + } } else { reasonText = await CustomAlertDialog.showInput( context, diff --git a/lib/pages/home/tap/tabList/special_wrok/dz_work/spbm_work_detail/hoistwork_spbm_detail.dart b/lib/pages/home/tap/tabList/special_wrok/dz_work/spbm_work_detail/hoistwork_spbm_detail.dart index a33dbed..4604d71 100644 --- a/lib/pages/home/tap/tabList/special_wrok/dz_work/spbm_work_detail/hoistwork_spbm_detail.dart +++ b/lib/pages/home/tap/tabList/special_wrok/dz_work/spbm_work_detail/hoistwork_spbm_detail.dart @@ -131,11 +131,11 @@ class _HoistworkSpbmDetailState extends State { String reasonText = ''; String DESCR = _contentController.text.trim(); - if (DESCR.isEmpty) { - ToastUtil.showNormal(context, '请输入负责人意见'); - return; - } if (status == '1') { + if (DESCR.isEmpty) { + ToastUtil.showNormal(context, '请输入负责人意见'); + return; + } } else { reasonText = await CustomAlertDialog.showInput( context, diff --git a/lib/pages/home/tap/tabList/special_wrok/dz_work/szdw_work_detail/hoistwork_szdw_detail.dart b/lib/pages/home/tap/tabList/special_wrok/dz_work/szdw_work_detail/hoistwork_szdw_detail.dart index 13b2f80..ba9df98 100644 --- a/lib/pages/home/tap/tabList/special_wrok/dz_work/szdw_work_detail/hoistwork_szdw_detail.dart +++ b/lib/pages/home/tap/tabList/special_wrok/dz_work/szdw_work_detail/hoistwork_szdw_detail.dart @@ -132,11 +132,11 @@ class _HoistworkSzdwDetailState extends State { String reasonText = ''; String DESCR = _contentController.text.trim(); - if (DESCR.isEmpty) { - ToastUtil.showNormal(context, '请输入所在单位负责人意见'); - return; - } if (status == '1') { + if (DESCR.isEmpty) { + ToastUtil.showNormal(context, '请输入所在单位负责人意见'); + return; + } } else { reasonText = await CustomAlertDialog.showInput( context, diff --git a/lib/pages/home/tap/tabList/special_wrok/dz_work/ysgd_work_detail/hoistwork_ysgd_detail.dart b/lib/pages/home/tap/tabList/special_wrok/dz_work/ysgd_work_detail/hoistwork_ysgd_detail.dart index a228b2c..ef1c491 100644 --- a/lib/pages/home/tap/tabList/special_wrok/dz_work/ysgd_work_detail/hoistwork_ysgd_detail.dart +++ b/lib/pages/home/tap/tabList/special_wrok/dz_work/ysgd_work_detail/hoistwork_ysgd_detail.dart @@ -185,12 +185,12 @@ class _HoistworkYsgdDetailState extends State { } String DESCR = _contentController.text.trim(); - if (DESCR.isEmpty) { - ToastUtil.showNormal(context, '请输入负责人意见'); - return; - } String reasonText = ''; if (status == '1') { + if (DESCR.isEmpty) { + ToastUtil.showNormal(context, '请输入负责人意见'); + return; + } if (startTime.isEmpty) { ToastUtil.showNormal(context, '请选择验收时间'); return; diff --git a/lib/pages/home/tap/tabList/special_wrok/dz_work/zyfz_work_detail/hoistwork_zyfz_detail.dart b/lib/pages/home/tap/tabList/special_wrok/dz_work/zyfz_work_detail/hoistwork_zyfz_detail.dart index 97fe368..9b61299 100644 --- a/lib/pages/home/tap/tabList/special_wrok/dz_work/zyfz_work_detail/hoistwork_zyfz_detail.dart +++ b/lib/pages/home/tap/tabList/special_wrok/dz_work/zyfz_work_detail/hoistwork_zyfz_detail.dart @@ -132,18 +132,18 @@ class _HoistworkZyfzDetailState extends State { String reasonText = ''; String DESCR = _contentController.text.trim(); - if (DESCR.isEmpty) { - ToastUtil.showNormal(context, '请输入负责人意见'); - return; - } if (status == '1') { + if (DESCR.isEmpty) { + ToastUtil.showNormal(context, '请输入负责人意见'); + return; + } } else { reasonText = await CustomAlertDialog.showInput( context, title: '作废原因', hintText: '请输入作废原因', cancelText: '取消', - confirmText: '确定' + confirmText: '确定', ); if (reasonText.isEmpty) { ToastUtil.showNormal(context, '请填写作废原因'); @@ -181,7 +181,7 @@ class _HoistworkZyfzDetailState extends State { if (result['result'] == 'success') { ToastUtil.showSuccess(context, '保存成功'); Navigator.of(context).pop(true); - }else{ + } else { ToastUtil.showNormal(context, '操作失败：${result['msg'] ?? '未知错误'}'); } } catch (e) { diff --git a/lib/pages/home/tap/tabList/special_wrok/gc_work/aqcs_work_detail/highwork_safe_func_sure.dart b/lib/pages/home/tap/tabList/special_wrok/gc_work/aqcs_work_detail/highwork_safe_func_sure.dart index b0bc152..4040a32 100644 --- a/lib/pages/home/tap/tabList/special_wrok/gc_work/aqcs_work_detail/highwork_safe_func_sure.dart +++ b/lib/pages/home/tap/tabList/special_wrok/gc_work/aqcs_work_detail/highwork_safe_func_sure.dart @@ -370,7 +370,7 @@ class _HighworkSafeFuncSureState extends State { ], ), ItemListWidget.singleLineTitleText( - isNumericInput: true, + label: '其他安全措施:', isEditable: true, hintText: '请输入其他安全措施', diff --git a/lib/pages/home/tap/tabList/special_wrok/gc_work/shbm_work_detail/highwork_shbm_detail.dart b/lib/pages/home/tap/tabList/special_wrok/gc_work/shbm_work_detail/highwork_shbm_detail.dart index 017503f..f695a85 100644 --- a/lib/pages/home/tap/tabList/special_wrok/gc_work/shbm_work_detail/highwork_shbm_detail.dart +++ b/lib/pages/home/tap/tabList/special_wrok/gc_work/shbm_work_detail/highwork_shbm_detail.dart @@ -131,11 +131,11 @@ class _HighworkShbmDetailState extends State { String reasonText = ''; String DESCR = _contentController.text.trim(); - if (DESCR.isEmpty) { - ToastUtil.showNormal(context, '请输入负责人意见'); - return; - } if (status == '1') { + if (DESCR.isEmpty) { + ToastUtil.showNormal(context, '请输入负责人意见'); + return; + } } else { reasonText = await CustomAlertDialog.showInput( context, diff --git a/lib/pages/home/tap/tabList/special_wrok/gc_work/spbm_work_detail/highwork_spbm_detail.dart b/lib/pages/home/tap/tabList/special_wrok/gc_work/spbm_work_detail/highwork_spbm_detail.dart index 5276f57..f65921f 100644 --- a/lib/pages/home/tap/tabList/special_wrok/gc_work/spbm_work_detail/highwork_spbm_detail.dart +++ b/lib/pages/home/tap/tabList/special_wrok/gc_work/spbm_work_detail/highwork_spbm_detail.dart @@ -188,11 +188,11 @@ class _HighworkSpbmDetailState extends State { String reasonText = ''; String DESCR = _contentController.text.trim(); - if (DESCR.isEmpty) { - ToastUtil.showNormal(context, '请输入负责人意见'); - return; - } if (status == '1') { + if (DESCR.isEmpty) { + ToastUtil.showNormal(context, '请输入负责人意见'); + return; + } } else { reasonText = await CustomAlertDialog.showInput( context, diff --git a/lib/pages/home/tap/tabList/special_wrok/gc_work/szdw_work_detail/highwork_szdw_detail.dart b/lib/pages/home/tap/tabList/special_wrok/gc_work/szdw_work_detail/highwork_szdw_detail.dart index 7cc77fb..04a9ea1 100644 --- a/lib/pages/home/tap/tabList/special_wrok/gc_work/szdw_work_detail/highwork_szdw_detail.dart +++ b/lib/pages/home/tap/tabList/special_wrok/gc_work/szdw_work_detail/highwork_szdw_detail.dart @@ -132,11 +132,11 @@ class _HighworkSzdwDetailState extends State { String reasonText = ''; String DESCR = _contentController.text.trim(); - if (DESCR.isEmpty) { - ToastUtil.showNormal(context, '请输入所在单位负责人意见'); - return; - } if (status == '1') { + if (DESCR.isEmpty) { + ToastUtil.showNormal(context, '请输入所在单位负责人意见'); + return; + } } else { reasonText = await CustomAlertDialog.showInput( context, diff --git a/lib/pages/home/tap/tabList/special_wrok/gc_work/ysgd_work_detail/highwork_ysgd_detail.dart b/lib/pages/home/tap/tabList/special_wrok/gc_work/ysgd_work_detail/highwork_ysgd_detail.dart index d6ae4ea..7ecd32c 100644 --- a/lib/pages/home/tap/tabList/special_wrok/gc_work/ysgd_work_detail/highwork_ysgd_detail.dart +++ b/lib/pages/home/tap/tabList/special_wrok/gc_work/ysgd_work_detail/highwork_ysgd_detail.dart @@ -185,12 +185,12 @@ class _HighworkYsgdDetailState extends State { } String DESCR = _contentController.text.trim(); - if (DESCR.isEmpty) { - ToastUtil.showNormal(context, '请输入负责人意见'); - return; - } String reasonText = ''; if (status == '1') { + if (DESCR.isEmpty) { + ToastUtil.showNormal(context, '请输入负责人意见'); + return; + } if (startTime.isEmpty) { ToastUtil.showNormal(context, '请选择验收时间'); return; diff --git a/lib/pages/home/tap/tabList/special_wrok/gc_work/zyfz_work_detail/highwork_zyfz_detail.dart b/lib/pages/home/tap/tabList/special_wrok/gc_work/zyfz_work_detail/highwork_zyfz_detail.dart index cecca7e..05e3caf 100644 --- a/lib/pages/home/tap/tabList/special_wrok/gc_work/zyfz_work_detail/highwork_zyfz_detail.dart +++ b/lib/pages/home/tap/tabList/special_wrok/gc_work/zyfz_work_detail/highwork_zyfz_detail.dart @@ -132,10 +132,6 @@ class _HighworkZyfzDetailState extends State { String reasonText = ''; String DESCR = _contentController.text.trim(); - if (DESCR.isEmpty) { - ToastUtil.showNormal(context, '请输入负责人意见'); - return; - } if (status == '1') { } else { reasonText = await CustomAlertDialog.showInput( diff --git a/lib/pages/home/tap/tabList/special_wrok/lsyd_work/aqcs_work_detail/electricity_safe_func_sure.dart b/lib/pages/home/tap/tabList/special_wrok/lsyd_work/aqcs_work_detail/electricity_safe_func_sure.dart index 0df0b39..7da6078 100644 --- a/lib/pages/home/tap/tabList/special_wrok/lsyd_work/aqcs_work_detail/electricity_safe_func_sure.dart +++ b/lib/pages/home/tap/tabList/special_wrok/lsyd_work/aqcs_work_detail/electricity_safe_func_sure.dart @@ -372,7 +372,7 @@ class _ElectricitySafeFuncSureState extends State { ], ), ItemListWidget.singleLineTitleText( - isNumericInput: true, + label: '其他安全措施:', isEditable: true, hintText: '请输入其他安全措施', diff --git a/lib/pages/home/tap/tabList/special_wrok/lsyd_work/psdw_work_detail/electricity_psdw_detail.dart b/lib/pages/home/tap/tabList/special_wrok/lsyd_work/psdw_work_detail/electricity_psdw_detail.dart index 73c1a5c..1164c89 100644 --- a/lib/pages/home/tap/tabList/special_wrok/lsyd_work/psdw_work_detail/electricity_psdw_detail.dart +++ b/lib/pages/home/tap/tabList/special_wrok/lsyd_work/psdw_work_detail/electricity_psdw_detail.dart @@ -132,11 +132,11 @@ class _ElectricityPsdwDetailState extends State { String reasonText = ''; String DESCR = _contentController.text.trim(); - if (DESCR.isEmpty) { - ToastUtil.showNormal(context, '请输入负责人意见'); - return; - } if (status == '1') { + if (DESCR.isEmpty) { + ToastUtil.showNormal(context, '请输入负责人意见'); + return; + } } else { reasonText = await CustomAlertDialog.showInput( context, diff --git a/lib/pages/home/tap/tabList/special_wrok/lsyd_work/yddw_work_detail/electricity_yddw_detail.dart b/lib/pages/home/tap/tabList/special_wrok/lsyd_work/yddw_work_detail/electricity_yddw_detail.dart index 6627bc3..254223d 100644 --- a/lib/pages/home/tap/tabList/special_wrok/lsyd_work/yddw_work_detail/electricity_yddw_detail.dart +++ b/lib/pages/home/tap/tabList/special_wrok/lsyd_work/yddw_work_detail/electricity_yddw_detail.dart @@ -132,11 +132,11 @@ class _ElectricityYddwDetailState extends State { String reasonText = ''; String DESCR = _contentController.text.trim(); - if (DESCR.isEmpty) { - ToastUtil.showNormal(context, '请输入用电单位意见'); - return; - } if (status == '1') { + if (DESCR.isEmpty) { + ToastUtil.showNormal(context, '请输入用电单位意见'); + return; + } } else { reasonText = await CustomAlertDialog.showInput( context, diff --git a/lib/pages/home/tap/tabList/special_wrok/lsyd_work/ysgd_work_detail/electricity_ysgd_detail.dart b/lib/pages/home/tap/tabList/special_wrok/lsyd_work/ysgd_work_detail/electricity_ysgd_detail.dart index f04c000..e490c4a 100644 --- a/lib/pages/home/tap/tabList/special_wrok/lsyd_work/ysgd_work_detail/electricity_ysgd_detail.dart +++ b/lib/pages/home/tap/tabList/special_wrok/lsyd_work/ysgd_work_detail/electricity_ysgd_detail.dart @@ -185,12 +185,12 @@ class _ElectricityYsgdDetailState extends State { } String DESCR = _contentController.text.trim(); - if (DESCR.isEmpty) { - ToastUtil.showNormal(context, '请输入负责人意见'); - return; - } String reasonText = ''; if (status == '1') { + if (DESCR.isEmpty) { + ToastUtil.showNormal(context, '请输入负责人意见'); + return; + } if (startTime.isEmpty) { ToastUtil.showNormal(context, '请选择验收时间'); return; diff --git a/lib/pages/home/tap/tabList/special_wrok/lsyd_work/zyfz_work_detail/electricity_zyfz_detail.dart b/lib/pages/home/tap/tabList/special_wrok/lsyd_work/zyfz_work_detail/electricity_zyfz_detail.dart index f739c5c..e62c0d8 100644 --- a/lib/pages/home/tap/tabList/special_wrok/lsyd_work/zyfz_work_detail/electricity_zyfz_detail.dart +++ b/lib/pages/home/tap/tabList/special_wrok/lsyd_work/zyfz_work_detail/electricity_zyfz_detail.dart @@ -132,18 +132,18 @@ class _ElectricityZyfzDetailState extends State { String reasonText = ''; String DESCR = _contentController.text.trim(); - if (DESCR.isEmpty) { - ToastUtil.showNormal(context, '请输入负责人意见'); - return; - } if (status == '1') { + if (DESCR.isEmpty) { + ToastUtil.showNormal(context, '请输入负责人意见'); + return; + } } else { reasonText = await CustomAlertDialog.showInput( context, title: '作废原因', hintText: '请输入作废原因', cancelText: '取消', - confirmText: '确定' + confirmText: '确定', ); if (reasonText.isEmpty) { ToastUtil.showNormal(context, '请填写作废原因'); @@ -181,7 +181,7 @@ class _ElectricityZyfzDetailState extends State { if (result['result'] == 'success') { ToastUtil.showSuccess(context, '保存成功'); Navigator.of(context).pop(true); - }else{ + } else { ToastUtil.showNormal(context, '操作失败：${result['msg'] ?? '未知错误'}'); } } catch (e) { diff --git a/lib/pages/home/tap/tabList/special_wrok/mbcd_work/aqcs_work_detail/blindboard_safe_func_sure.dart b/lib/pages/home/tap/tabList/special_wrok/mbcd_work/aqcs_work_detail/blindboard_safe_func_sure.dart index 8da5868..595a122 100644 --- a/lib/pages/home/tap/tabList/special_wrok/mbcd_work/aqcs_work_detail/blindboard_safe_func_sure.dart +++ b/lib/pages/home/tap/tabList/special_wrok/mbcd_work/aqcs_work_detail/blindboard_safe_func_sure.dart @@ -385,7 +385,7 @@ class _BlindboardSafeFuncSureState extends State { ], ), ItemListWidget.singleLineTitleText( - isNumericInput: true, + label: '其他安全措施:', isEditable: true, hintText: '请输入其他安全措施', diff --git a/lib/pages/home/tap/tabList/special_wrok/mbcd_work/mbcd_work_detai/blindboard_apply_detail.dart b/lib/pages/home/tap/tabList/special_wrok/mbcd_work/mbcd_work_detai/blindboard_apply_detail.dart index b6ff222..6ee503f 100644 --- a/lib/pages/home/tap/tabList/special_wrok/mbcd_work/mbcd_work_detai/blindboard_apply_detail.dart +++ b/lib/pages/home/tap/tabList/special_wrok/mbcd_work/mbcd_work_detai/blindboard_apply_detail.dart @@ -440,7 +440,9 @@ class _BlindboardApplyDetailState extends State { ]; final level = pd['WORK_TYPE'] ?? ''; print('---level-$level'); + for (Map item in boardList) { + } /// 各项负责人校验 final unitRules = [ EditUserType.GUARDIAN, diff --git a/lib/pages/home/tap/tabList/special_wrok/mbcd_work/shbm_work_detail/blindboard_shbm_detail.dart b/lib/pages/home/tap/tabList/special_wrok/mbcd_work/shbm_work_detail/blindboard_shbm_detail.dart index bf66c9c..061c639 100644 --- a/lib/pages/home/tap/tabList/special_wrok/mbcd_work/shbm_work_detail/blindboard_shbm_detail.dart +++ b/lib/pages/home/tap/tabList/special_wrok/mbcd_work/shbm_work_detail/blindboard_shbm_detail.dart @@ -132,11 +132,11 @@ class _BlindboardShbmDetailState extends State { String reasonText = ''; String DESCR = _contentController.text.trim(); - if (DESCR.isEmpty) { - ToastUtil.showNormal(context, '请输入负责人意见'); - return; - } if (status == '1') { + if (DESCR.isEmpty) { + ToastUtil.showNormal(context, '请输入负责人意见'); + return; + } } else { reasonText = await CustomAlertDialog.showInput( context, diff --git a/lib/pages/home/tap/tabList/special_wrok/mbcd_work/spbm_work_detail/blindboard_spbm_detail.dart b/lib/pages/home/tap/tabList/special_wrok/mbcd_work/spbm_work_detail/blindboard_spbm_detail.dart index b9e865c..060b728 100644 --- a/lib/pages/home/tap/tabList/special_wrok/mbcd_work/spbm_work_detail/blindboard_spbm_detail.dart +++ b/lib/pages/home/tap/tabList/special_wrok/mbcd_work/spbm_work_detail/blindboard_spbm_detail.dart @@ -132,11 +132,11 @@ class _BlindboardSpbmDetailState extends State { String reasonText = ''; String DESCR = _contentController.text.trim(); - if (DESCR.isEmpty) { - ToastUtil.showNormal(context, '请输入负责人意见'); - return; - } if (status == '1') { + if (DESCR.isEmpty) { + ToastUtil.showNormal(context, '请输入负责人意见'); + return; + } } else { reasonText = await CustomAlertDialog.showInput( context, diff --git a/lib/pages/home/tap/tabList/special_wrok/mbcd_work/szdw_work_detail/blindboard_szdw_detail.dart b/lib/pages/home/tap/tabList/special_wrok/mbcd_work/szdw_work_detail/blindboard_szdw_detail.dart index 1740293..8b62ab0 100644 --- a/lib/pages/home/tap/tabList/special_wrok/mbcd_work/szdw_work_detail/blindboard_szdw_detail.dart +++ b/lib/pages/home/tap/tabList/special_wrok/mbcd_work/szdw_work_detail/blindboard_szdw_detail.dart @@ -133,11 +133,11 @@ class _BlindboardSzdwDetailState extends State { String reasonText = ''; String DESCR = _contentController.text.trim(); - if (DESCR.isEmpty) { - ToastUtil.showNormal(context, '请输入所在单位负责人意见'); - return; - } if (status == '1') { + if (DESCR.isEmpty) { + ToastUtil.showNormal(context, '请输入所在单位负责人意见'); + return; + } } else { reasonText = await CustomAlertDialog.showInput( context, diff --git a/lib/pages/home/tap/tabList/special_wrok/mbcd_work/ysgd_work_detail/blindboard_ysgd_detail.dart b/lib/pages/home/tap/tabList/special_wrok/mbcd_work/ysgd_work_detail/blindboard_ysgd_detail.dart index 0b65b78..c556f9d 100644 --- a/lib/pages/home/tap/tabList/special_wrok/mbcd_work/ysgd_work_detail/blindboard_ysgd_detail.dart +++ b/lib/pages/home/tap/tabList/special_wrok/mbcd_work/ysgd_work_detail/blindboard_ysgd_detail.dart @@ -186,12 +186,12 @@ class _BlindboardYsgdDetailState extends State { } String DESCR = _contentController.text.trim(); - if (DESCR.isEmpty) { - ToastUtil.showNormal(context, '请输入负责人意见'); - return; - } String reasonText = ''; if (status == '1') { + if (DESCR.isEmpty) { + ToastUtil.showNormal(context, '请输入负责人意见'); + return; + } if (startTime.isEmpty) { ToastUtil.showNormal(context, '请选择验收时间'); return; diff --git a/lib/pages/home/tap/tabList/special_wrok/mbcd_work/zyfz_work_detail/blindboard_zyfz_detail.dart b/lib/pages/home/tap/tabList/special_wrok/mbcd_work/zyfz_work_detail/blindboard_zyfz_detail.dart index d1709b5..72a735b 100644 --- a/lib/pages/home/tap/tabList/special_wrok/mbcd_work/zyfz_work_detail/blindboard_zyfz_detail.dart +++ b/lib/pages/home/tap/tabList/special_wrok/mbcd_work/zyfz_work_detail/blindboard_zyfz_detail.dart @@ -133,11 +133,11 @@ class _BlindboardZyfzDetailState extends State { String reasonText = ''; String DESCR = _contentController.text.trim(); - if (DESCR.isEmpty) { - ToastUtil.showNormal(context, '请输入负责人意见'); - return; - } if (status == '1') { + if (DESCR.isEmpty) { + ToastUtil.showNormal(context, '请输入负责人意见'); + return; + } } else { reasonText = await CustomAlertDialog.showInput( context, diff --git a/lib/pages/home/tap/tabList/special_wrok/sxkj_work/aqcs_work_detail/spacework_safe_func_sure.dart b/lib/pages/home/tap/tabList/special_wrok/sxkj_work/aqcs_work_detail/spacework_safe_func_sure.dart index 3d5b7b7..9789bb4 100644 --- a/lib/pages/home/tap/tabList/special_wrok/sxkj_work/aqcs_work_detail/spacework_safe_func_sure.dart +++ b/lib/pages/home/tap/tabList/special_wrok/sxkj_work/aqcs_work_detail/spacework_safe_func_sure.dart @@ -370,7 +370,7 @@ class _SpaceworkSafeFuncSureState extends State { ], ), ItemListWidget.singleLineTitleText( - isNumericInput: true, + label: '其他安全措施:', isEditable: true, hintText: '请输入其他安全措施', diff --git a/lib/pages/home/tap/tabList/special_wrok/sxkj_work/dbbz_work_detail/spacework_dbbz_detail.dart b/lib/pages/home/tap/tabList/special_wrok/sxkj_work/dbbz_work_detail/spacework_dbbz_detail.dart index 41639b6..3486e26 100644 --- a/lib/pages/home/tap/tabList/special_wrok/sxkj_work/dbbz_work_detail/spacework_dbbz_detail.dart +++ b/lib/pages/home/tap/tabList/special_wrok/sxkj_work/dbbz_work_detail/spacework_dbbz_detail.dart @@ -135,11 +135,11 @@ class _SpaceworkDbbzDetailState extends State { String reasonText = ''; String DESCR = _contentController.text.trim(); - if (DESCR.isEmpty) { - ToastUtil.showNormal(context, '请输入负责人意见'); - return; - } if (status == '1') { + if (DESCR.isEmpty) { + ToastUtil.showNormal(context, '请输入负责人意见'); + return; + } } else { reasonText = await CustomAlertDialog.showInput( context, diff --git a/lib/pages/home/tap/tabList/special_wrok/sxkj_work/dhsp_work_detail/spacework_dhsp_detail.dart b/lib/pages/home/tap/tabList/special_wrok/sxkj_work/dhsp_work_detail/spacework_dhsp_detail.dart index b6b0e36..f0b1b95 100644 --- a/lib/pages/home/tap/tabList/special_wrok/sxkj_work/dhsp_work_detail/spacework_dhsp_detail.dart +++ b/lib/pages/home/tap/tabList/special_wrok/sxkj_work/dhsp_work_detail/spacework_dhsp_detail.dart @@ -133,11 +133,11 @@ class _SpaceworkDhspDetailState extends State { String reasonText = ''; String DESCR = _contentController.text.trim(); - if (DESCR.isEmpty) { - ToastUtil.showNormal(context, '请输入负责人意见'); - return; - } if (status == '1') { + if (DESCR.isEmpty) { + ToastUtil.showNormal(context, '请输入负责人意见'); + return; + } } else { reasonText = await CustomAlertDialog.showInput( context, diff --git a/lib/pages/home/tap/tabList/special_wrok/sxkj_work/szdw_work_detail/spacework_szdw_detail.dart b/lib/pages/home/tap/tabList/special_wrok/sxkj_work/szdw_work_detail/spacework_szdw_detail.dart index eb41a2a..37c3a71 100644 --- a/lib/pages/home/tap/tabList/special_wrok/sxkj_work/szdw_work_detail/spacework_szdw_detail.dart +++ b/lib/pages/home/tap/tabList/special_wrok/sxkj_work/szdw_work_detail/spacework_szdw_detail.dart @@ -133,11 +133,11 @@ class _SpaceworkSzdwDetailState extends State { String reasonText = ''; String DESCR = _contentController.text.trim(); - if (DESCR.isEmpty) { - ToastUtil.showNormal(context, '请输入所在单位负责人意见'); - return; - } if (status == '1') { + if (DESCR.isEmpty) { + ToastUtil.showNormal(context, '请输入所在单位负责人意见'); + return; + } } else { reasonText = await CustomAlertDialog.showInput( context, diff --git a/lib/pages/home/tap/tabList/special_wrok/sxkj_work/ysgd_work_detail/spacework_ysgd_detail.dart b/lib/pages/home/tap/tabList/special_wrok/sxkj_work/ysgd_work_detail/spacework_ysgd_detail.dart index 12f67bb..d209fed 100644 --- a/lib/pages/home/tap/tabList/special_wrok/sxkj_work/ysgd_work_detail/spacework_ysgd_detail.dart +++ b/lib/pages/home/tap/tabList/special_wrok/sxkj_work/ysgd_work_detail/spacework_ysgd_detail.dart @@ -186,12 +186,12 @@ class _SpaceworkYsgdDetailState extends State { } String DESCR = _contentController.text.trim(); - if (DESCR.isEmpty) { - ToastUtil.showNormal(context, '请输入负责人意见'); - return; - } String reasonText = ''; if (status == '1') { + if (DESCR.isEmpty) { + ToastUtil.showNormal(context, '请输入负责人意见'); + return; + } if (startTime.isEmpty) { ToastUtil.showNormal(context, '请选择验收时间'); return; diff --git a/lib/pages/home/tap/tabList/special_wrok/sxkj_work/zyfz_work_detail/spacework_zyfz_detail.dart b/lib/pages/home/tap/tabList/special_wrok/sxkj_work/zyfz_work_detail/spacework_zyfz_detail.dart index 6cf54a1..82456a8 100644 --- a/lib/pages/home/tap/tabList/special_wrok/sxkj_work/zyfz_work_detail/spacework_zyfz_detail.dart +++ b/lib/pages/home/tap/tabList/special_wrok/sxkj_work/zyfz_work_detail/spacework_zyfz_detail.dart @@ -132,11 +132,11 @@ class _SpaceworkZyfzDetailState extends State { String reasonText = ''; String DESCR = _contentController.text.trim(); - if (DESCR.isEmpty) { - ToastUtil.showNormal(context, '请输入负责人意见'); - return; - } if (status == '1') { + if (DESCR.isEmpty) { + ToastUtil.showNormal(context, '请输入负责人意见'); + return; + } } else { reasonText = await CustomAlertDialog.showInput( context, diff --git a/lib/pages/home/tap/tabList/special_wrok/sxkj_work/zyr_work_detail/spacework_zyr_detail.dart b/lib/pages/home/tap/tabList/special_wrok/sxkj_work/zyr_work_detail/spacework_zyr_detail.dart index d51eca8..8ccbd7b 100644 --- a/lib/pages/home/tap/tabList/special_wrok/sxkj_work/zyr_work_detail/spacework_zyr_detail.dart +++ b/lib/pages/home/tap/tabList/special_wrok/sxkj_work/zyr_work_detail/spacework_zyr_detail.dart @@ -130,7 +130,7 @@ class _SpaceworkZyrDetailState extends State { return; } String reasonText = ''; - + if (status == '1') { } else { reasonText = await CustomAlertDialog.showInput(