hanshuang
/
flutter_integrated_whb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: hanshuang:a70c6a73366f7e91d8c039b0d15d6746a440ad90
Branches Tags
hanshuang:main
hanshuang:v2.0.0
hanshuang:v2.2.1-60
..
compare: hanshuang:1c026d31f198749fe8fb226dcb495977b6fe68b0
Branches Tags
hanshuang:main
hanshuang:v2.0.0
hanshuang:v2.2.1-60

No commits in common. "a70c6a73366f7e91d8c039b0d15d6746a440ad90" and "1c026d31f198749fe8fb226dcb495977b6fe68b0" have entirely different histories.
a70c6a7336 ... 1c026d31f1

125 changed files with 766 additions and 1477 deletions
Show Stats Expand all files Collapse all files

6
lib/customWidget/custom_alert_dialog.dart
View File

@ -81,7 +81,7 @@ class CustomAlertDialog extends StatefulWidget {
);
}
static Future<String?> showInput(
static Future<String> showInput(
BuildContext context, {
required String title,
String hintText = '',
@ -102,11 +102,9 @@ class CustomAlertDialog extends StatefulWidget {
force: force,
),
);
// 取消/点遮罩会得到 null；确认会得到 String（可能为空串）
return result;
return result ?? '';
}
@override
_CustomAlertDialogState createState() => _CustomAlertDialogState();
}

4
lib/http/ApiService.dart
View File

@ -25,9 +25,9 @@ class ApiService {
/// 登录及其他管理后台接口
// static const String basePath = "https://qaaqwh.qhdsafety.com/integrated_whb";
static const String basePath = "http://192.168.20.240:8500/integrated_whb";//测试服务器
// static const String basePath = "http://192.168.20.240:8500/integrated_whb";//测试服务器
// static const String basePath = "http://192.168.0.25:28199";//王轩服务器
// static const String basePath = "http://192.168.0.45:28199";//长久服务器
static const String basePath = "http://192.168.0.45:28199";//长久服务器
/// 图片文件服务
static const String baseImgPath = "https://file.zcloudchina.com/YTHFile";

207
lib/pages/home/tap/tabList/special_wrok/dangerous_options_page.dart
View File

@ -1,5 +1,6 @@
import 'dart:async';
import 'dart:io';
import 'dart:ui';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:intl/intl.dart';
import 'package:qhd_prevention/customWidget/toast_util.dart';
@ -49,6 +50,7 @@ class SignImageData {
@override
String toString() => 'SignImageData(key:$key, filePath:$filePath, SIGNER_TIME:$SIGNER_TIME)';
}
class DangerousOptionsPage extends StatefulWidget {
final int index;
final int status;
@ -86,17 +88,18 @@ class _DangerousOptionsPageState extends State<DangerousOptionsPage> {
status = widget.status;
measures = widget.measures;
imgList = List<ImageData>.from(widget.imgList);
signImgList =
widget.signImgList.map((map) => SignImageData.fromJson(map)).toList();
signImgList = widget.signImgList.map((map) => SignImageData.fromJson(map)).toList();
}
/// 拍照或选图后的回调
/// 拍照或选图后的回调（上传）
Future<void> _onImageAdded(String localPath) async {
// 上传到服务器
LoadingDialogHelper.show();
final res = await ApiService.uploadSaveFile(localPath);
LoadingDialogHelper.hide();
try {
// 给网络请求设置超时，避免长时间卡住
final res = await ApiService.uploadSaveFile(localPath).timeout(const Duration(seconds: 30));
LoadingDialogHelper.hide();
if (res['result'] == 'success') {
final url = res['FILE_PATH'] as String;
setState(() {
@ -104,25 +107,41 @@ class _DangerousOptionsPageState extends State<DangerousOptionsPage> {
});
} else {
ToastUtil.showError(context, '上传失败，资源过大请重新选择');
// 保持与原逻辑一致：清空并通知
setState(() {
imgList = [];
MediaBus().emit(MediaEvent.clear(kAcceptVideoSectionKey));
});
MediaBus().emit(MediaEvent.clear(kAcceptVideoSectionKey));
}
} catch (_) {
} on TimeoutException {
LoadingDialogHelper.hide();
if (!mounted) return;
ToastUtil.showError(context, '上传超时，请检查网络后重试');
} catch (e, st) {
LoadingDialogHelper.hide();
debugPrint('_onImageAdded error: $e\n$st');
if (!mounted) return;
ToastUtil.showError(context, '上传失败，资源过大请重新选择');
setState(() {
imgList = [];
MediaBus().emit(MediaEvent.clear(kAcceptVideoSectionKey));
});
MediaBus().emit(MediaEvent.clear(kAcceptVideoSectionKey));
}
}
/// 删除图片处理：调用删除接口并更新列表
Future<void> _onImageRemoved(ImageData item) async {
if (item.serverPath != null) {
await ApiService.deleteSaveFile(item.serverPath!);
try {
if (item.serverPath != null && item.serverPath.isNotEmpty) {
// 不等待过久：加超时保护
await ApiService.deleteSaveFile(item.serverPath!).timeout(const Duration(seconds: 15));
}
} catch (e, st) {
debugPrint('_onImageRemoved: delete api error: $e\n$st');
// 不阻塞删除流程：即使删除接口失败，也从本地 UI 中移除
}
if (!mounted) return;
setState(() {
imgList.remove(item);
});
@ -134,15 +153,19 @@ class _DangerousOptionsPageState extends State<DangerousOptionsPage> {
return;
}
LoadingDialogHelper.show();
List<String> filePaths =
signImgList.map((img) => img.filePath ?? '').toList();
final result = await ApiService.saveDangerousOptionsFile(filePaths);
final List<dynamic> signList = result['FILE_PATH_LIST'];
try {
// 组织要上传的路径（以原逻辑为准）
List<String> filePaths = signImgList.map((img) => img.filePath ?? '').toList();
// 保存文件 API，增加超时保护
final result = await ApiService.saveDangerousOptionsFile(filePaths).timeout(const Duration(seconds: 30));
final List<dynamic> signList = result['FILE_PATH_LIST'] ?? [];
List<Map<String, dynamic>> sineImageList = [];
for (SignImageData data in signImgList) {
for (Map<String, dynamic> img in signList) {
String imgName = 'file${data.key}';
if (data.filePath!.contains('uploadFiles')) {
if (data.filePath != null && data.filePath!.contains('uploadFiles')) {
final idata = {
'filePath': data.filePath,
'SIGNER_TIME': data.SIGNER_TIME,
@ -150,7 +173,7 @@ class _DangerousOptionsPageState extends State<DangerousOptionsPage> {
};
sineImageList.add(idata);
}
if (imgName == img['key']) {
if (imgName == (img['key'] ?? '')) {
final idata = {
'filePath': img['filePath'] ?? '',
'SIGNER_TIME': data.SIGNER_TIME,
@ -160,27 +183,40 @@ class _DangerousOptionsPageState extends State<DangerousOptionsPage> {
}
}
}
setState(() => buttonLoading = true);
if (!mounted) return;
setState(() => buttonLoading = true); // 保持原行为
LoadingDialogHelper.hide();
if (!mounted) return;
Navigator.pop(context, {
'imgList':
imgList
.map((e) => {'local': e.localPath, 'remote': e.serverPath})
.toList(),
'imgList': imgList.map((e) => {'local': e.localPath, 'remote': e.serverPath}).toList(),
'signImgList': sineImageList,
'index': index,
'status': status,
});
} on TimeoutException {
LoadingDialogHelper.hide();
if (!mounted) return;
ToastUtil.showError(context, '保存超时，请稍后重试');
} catch (e, st) {
LoadingDialogHelper.hide();
debugPrint('_submit error: $e\n$st');
if (!mounted) return;
ToastUtil.showError(context, '提交失败，请重试');
}
}
Future<void> _sign() async {
await NativeOrientation.setLandscape();
final String path = await Navigator.push(
final String? path = await Navigator.push<String>(
context,
MaterialPageRoute(builder: (c) => MineSignPage()),
);
await NativeOrientation.setPortrait();
if (path != null) {
if (!mounted) return;
if (path != null && path.isNotEmpty) {
final now = DateFormat('yyyy-MM-dd HH:mm').format(DateTime.now());
setState(() {
final imageData = SignImageData(
@ -191,15 +227,84 @@ class _DangerousOptionsPageState extends State<DangerousOptionsPage> {
signImgList.add(imageData);
signTimes.add(now);
});
//FocusHelper.clearFocus(context);
}
}
Widget _signListWidget() {
// 使用 ListView 或 Column 的时候，注意图片的解码在主线程可能造成阻塞。这里限制尺寸并使用 ResizeImage 去解码。
return Column(
children:
signImgList.map((imgData) {
children: signImgList.map((imgData) {
final idx = signImgList.indexOf(imgData);
final rawPath = (imgData.filePath ?? '').toString();
final isNetwork = rawPath.startsWith('http://') || rawPath.startsWith('https://');
// 目标尺寸（尽量与 UI 展示一致，避免解码过大）
const targetWidth = 460; // 约为显示宽度 * devicePixelRatio 的一个合理值
const targetHeight = 300;
Widget imageWidget;
if (rawPath.isEmpty) {
imageWidget = Container(
width: 230,
height: 150,
color: Colors.grey.shade200,
child: const Center(child: Icon(Icons.broken_image, size: 28, color: Colors.grey)),
);
} else if (isNetwork) {
// 网络图片：加上 width/height 与 loadingBuilder，避免阻塞
imageWidget = Image.network(
rawPath.startsWith('http') ? rawPath : ApiService.baseImgPath + rawPath,
width: 230,
height: 150,
fit: BoxFit.cover,
// 显示 loading 占位，避免白屏卡顿
loadingBuilder: (context, child, loadingProgress) {
if (loadingProgress == null) return child;
return Container(
width: 230,
height: 150,
color: Colors.grey.shade200,
child: const Center(child: CircularProgressIndicator(strokeWidth: 2)),
);
},
errorBuilder: (_, __, ___) => Container(
width: 230,
height: 150,
color: Colors.grey.shade200,
child: const Center(child: Icon(Icons.broken_image)),
),
);
} else {
// 本地文件：使用 ResizeImage 包装 FileImage，按目标像素解码，避免解码超大图片堵主线程
final file = File(rawPath);
if (file.existsSync()) {
imageWidget = Image(
image: ResizeImage(
FileImage(file),
// 这里给出一个合理的解码尺寸（可根据实际设备 pixel ratio 适当调整）
width: targetWidth,
height: targetHeight,
),
width: 230,
height: 150,
fit: BoxFit.contain,
errorBuilder: (_, __, ___) => Container(
width: 230,
height: 150,
color: Colors.grey.shade200,
child: const Center(child: Icon(Icons.broken_image)),
),
);
} else {
imageWidget = Container(
width: 230,
height: 150,
color: Colors.grey.shade200,
child: const Center(child: Icon(Icons.broken_image)),
);
}
}
return Column(
children: [
const SizedBox(height: 10),
@ -213,21 +318,9 @@ class _DangerousOptionsPageState extends State<DangerousOptionsPage> {
maxWidth: 230,
maxHeight: 150,
),
child:
(imgData.filePath ?? '').contains('uploadFiles')
? Image.network(
'${ApiService.baseImgPath}${imgData.filePath}',
)
: Image.file(
File(imgData.filePath ?? ''),
fit: BoxFit.contain,
),
),
onTap:
() => presentOpaque(
SingleImageViewer(imageUrl: imgData.filePath ?? ''),
context,
child: imageWidget,
),
onTap: () => presentOpaque(SingleImageViewer(imageUrl: rawPath), context),
),
Column(
children: [
@ -237,6 +330,7 @@ class _DangerousOptionsPageState extends State<DangerousOptionsPage> {
padding: const EdgeInsets.symmetric(horizontal: 10),
backgroundColor: Colors.red,
onPressed: () {
if (!mounted) return;
setState(() => signImgList.removeAt(idx));
},
),
@ -258,19 +352,19 @@ class _DangerousOptionsPageState extends State<DangerousOptionsPage> {
body: Padding(
padding: const EdgeInsets.all(12.0),
child: Container(
padding: EdgeInsets.symmetric(horizontal: 10, vertical: 10),
padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 10),
color: Colors.white,
child: ListView(
children: [
Table(
border: TableBorder.all(color: Colors.grey.shade300),
columnWidths: {0: FlexColumnWidth(3), 1: FlexColumnWidth(2)},
columnWidths: const {0: FlexColumnWidth(3), 1: FlexColumnWidth(2)},
children: [
TableRow(
decoration: BoxDecoration(color: Colors.grey.shade200),
children: [
Padding(
padding: EdgeInsets.all(10),
padding: const EdgeInsets.all(10),
child: Center(
child: Text(
'主要安全措施',
@ -279,7 +373,7 @@ class _DangerousOptionsPageState extends State<DangerousOptionsPage> {
),
),
Padding(
padding: EdgeInsets.all(10),
padding: const EdgeInsets.all(10),
child: Center(
child: Text(
'操作',
@ -305,12 +399,12 @@ class _DangerousOptionsPageState extends State<DangerousOptionsPage> {
RadioListTile<int>(
value: -1,
groupValue: status,
title: Text('不涉及'),
title: const Text('不涉及'),
contentPadding: const EdgeInsets.symmetric(
vertical: 0,
horizontal: 8.0,
),
visualDensity: VisualDensity(
visualDensity: const VisualDensity(
vertical: -4,
horizontal: 0,
),
@ -319,12 +413,12 @@ class _DangerousOptionsPageState extends State<DangerousOptionsPage> {
RadioListTile<int>(
value: 1,
groupValue: status,
title: Text('涉及'),
title: const Text('涉及'),
contentPadding: const EdgeInsets.symmetric(
vertical: 4.0,
horizontal: 8.0,
),
visualDensity: VisualDensity(
visualDensity: const VisualDensity(
vertical: -4,
horizontal: 0,
),
@ -343,15 +437,16 @@ class _DangerousOptionsPageState extends State<DangerousOptionsPage> {
maxCount: 2,
mediaType: MediaType.image,
initialMediaPaths:
imgList
.map((e) => '${ApiService.baseImgPath}${e.serverPath}')
.toList(),
imgList.map((e) => '${ApiService.baseImgPath}${e.serverPath}').toList(),
onChanged: (paths) {},
onMediaAdded: _onImageAdded,
onMediaRemoved: (path) {
print(path);
final item = imgList.firstWhere((e) => path.contains(e.localPath) );
try {
final item = imgList.firstWhere((e) => path.contains(e.localPath));
_onImageRemoved(item);
} catch (e) {
debugPrint('onMediaRemoved: find item error: $e');
}
},
onAiIdentify: () {},
),
@ -359,7 +454,7 @@ class _DangerousOptionsPageState extends State<DangerousOptionsPage> {
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text('签字：', style: TextStyle(fontSize: 16)),
const Text('签字：', style: TextStyle(fontSize: 16)),
CustomButton(
text: '新增手写签字',
height: 36,

13
lib/pages/home/tap/tabList/special_wrok/dh_work/aqcs_work_detail/hotwork_safe_func_sure.dart
View File

@ -192,7 +192,7 @@ class _HotworkSafeFuncSureState extends State<HotworkSafeFuncSure> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
if (status == '1') {
if (!_validateAndProceed(context)) {
@ -210,17 +210,10 @@ class _HotworkSafeFuncSureState extends State<HotworkSafeFuncSure> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
final Map<String, dynamic> formData = {};
// 提交参数

13
lib/pages/home/tap/tabList/special_wrok/dh_work/aqgl_work_detail/hotwork_aqgl_detail.dart
View File

@ -129,7 +129,7 @@ class _HotworkAqglDetailState extends State<HotworkAqglDetail> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
String DESCR = _contentController.text.trim();
@ -146,17 +146,10 @@ class _HotworkAqglDetailState extends State<HotworkAqglDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 存回 measures

13
lib/pages/home/tap/tabList/special_wrok/dh_work/aqjd_work_detail/hotwork_aqjd_detail.dart
View File

@ -176,7 +176,7 @@ class _HotworkAqjdDetailState extends State<HotworkAqjdDetail> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
if (status == '1') {
} else {
@ -187,17 +187,10 @@ class _HotworkAqjdDetailState extends State<HotworkAqjdDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 抽取所有非空的 serverPath 并拼成逗号分隔的字符串
final serverPathString = imgList

13
lib/pages/home/tap/tabList/special_wrok/dh_work/dbbz_work_detail/hotwork_dbbz_detail.dart
View File

@ -131,7 +131,7 @@ class _HotworkDbbzDetailState extends State<HotworkDbbzDetail> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
String DESCR = _contentController.text.trim();
@ -148,17 +148,10 @@ class _HotworkDbbzDetailState extends State<HotworkDbbzDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 存回 measures

14
lib/pages/home/tap/tabList/special_wrok/dh_work/dhsp_work_detail/hotwork_dhsp_detail.dart
View File

@ -129,9 +129,10 @@ class _HotworkDhspDetailState extends State<HotworkDhspDetail> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
String DESCR = _contentController.text.trim();
if (status == '1') {
if (DESCR.isEmpty) {
ToastUtil.showNormal(context, '请输入负责人意见');
@ -143,15 +144,8 @@ class _HotworkDhspDetailState extends State<HotworkDhspDetail> {
title: '作废原因',
hintText: '请输入作废原因',
cancelText: '取消',
confirmText: '确定',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
@ -188,7 +182,7 @@ class _HotworkDhspDetailState extends State<HotworkDhspDetail> {
if (result['result'] == 'success') {
ToastUtil.showSuccess(context, '保存成功');
Navigator.of(context).pop(true);
} else {
}else{
ToastUtil.showNormal(context, '操作失败：${result['msg'] ?? '未知错误'}');
}
} catch (e) {

13
lib/pages/home/tap/tabList/special_wrok/dh_work/jhr_work_detail/hotwork_jhr_detail.dart
View File

@ -128,7 +128,7 @@ class _HotworkJhrDetailState extends State<HotworkJhrDetail> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
if (status == '1') {
} else {
@ -139,17 +139,10 @@ class _HotworkJhrDetailState extends State<HotworkJhrDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
final Map<String, dynamic> formData = {};

13
lib/pages/home/tap/tabList/special_wrok/dh_work/jsjd_work_detail/hotwork_jsjd_detail.dart
View File

@ -129,7 +129,7 @@ class _HotworkJsjdDetailState extends State<HotworkJsjdDetail> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
if (status == '1') {
} else {
@ -140,17 +140,10 @@ class _HotworkJsjdDetailState extends State<HotworkJsjdDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 存回 measures

13
lib/pages/home/tap/tabList/special_wrok/dh_work/jszy_work_detail/hotwork_jszy_detail.dart
View File

@ -89,7 +89,7 @@ class _HotworkJszyDetailState extends State<HotworkJszyDetail> {
/// 作废 -1 通过 1
Future<void> _submit(String status) async {
String? reasonText = '';
String reasonText = '';
if (status == '1') {
if (endTime.isEmpty) {
ToastUtil.showNormal(context, '请选择作业结束时间');
@ -106,17 +106,10 @@ class _HotworkJszyDetailState extends State<HotworkJszyDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 存回 measures

13
lib/pages/home/tap/tabList/special_wrok/dh_work/kszy_work_detail/hotwork_kszy_detail.dart
View File

@ -54,7 +54,7 @@ class _HotworkKszyDetailState extends State<HotworkKszyDetail> {
/// 作废 -1 通过 1
Future<void> _submit(String status) async {
String? reasonText = '';
String reasonText = '';
if (status == '1') {
if (startTime.isEmpty) {
ToastUtil.showNormal(context, '请选择作业开始时间');
@ -77,17 +77,10 @@ class _HotworkKszyDetailState extends State<HotworkKszyDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 存回 measures

13
lib/pages/home/tap/tabList/special_wrok/dh_work/szaq_work_detail/hotwork_set_safe_detail.dart
View File

@ -164,7 +164,7 @@ class _HotworkSetSafeDetailState extends State<HotworkSetSafeDetail> {
/// 作废 -1 通过 1
Future<void> _submit(String status) async {
List<Map<String, dynamic>> signers = [];
String? reasonText = '';
String reasonText = '';
if (status == '1') {
int index = 0;
@ -203,17 +203,10 @@ class _HotworkSetSafeDetailState extends State<HotworkSetSafeDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
final Map<String, dynamic> formData = {};

13
lib/pages/home/tap/tabList/special_wrok/dh_work/szdw_work_detail/hotwork_szdw_detail.dart
View File

@ -129,7 +129,7 @@ class _HotworkSzdwDetailState extends State<HotworkSzdwDetail> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
String DESCR = _contentController.text.trim();
if (status == '1') {
@ -145,17 +145,10 @@ class _HotworkSzdwDetailState extends State<HotworkSzdwDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 存回 measures

13
lib/pages/home/tap/tabList/special_wrok/dh_work/ysgd_work_detail/hotwork_ysgd_detail.dart
View File

@ -185,7 +185,7 @@ class _HotworkYsgdDetailState extends State<HotworkYsgdDetail> {
}
String DESCR = _contentController.text.trim();
String? reasonText = '';
String reasonText = '';
if (status == '1') {
if (DESCR.isEmpty) {
ToastUtil.showNormal(context, '请输入负责人意见');
@ -215,17 +215,10 @@ class _HotworkYsgdDetailState extends State<HotworkYsgdDetail> {
cancelText: '取消',
confirmText: '确定',
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
final serverPathString = imgList
.map((e) => e.serverPath)

13
lib/pages/home/tap/tabList/special_wrok/dh_work/zyfz_work_detail/hotwork_zyfz_detail.dart
View File

@ -129,7 +129,7 @@ class _HotworkZyfzDetailState extends State<HotworkZyfzDetail> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
String DESCR = _contentController.text.trim();
if (status == '1') {
@ -145,17 +145,10 @@ class _HotworkZyfzDetailState extends State<HotworkZyfzDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 存回 measures

13
lib/pages/home/tap/tabList/special_wrok/dl_work/aqcs_work_detail/cutroad_safe_func_sure.dart
View File

@ -268,7 +268,7 @@ class _CutroadSafeFuncSureState extends State<CutroadSafeFuncSure> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
if (status == '1') {
if (!_validateAndProceed(context)) {
@ -286,17 +286,10 @@ class _CutroadSafeFuncSureState extends State<CutroadSafeFuncSure> {
cancelText: '取消',
confirmText: '确定',
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
final Map<String, dynamic> formData = {};
// 提交参数

13
lib/pages/home/tap/tabList/special_wrok/dl_work/aqjd_work_detail/cutroad_aqjd_detail.dart
View File

@ -175,7 +175,7 @@ class _CutroadAqjdDetailState extends State<CutroadAqjdDetail> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
if (status == '1') {
} else {
@ -186,17 +186,10 @@ class _CutroadAqjdDetailState extends State<CutroadAqjdDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 抽取所有非空的 serverPath 并拼成逗号分隔的字符串
final serverPathString = imgList

3
lib/pages/home/tap/tabList/special_wrok/dl_work/dl_work_detai/cutroad_apply_detail.dart
View File

@ -359,10 +359,9 @@ class _CutroadApplyDetailState extends State<CutroadApplyDetail> {
pd['ACTION_USER'] = SessionService.instance.username;
pd['APPLY_STATUS'] = status;
pd['SPECIAL_WORK'] = FormUtils.hasValue(pd, 'SPECIAL_WORK') ? pd['SPECIAL_WORK'] : '无';
pd['TASK_ID'] = taskId;
if (msg == 'add') {
pd['STEP_ID'] = status;
pd['TASK_ID'] = taskId;
pd['CUTROAD_ID'] = widget.CUTROAD_ID;
pd['APPLY_DEPARTMENT_ID'] = SessionService.instance.deptId;
pd['APPLY_DEPARTMENT_NAME'] =

13
lib/pages/home/tap/tabList/special_wrok/dl_work/jhr_work_detail/cutroad_jhr_detail.dart
View File

@ -130,7 +130,7 @@ class _CutroadJhrDetailState extends State<CutroadJhrDetail> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
if (status == '1') {
} else {
@ -141,17 +141,10 @@ class _CutroadJhrDetailState extends State<CutroadJhrDetail> {
cancelText: '取消',
confirmText: '确定',
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
final Map<String, dynamic> formData = {};

13
lib/pages/home/tap/tabList/special_wrok/dl_work/jsjd_work_detail/cutroad_jsjd_detail.dart
View File

@ -129,7 +129,7 @@ setState(() {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
if (status == '1') {
} else {
@ -140,17 +140,10 @@ setState(() {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 存回 measures

13
lib/pages/home/tap/tabList/special_wrok/dl_work/jszy_work_detail/cutroad_jszy_detail.dart
View File

@ -147,7 +147,7 @@ class _CutroadJszyDetailState extends State<CutroadJszyDetail> {
// ToastUtil.showNormal(context, '请签字');
// return;
// }
String? reasonText = '';
String reasonText = '';
if (status == '1') {
if (endTime.isEmpty) {
ToastUtil.showNormal(context, '请选择作业结束时间');
@ -164,17 +164,10 @@ class _CutroadJszyDetailState extends State<CutroadJszyDetail> {
cancelText: '取消',
confirmText: '确定',
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 存回 measures

13
lib/pages/home/tap/tabList/special_wrok/dl_work/kszy_work_detail/cutroad_kszy_detail.dart
View File

@ -55,7 +55,7 @@ class _CutroadKszyDetailState extends State<CutroadKszyDetail> {
/// 作废 -1 通过 1
Future<void> _submit(String status) async {
String? reasonText = '';
String reasonText = '';
if (status == '1') {
if (startTime.isEmpty) {
ToastUtil.showNormal(context, '请选择作业开始时间');
@ -69,17 +69,10 @@ class _CutroadKszyDetailState extends State<CutroadKszyDetail> {
cancelText: '取消',
confirmText: '确定',
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 存回 measures

13
lib/pages/home/tap/tabList/special_wrok/dl_work/shbm_work_detail/cutroad_shbm_detail.dart
View File

@ -128,7 +128,7 @@ class _CutroadShbmDetailState extends State<CutroadShbmDetail> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
String DESCR = _contentController.text.trim();
if (DESCR.isEmpty) {
@ -144,17 +144,10 @@ class _CutroadShbmDetailState extends State<CutroadShbmDetail> {
cancelText: '取消',
confirmText: '确定',
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 存回 measures

13
lib/pages/home/tap/tabList/special_wrok/dl_work/spbm_work_detail/cutroad_spbm_detail.dart
View File

@ -128,7 +128,7 @@ class _CutroadSpbmDetailState extends State<CutroadSpbmDetail> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
String DESCR = _contentController.text.trim();
if (DESCR.isEmpty) {
@ -144,17 +144,10 @@ class _CutroadSpbmDetailState extends State<CutroadSpbmDetail> {
cancelText: '取消',
confirmText: '确定',
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 存回 measures

13
lib/pages/home/tap/tabList/special_wrok/dl_work/szaq_work_detail/cutroad_set_safe_detail.dart
View File

@ -299,7 +299,7 @@ class _CutroadSetSafeDetailState extends State<CutroadSetSafeDetail> {
Future<void> _submit(String status) async {
List<Map<String, dynamic>> signers = [];
String? reasonText = '';
String reasonText = '';
if (status == '1') {
int index = 0;
@ -338,17 +338,10 @@ class _CutroadSetSafeDetailState extends State<CutroadSetSafeDetail> {
cancelText: '取消',
confirmText: '确定',
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
final Map<String, dynamic> formData = {};

13
lib/pages/home/tap/tabList/special_wrok/dl_work/szdw_work_detail/cutroad_szdw_detail.dart
View File

@ -129,7 +129,7 @@ class _CutroadSzdwDetailState extends State<CutroadSzdwDetail> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
String DESCR = _contentController.text.trim();
if (DESCR.isEmpty) {
@ -145,17 +145,10 @@ class _CutroadSzdwDetailState extends State<CutroadSzdwDetail> {
cancelText: '取消',
confirmText: '确定',
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 存回 measures

13
lib/pages/home/tap/tabList/special_wrok/dl_work/ysgd_work_detail/cutroad_ysgd_detail.dart
View File

@ -188,7 +188,7 @@ class _CutroadYsgdDetailState extends State<CutroadYsgdDetail> {
ToastUtil.showNormal(context, '请输入负责人意见');
return;
}
String? reasonText = '';
String reasonText = '';
if (status == '1') {
if (startTime.isEmpty) {
ToastUtil.showNormal(context, '请选择验收时间');
@ -214,17 +214,10 @@ class _CutroadYsgdDetailState extends State<CutroadYsgdDetail> {
cancelText: '取消',
confirmText: '确定',
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
final serverPathString = imgList
.map((e) => e.serverPath)

13
lib/pages/home/tap/tabList/special_wrok/dl_work/zyfz_work_detail/cutroad_zyfz_detail.dart
View File

@ -129,7 +129,7 @@ class _CutroadZyfzDetailState extends State<CutroadZyfzDetail> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
String DESCR = _contentController.text.trim();
if (DESCR.isEmpty) {
@ -145,17 +145,10 @@ class _CutroadZyfzDetailState extends State<CutroadZyfzDetail> {
cancelText: '取消',
confirmText: '确定',
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 存回 measures

13
lib/pages/home/tap/tabList/special_wrok/dl_work/zyr_work_detail/cutroad_zyr_detail.dart
View File

@ -141,7 +141,7 @@ class _CutroadZyrDetailState extends State<CutroadZyrDetail> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
if (status == '1') {
if (_contentController.text.trim().isEmpty) {
@ -160,17 +160,10 @@ class _CutroadZyrDetailState extends State<CutroadZyrDetail> {
cancelText: '取消',
confirmText: '确定',
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
final serverPathString = imgList
.map((e) => e.serverPath)

13
lib/pages/home/tap/tabList/special_wrok/dt_work/aqcs_work_detail/breakground_safe_func_sure.dart
View File

@ -192,7 +192,7 @@ class _BreakgroundSafeFuncSureState extends State<BreakgroundSafeFuncSure> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
if (status == '1') {
if (!_validateAndProceed(context)) {
@ -210,17 +210,10 @@ class _BreakgroundSafeFuncSureState extends State<BreakgroundSafeFuncSure> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
final Map<String, dynamic> formData = {};
// 提交参数

13
lib/pages/home/tap/tabList/special_wrok/dt_work/aqjd_work_detail/breakground_aqjd_detail.dart
View File

@ -175,7 +175,7 @@ class _BreakgroundAqjdDetailState extends State<BreakgroundAqjdDetail> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
if (status == '1') {
} else {
@ -186,17 +186,10 @@ class _BreakgroundAqjdDetailState extends State<BreakgroundAqjdDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 抽取所有非空的 serverPath 并拼成逗号分隔的字符串
final serverPathString = imgList

3
lib/pages/home/tap/tabList/special_wrok/dt_work/dt_work_detai/breakground_apply_detail.dart
View File

@ -497,10 +497,9 @@ class _BreakgroundApplyDetailState extends State<BreakgroundApplyDetail> {
pd['ACTION_USER'] = SessionService.instance.username;
pd['APPLY_STATUS'] = status;
pd['SPECIAL_WORK'] = FormUtils.hasValue(pd, 'SPECIAL_WORK') ? pd['SPECIAL_WORK'] : '无';
pd['TASK_ID'] = taskId;
// 提交参数
if (msg == 'add') {
pd['TASK_ID'] = taskId;
pd['BREAKGROUND_ID'] = widget.BREAKGROUND_ID;
pd['APPLY_DEPARTMENT_ID'] = SessionService.instance.deptId;
pd['APPLY_DEPARTMENT_NAME'] =

13
lib/pages/home/tap/tabList/special_wrok/dt_work/dzzh_work_detail/breakground_dzzh_detail.dart
View File

@ -129,7 +129,7 @@ class _BreakgroundDzzhDetailState extends State<BreakgroundDzzhDetail> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
String DESCR = _contentController.text.trim();
if (status == '1') {
if (DESCR.isEmpty) {
@ -144,17 +144,10 @@ class _BreakgroundDzzhDetailState extends State<BreakgroundDzzhDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 存回 measures

13
lib/pages/home/tap/tabList/special_wrok/dt_work/jhr_work_detail/breakground_jhr_detail.dart
View File

@ -130,7 +130,7 @@ class _BreakgroundJhrDetailState extends State<BreakgroundJhrDetail> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
if (status == '1') {
} else {
@ -141,17 +141,10 @@ class _BreakgroundJhrDetailState extends State<BreakgroundJhrDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
final Map<String, dynamic> formData = {};

13
lib/pages/home/tap/tabList/special_wrok/dt_work/jsjd_work_detail/breakground_jsjd_detail.dart
View File

@ -129,7 +129,7 @@ class _BreakgroundJsjdDetailState extends State<BreakgroundJsjdDetail> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
if (status == '1') {
} else {
@ -140,17 +140,10 @@ class _BreakgroundJsjdDetailState extends State<BreakgroundJsjdDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 存回 measures

13
lib/pages/home/tap/tabList/special_wrok/dt_work/jszy_work_detail/breakground_jszy_detail.dart
View File

@ -69,7 +69,7 @@ class _BreakgroundJszyDetailState extends State<BreakgroundJszyDetail> {
/// 作废 -1 通过 1
Future<void> _submit(String status) async {
String? reasonText = '';
String reasonText = '';
if (status == '1') {
if (endTime.isEmpty) {
ToastUtil.showNormal(context, '请选择作业结束时间');
@ -86,17 +86,10 @@ class _BreakgroundJszyDetailState extends State<BreakgroundJszyDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 存回 measures

13
lib/pages/home/tap/tabList/special_wrok/dt_work/kszy_work_detail/breakground_kszy_detail.dart
View File

@ -55,7 +55,7 @@ class _BreakgroundKszyDetailState extends State<BreakgroundKszyDetail> {
/// 作废 -1 通过 1
Future<void> _submit(String status) async {
String? reasonText = '';
String reasonText = '';
if (status == '1') {
if (startTime.isEmpty) {
ToastUtil.showNormal(context, '请选择作业开始时间');
@ -69,17 +69,10 @@ class _BreakgroundKszyDetailState extends State<BreakgroundKszyDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 存回 measures

13
lib/pages/home/tap/tabList/special_wrok/dt_work/shbm_work_detail/breakground_shbm_detail.dart
View File

@ -128,7 +128,7 @@ class _BreakgroundShbmDetailState extends State<BreakgroundShbmDetail> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
String DESCR = _contentController.text.trim();
if (status == '1') {
if (DESCR.isEmpty) {
@ -143,17 +143,10 @@ class _BreakgroundShbmDetailState extends State<BreakgroundShbmDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 存回 measures

13
lib/pages/home/tap/tabList/special_wrok/dt_work/spbm_work_detail/breakground_spbm_detail.dart
View File

@ -128,7 +128,7 @@ class _BreakgroundSpbmDetailState extends State<BreakgroundSpbmDetail> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
String DESCR = _contentController.text.trim();
if (status == '1') {
if (DESCR.isEmpty) {
@ -143,17 +143,10 @@ class _BreakgroundSpbmDetailState extends State<BreakgroundSpbmDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 存回 measures

13
lib/pages/home/tap/tabList/special_wrok/dt_work/ssr_work_detail/breakground_ssr_detail.dart
View File

@ -128,7 +128,7 @@ class _BreakgroundSsrDetailState extends State<BreakgroundSsrDetail> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
if (status == '1') {
} else {
@ -139,17 +139,10 @@ class _BreakgroundSsrDetailState extends State<BreakgroundSsrDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 存回 measures

13
lib/pages/home/tap/tabList/special_wrok/dt_work/szaq_work_detail/breakground_set_safe_detail.dart
View File

@ -241,7 +241,7 @@ class _BreakgroundSetSafeDetailState extends State<BreakgroundSetSafeDetail> {
Future<void> _submit(String status) async {
List<Map<String, dynamic>> signers = [];
String? reasonText = '';
String reasonText = '';
if (status == '1') {
int index = 0;
@ -280,17 +280,10 @@ class _BreakgroundSetSafeDetailState extends State<BreakgroundSetSafeDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
final Map<String, dynamic> formData = {};

13
lib/pages/home/tap/tabList/special_wrok/dt_work/szdw_work_detail/breakground_szdw_detail.dart
View File

@ -129,7 +129,7 @@ class _BreakgroundSzdwDetailState extends State<BreakgroundSzdwDetail> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
String DESCR = _contentController.text.trim();
if (status == '1') {
@ -145,17 +145,10 @@ class _BreakgroundSzdwDetailState extends State<BreakgroundSzdwDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 存回 measures

13
lib/pages/home/tap/tabList/special_wrok/dt_work/ysgd_work_detail/breakground_ysgd_detail.dart
View File

@ -185,7 +185,7 @@ class _BreakgroundYsgdDetailState extends State<BreakgroundYsgdDetail> {
}
String DESCR = _contentController.text.trim();
String? reasonText = '';
String reasonText = '';
if (status == '1') {
if (DESCR.isEmpty) {
ToastUtil.showNormal(context, '请输入负责人意见');
@ -215,17 +215,10 @@ class _BreakgroundYsgdDetailState extends State<BreakgroundYsgdDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
final serverPathString = imgList
.map((e) => e.serverPath)

13
lib/pages/home/tap/tabList/special_wrok/dt_work/zyfz_work_detail/breakground_zyfz_detail.dart
View File

@ -129,7 +129,7 @@ class _BreakgroundZyfzDetailState extends State<BreakgroundZyfzDetail> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
String DESCR = _contentController.text.trim();
if (status == '1') {
@ -145,17 +145,10 @@ class _BreakgroundZyfzDetailState extends State<BreakgroundZyfzDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 存回 measures

13
lib/pages/home/tap/tabList/special_wrok/dt_work/zyr_work_detail/breakground_zyr_detail.dart
View File

@ -142,7 +142,7 @@ class _BreakgroundZyrDetailState extends State<BreakgroundZyrDetail> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
if (status == '1') {
if (workImages.isEmpty) {
@ -161,17 +161,10 @@ class _BreakgroundZyrDetailState extends State<BreakgroundZyrDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 存回 measures

13
lib/pages/home/tap/tabList/special_wrok/dz_work/aqcs_work_detail/hoistwork_safe_func_sure.dart
View File

@ -191,7 +191,7 @@ class _HoistworkSafeFuncSureState extends State<HoistworkSafeFuncSure> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
if (status == '1') {
if (!_validateAndProceed(context)) {
@ -209,17 +209,10 @@ class _HoistworkSafeFuncSureState extends State<HoistworkSafeFuncSure> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
final Map<String, dynamic> formData = {};
// 提交参数

13
lib/pages/home/tap/tabList/special_wrok/dz_work/aqjd_work_detail/hoistwork_aqjd_detail.dart
View File

@ -175,7 +175,7 @@ class _HoistworkAqjdDetailState extends State<HoistworkAqjdDetail> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
if (status == '1') {
} else {
@ -186,17 +186,10 @@ class _HoistworkAqjdDetailState extends State<HoistworkAqjdDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 抽取所有非空的 serverPath 并拼成逗号分隔的字符串
final serverPathString = imgList

5
lib/pages/home/tap/tabList/special_wrok/dz_work/dz_work_detai/hoistwork_apply_detail.dart
View File

@ -508,11 +508,10 @@ class _HoistworkApplyDetailState extends State<HoistworkApplyDetail> {
pd['ACTION_USER'] = SessionService.instance.username;
pd['APPLY_STATUS'] = status;
pd['SPECIAL_WORK'] = FormUtils.hasValue(pd, 'SPECIAL_WORK') ? pd['SPECIAL_WORK'] : '无';
pd['STEP_ID'] = status;
pd['TASK_ID'] = taskId;
// 提交参数
if (msg == 'add') {
pd['STEP_ID'] = status;
pd['TASK_ID'] = taskId;
pd['HOISTING_ID'] = widget.HOISTING_ID;
pd['APPLY_DEPARTMENT_ID'] = SessionService.instance.deptId;
pd['APPLY_DEPARTMENT_NAME'] =

13
lib/pages/home/tap/tabList/special_wrok/dz_work/dzzh_work_detail/hoistwork_dzzh_detail.dart
View File

@ -129,7 +129,7 @@ class _HoistworkDzzhDetailState extends State<HoistworkDzzhDetail> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
String DESCR = _contentController.text.trim();
if (status == '1') {
@ -145,17 +145,10 @@ class _HoistworkDzzhDetailState extends State<HoistworkDzzhDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 存回 measures

13
lib/pages/home/tap/tabList/special_wrok/dz_work/jhr_work_detail/hoistwork_jhr_detail.dart
View File

@ -130,7 +130,7 @@ class _HoistworkJhrDetailState extends State<HoistworkJhrDetail> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
if (status == '1') {
} else {
@ -141,17 +141,10 @@ class _HoistworkJhrDetailState extends State<HoistworkJhrDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
final Map<String, dynamic> formData = {};

13
lib/pages/home/tap/tabList/special_wrok/dz_work/jsjd_work_detail/hoistwork_jsjd_detail.dart
View File

@ -129,7 +129,7 @@ class _HoistworkJsjdDetailState extends State<HoistworkJsjdDetail> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
if (status == '1') {
} else {
@ -140,17 +140,10 @@ class _HoistworkJsjdDetailState extends State<HoistworkJsjdDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 存回 measures

13
lib/pages/home/tap/tabList/special_wrok/dz_work/jszy_work_detail/hoistwork_jszy_detail.dart
View File

@ -69,7 +69,7 @@ class _HoistworkJszyDetailState extends State<HoistworkJszyDetail> {
/// 作废 -1 通过 1
Future<void> _submit(String status) async {
String? reasonText = '';
String reasonText = '';
if (status == '1') {
if (endTime.isEmpty) {
ToastUtil.showNormal(context, '请选择作业结束时间');
@ -86,17 +86,10 @@ class _HoistworkJszyDetailState extends State<HoistworkJszyDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 存回 measures

13
lib/pages/home/tap/tabList/special_wrok/dz_work/kszy_work_detail/hoistwork_kszy_detail.dart
View File

@ -54,7 +54,7 @@ class _HoistworkKszyDetailState extends State<HoistworkKszyDetail> {
/// 作废 -1 通过 1
Future<void> _submit(String status) async {
String? reasonText = '';
String reasonText = '';
if (status == '1') {
if (startTime.isEmpty) {
ToastUtil.showNormal(context, '请选择作业开始时间');
@ -68,17 +68,10 @@ class _HoistworkKszyDetailState extends State<HoistworkKszyDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 存回 measures

13
lib/pages/home/tap/tabList/special_wrok/dz_work/shbm_work_detail/hoistwork_shbm_detail.dart
View File

@ -128,7 +128,7 @@ class _HoistworkShbmDetailState extends State<HoistworkShbmDetail> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
String DESCR = _contentController.text.trim();
if (status == '1') {
@ -144,17 +144,10 @@ class _HoistworkShbmDetailState extends State<HoistworkShbmDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 存回 measures

13
lib/pages/home/tap/tabList/special_wrok/dz_work/spbm_work_detail/hoistwork_spbm_detail.dart
View File

@ -128,7 +128,7 @@ class _HoistworkSpbmDetailState extends State<HoistworkSpbmDetail> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
String DESCR = _contentController.text.trim();
if (status == '1') {
@ -144,17 +144,10 @@ class _HoistworkSpbmDetailState extends State<HoistworkSpbmDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 存回 measures

13
lib/pages/home/tap/tabList/special_wrok/dz_work/ssr_work_detail/hoistwork_ssr_detail.dart
View File

@ -128,7 +128,7 @@ class _HoistworkSsrDetailState extends State<HoistworkSsrDetail> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
if (status == '1') {
} else {
@ -139,17 +139,10 @@ class _HoistworkSsrDetailState extends State<HoistworkSsrDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 存回 measures

13
lib/pages/home/tap/tabList/special_wrok/dz_work/szaq_work_detail/hoistwork_set_safe_detail.dart
View File

@ -240,7 +240,7 @@ class _HoistworkSetSafeDetailState extends State<HoistworkSetSafeDetail> {
Future<void> _submit(String status) async {
List<Map<String, dynamic>> signers = [];
String? reasonText = '';
String reasonText = '';
if (status == '1') {
int index = 0;
@ -279,17 +279,10 @@ class _HoistworkSetSafeDetailState extends State<HoistworkSetSafeDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
final Map<String, dynamic> formData = {};

13
lib/pages/home/tap/tabList/special_wrok/dz_work/szdw_work_detail/hoistwork_szdw_detail.dart
View File

@ -129,7 +129,7 @@ class _HoistworkSzdwDetailState extends State<HoistworkSzdwDetail> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
String DESCR = _contentController.text.trim();
if (status == '1') {
@ -145,17 +145,10 @@ class _HoistworkSzdwDetailState extends State<HoistworkSzdwDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 存回 measures

13
lib/pages/home/tap/tabList/special_wrok/dz_work/ysgd_work_detail/hoistwork_ysgd_detail.dart
View File

@ -185,7 +185,7 @@ class _HoistworkYsgdDetailState extends State<HoistworkYsgdDetail> {
}
String DESCR = _contentController.text.trim();
String? reasonText = '';
String reasonText = '';
if (status == '1') {
if (DESCR.isEmpty) {
ToastUtil.showNormal(context, '请输入负责人意见');
@ -215,17 +215,10 @@ class _HoistworkYsgdDetailState extends State<HoistworkYsgdDetail> {
cancelText: '取消',
confirmText: '确定',
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
final serverPathString = imgList
.map((e) => e.serverPath)

13
lib/pages/home/tap/tabList/special_wrok/dz_work/zyfz_work_detail/hoistwork_zyfz_detail.dart
View File

@ -129,7 +129,7 @@ class _HoistworkZyfzDetailState extends State<HoistworkZyfzDetail> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
String DESCR = _contentController.text.trim();
if (status == '1') {
@ -145,17 +145,10 @@ class _HoistworkZyfzDetailState extends State<HoistworkZyfzDetail> {
cancelText: '取消',
confirmText: '确定',
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 存回 measures

13
lib/pages/home/tap/tabList/special_wrok/dz_work/zyr_work_detail/hoistwork_zyr_detail.dart
View File

@ -128,7 +128,7 @@ class _HoistworkZyrDetailState extends State<HoistworkZyrDetail> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
if (status == '1') {
} else {
@ -139,17 +139,10 @@ class _HoistworkZyrDetailState extends State<HoistworkZyrDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 存回 measures

13
lib/pages/home/tap/tabList/special_wrok/gc_work/aqcs_work_detail/highwork_safe_func_sure.dart
View File

@ -190,7 +190,7 @@ class _HighworkSafeFuncSureState extends State<HighworkSafeFuncSure> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
if (status == '1') {
if (!_validateAndProceed(context)) {
@ -208,17 +208,10 @@ class _HighworkSafeFuncSureState extends State<HighworkSafeFuncSure> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
final Map<String, dynamic> formData = {};
// 提交参数

13
lib/pages/home/tap/tabList/special_wrok/gc_work/aqjd_work_detail/highwork_aqjd_detail.dart
View File

@ -175,7 +175,7 @@ class _HighworkAqjdDetailState extends State<HighworkAqjdDetail> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
if (status == '1') {
} else {
@ -186,17 +186,10 @@ class _HighworkAqjdDetailState extends State<HighworkAqjdDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 抽取所有非空的 serverPath 并拼成逗号分隔的字符串
final serverPathString = imgList

3
lib/pages/home/tap/tabList/special_wrok/gc_work/gc_work_detai/highwork_apply_detail.dart
View File

@ -528,11 +528,10 @@ class _HighworkApplyDetailState extends State<HighworkApplyDetail> {
pd['ACTION_USER'] = SessionService.instance.username;
pd['APPLY_STATUS'] = status;
pd['SPECIAL_WORK'] = FormUtils.hasValue(pd, 'SPECIAL_WORK') ? pd['SPECIAL_WORK'] : '无';
pd['TASK_ID'] = taskId;
// 提交参数
if (msg == 'add') {
pd['STEP_ID'] = status;
pd['TASK_ID'] = taskId;
pd['HIGHWORK_ID'] = widget.HIGHWORK_ID;
pd['APPLY_DEPARTMENT_ID'] = SessionService.instance.deptId;
pd['APPLY_DEPARTMENT_NAME'] =

13
lib/pages/home/tap/tabList/special_wrok/gc_work/jhr_work_detail/highwork_jhr_detail.dart
View File

@ -130,7 +130,7 @@ class _HighworkJhrDetailState extends State<HighworkJhrDetail> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
if (status == '1') {
} else {
@ -141,17 +141,10 @@ class _HighworkJhrDetailState extends State<HighworkJhrDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
final Map<String, dynamic> formData = {};

13
lib/pages/home/tap/tabList/special_wrok/gc_work/jsjd_work_detail/highwork_jsjd_detail.dart
View File

@ -129,7 +129,7 @@ class _HighworkJsjdDetailState extends State<HighworkJsjdDetail> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
if (status == '1') {
} else {
@ -140,17 +140,10 @@ class _HighworkJsjdDetailState extends State<HighworkJsjdDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 存回 measures

13
lib/pages/home/tap/tabList/special_wrok/gc_work/jszy_work_detail/highwork_jszy_detail.dart
View File

@ -69,7 +69,7 @@ class _HighworkJszyDetailState extends State<HighworkJszyDetail> {
/// 作废 -1 通过 1
Future<void> _submit(String status) async {
String? reasonText = '';
String reasonText = '';
if (status == '1') {
if (endTime.isEmpty) {
ToastUtil.showNormal(context, '请选择作业结束时间');
@ -86,17 +86,10 @@ class _HighworkJszyDetailState extends State<HighworkJszyDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 存回 measures

13
lib/pages/home/tap/tabList/special_wrok/gc_work/kszy_work_detail/highwork_kszy_detail.dart
View File

@ -55,7 +55,7 @@ class _HighworkKszyDetailState extends State<HighworkKszyDetail> {
/// 作废 -1 通过 1
Future<void> _submit(String status) async {
String? reasonText = '';
String reasonText = '';
if (status == '1') {
if (startTime.isEmpty) {
ToastUtil.showNormal(context, '请选择作业开始时间');
@ -69,17 +69,10 @@ class _HighworkKszyDetailState extends State<HighworkKszyDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 存回 measures

13
lib/pages/home/tap/tabList/special_wrok/gc_work/shbm_work_detail/highwork_shbm_detail.dart
View File

@ -128,7 +128,7 @@ class _HighworkShbmDetailState extends State<HighworkShbmDetail> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
String DESCR = _contentController.text.trim();
if (status == '1') {
@ -144,17 +144,10 @@ class _HighworkShbmDetailState extends State<HighworkShbmDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 存回 measures

13
lib/pages/home/tap/tabList/special_wrok/gc_work/spbm_work_detail/highwork_spbm_detail.dart
View File

@ -185,7 +185,7 @@ class _HighworkSpbmDetailState extends State<HighworkSpbmDetail> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
String DESCR = _contentController.text.trim();
if (status == '1') {
@ -201,17 +201,10 @@ class _HighworkSpbmDetailState extends State<HighworkSpbmDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 存回 measures

13
lib/pages/home/tap/tabList/special_wrok/gc_work/szaq_work_detail/highwork_set_safe_detail.dart
View File

@ -298,7 +298,7 @@ class _HighworkSetSafeDetailState extends State<HighworkSetSafeDetail> {
Future<void> _submit(String status) async {
List<Map<String, dynamic>> signers = [];
String? reasonText = '';
String reasonText = '';
if (status == '1') {
int index = 0;
@ -337,17 +337,10 @@ class _HighworkSetSafeDetailState extends State<HighworkSetSafeDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
final Map<String, dynamic> formData = {};

13
lib/pages/home/tap/tabList/special_wrok/gc_work/szdw_work_detail/highwork_szdw_detail.dart
View File

@ -129,7 +129,7 @@ class _HighworkSzdwDetailState extends State<HighworkSzdwDetail> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
String DESCR = _contentController.text.trim();
if (status == '1') {
@ -145,17 +145,10 @@ class _HighworkSzdwDetailState extends State<HighworkSzdwDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 存回 measures

13
lib/pages/home/tap/tabList/special_wrok/gc_work/ysgd_work_detail/highwork_ysgd_detail.dart
View File

@ -185,7 +185,7 @@ class _HighworkYsgdDetailState extends State<HighworkYsgdDetail> {
}
String DESCR = _contentController.text.trim();
String? reasonText = '';
String reasonText = '';
if (status == '1') {
if (DESCR.isEmpty) {
ToastUtil.showNormal(context, '请输入负责人意见');
@ -215,17 +215,10 @@ class _HighworkYsgdDetailState extends State<HighworkYsgdDetail> {
cancelText: '取消',
confirmText: '确定',
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
final serverPathString = imgList
.map((e) => e.serverPath)

13
lib/pages/home/tap/tabList/special_wrok/gc_work/zyfz_work_detail/highwork_zyfz_detail.dart
View File

@ -129,7 +129,7 @@ class _HighworkZyfzDetailState extends State<HighworkZyfzDetail> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
String DESCR = _contentController.text.trim();
if (status == '1') {
@ -141,17 +141,10 @@ class _HighworkZyfzDetailState extends State<HighworkZyfzDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 存回 measures

13
lib/pages/home/tap/tabList/special_wrok/gc_work/zyr_work_detail/highwork_zyr_detail.dart
View File

@ -128,7 +128,7 @@ class _HighworkZyrDetailState extends State<HighworkZyrDetail> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
if (status == '1') {
} else {
@ -139,17 +139,10 @@ class _HighworkZyrDetailState extends State<HighworkZyrDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 存回 measures

13
lib/pages/home/tap/tabList/special_wrok/home_gas_test_page.dart
View File

@ -209,7 +209,7 @@ class _HomeGasTestPageState extends State<HomeGasTestPage> {
}
}
String? reasonText = '';
String reasonText = '';
if (status != 1) {
reasonText = await CustomAlertDialog.showInput(
context,
@ -218,17 +218,10 @@ class _HomeGasTestPageState extends State<HomeGasTestPage> {
cancelText: '取消',
confirmText: '确定',
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
final confirmed = await CustomAlertDialog.showConfirm(
context,

13
lib/pages/home/tap/tabList/special_wrok/lsyd_work/aqcs_work_detail/electricity_safe_func_sure.dart
View File

@ -193,7 +193,7 @@ class _ElectricitySafeFuncSureState extends State<ElectricitySafeFuncSure> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
if (status == '1') {
if (!_validateAndProceed(context)) {
@ -211,17 +211,10 @@ class _ElectricitySafeFuncSureState extends State<ElectricitySafeFuncSure> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
final Map<String, dynamic> formData = {};
// 提交参数

13
lib/pages/home/tap/tabList/special_wrok/lsyd_work/aqjd_work_detail/electricity_aqjd_detail.dart
View File

@ -176,7 +176,7 @@ class _ElectricityAqjdDetailState extends State<ElectricityAqjdDetail> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
if (status == '1') {
} else {
@ -187,17 +187,10 @@ class _ElectricityAqjdDetailState extends State<ElectricityAqjdDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 抽取所有非空的 serverPath 并拼成逗号分隔的字符串
final serverPathString = imgList

13
lib/pages/home/tap/tabList/special_wrok/lsyd_work/dbbz_work_detail/electricity_dbbz_detail.dart
View File

@ -131,7 +131,7 @@ class _ElectricityDbbzDetailState extends State<ElectricityDbbzDetail> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
String DESCR = _contentController.text.trim();
if (DESCR.isEmpty) {
@ -147,17 +147,10 @@ class _ElectricityDbbzDetailState extends State<ElectricityDbbzDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 存回 measures

13
lib/pages/home/tap/tabList/special_wrok/lsyd_work/jhr_work_detail/electricity_jhr_detail.dart
View File

@ -128,7 +128,7 @@ class _ElectricityJhrDetailState extends State<ElectricityJhrDetail> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
if (status == '1') {
} else {
@ -139,17 +139,10 @@ class _ElectricityJhrDetailState extends State<ElectricityJhrDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
final Map<String, dynamic> formData = {};

13
lib/pages/home/tap/tabList/special_wrok/lsyd_work/jsjd_work_detail/electricity_jsjd_detail.dart
View File

@ -129,7 +129,7 @@ class _ElectricityJsjdDetailState extends State<ElectricityJsjdDetail> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
if (status == '1') {
} else {
@ -140,17 +140,10 @@ class _ElectricityJsjdDetailState extends State<ElectricityJsjdDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 存回 measures

13
lib/pages/home/tap/tabList/special_wrok/lsyd_work/jszy_work_detail/electricity_jszy_detail.dart
View File

@ -69,7 +69,7 @@ class _ElectricityJszyDetailState extends State<ElectricityJszyDetail> {
/// 作废 -1 通过 1
Future<void> _submit(String status) async {
String? reasonText = '';
String reasonText = '';
if (status == '1') {
if (endTime.isEmpty) {
ToastUtil.showNormal(context, '请选择作业结束时间');
@ -86,17 +86,10 @@ class _ElectricityJszyDetailState extends State<ElectricityJszyDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 存回 measures

13
lib/pages/home/tap/tabList/special_wrok/lsyd_work/kszy_work_detail/electricity_kszy_detail.dart
View File

@ -54,7 +54,7 @@ class _ElectricityKszyDetailState extends State<ElectricityKszyDetail> {
/// 作废 -1 通过 1
Future<void> _submit(String status) async {
String? reasonText = '';
String reasonText = '';
if (status == '1') {
if (startTime.isEmpty) {
ToastUtil.showNormal(context, '请选择作业开始时间');
@ -80,17 +80,10 @@ class _ElectricityKszyDetailState extends State<ElectricityKszyDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 存回 measures

13
lib/pages/home/tap/tabList/special_wrok/lsyd_work/psdw_work_detail/electricity_psdw_detail.dart
View File

@ -129,7 +129,7 @@ class _ElectricityPsdwDetailState extends State<ElectricityPsdwDetail> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
String DESCR = _contentController.text.trim();
if (status == '1') {
@ -145,17 +145,10 @@ class _ElectricityPsdwDetailState extends State<ElectricityPsdwDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 存回 measures

13
lib/pages/home/tap/tabList/special_wrok/lsyd_work/qtfx_work_detail/electricity_gas_test_page.dart
View File

@ -171,7 +171,7 @@ class _ElectricityGasTestPageState extends State<ElectricityGasTestPage> {
}
}
String? reasonText = '';
String reasonText = '';
if (status != 1) {
reasonText = await CustomAlertDialog.showInput(
context,
@ -180,17 +180,10 @@ class _ElectricityGasTestPageState extends State<ElectricityGasTestPage> {
cancelText: '取消',
confirmText: '确定',
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
final confirmed = await CustomAlertDialog.showConfirm(
context,

13
lib/pages/home/tap/tabList/special_wrok/lsyd_work/szaq_work_detail/electricity_set_safe_detail.dart
View File

@ -241,7 +241,7 @@ class _ElectricitySetSafeDetailState extends State<ElectricitySetSafeDetail> {
Future<void> _submit(String status) async {
List<Map<String, dynamic>> signers = [];
String? reasonText = '';
String reasonText = '';
if (status == '1') {
int index = 0;
@ -280,17 +280,10 @@ class _ElectricitySetSafeDetailState extends State<ElectricitySetSafeDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
final Map<String, dynamic> formData = {};

13
lib/pages/home/tap/tabList/special_wrok/lsyd_work/yddw_work_detail/electricity_yddw_detail.dart
View File

@ -129,7 +129,7 @@ class _ElectricityYddwDetailState extends State<ElectricityYddwDetail> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
String DESCR = _contentController.text.trim();
if (status == '1') {
@ -145,17 +145,10 @@ class _ElectricityYddwDetailState extends State<ElectricityYddwDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 存回 measures

13
lib/pages/home/tap/tabList/special_wrok/lsyd_work/ydr_work_detail/electricity_ydr_detail.dart
View File

@ -127,7 +127,7 @@ class _ElectricityYdrDetailState extends State<ElectricityYdrDetail> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
if (status == '1') {
} else {
@ -138,17 +138,10 @@ class _ElectricityYdrDetailState extends State<ElectricityYdrDetail> {
cancelText: '取消',
confirmText: '确定',
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
final Map<String, dynamic> formData = {};

13
lib/pages/home/tap/tabList/special_wrok/lsyd_work/ysgd_work_detail/electricity_ysgd_detail.dart
View File

@ -185,7 +185,7 @@ class _ElectricityYsgdDetailState extends State<ElectricityYsgdDetail> {
}
String DESCR = _contentController.text.trim();
String? reasonText = '';
String reasonText = '';
if (status == '1') {
if (DESCR.isEmpty) {
ToastUtil.showNormal(context, '请输入负责人意见');
@ -215,17 +215,10 @@ class _ElectricityYsgdDetailState extends State<ElectricityYsgdDetail> {
cancelText: '取消',
confirmText: '确定',
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
final serverPathString = imgList
.map((e) => e.serverPath)

13
lib/pages/home/tap/tabList/special_wrok/lsyd_work/zyfz_work_detail/electricity_zyfz_detail.dart
View File

@ -129,7 +129,7 @@ class _ElectricityZyfzDetailState extends State<ElectricityZyfzDetail> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
String DESCR = _contentController.text.trim();
if (status == '1') {
@ -145,17 +145,10 @@ class _ElectricityZyfzDetailState extends State<ElectricityZyfzDetail> {
cancelText: '取消',
confirmText: '确定',
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 存回 measures

13
lib/pages/home/tap/tabList/special_wrok/lsyd_work/zyr_work_detail/electricity_zyr_detail.dart
View File

@ -126,7 +126,7 @@ setState(() {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
if (status == '1') {
} else {
@ -137,17 +137,10 @@ setState(() {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 存回 measures

6
lib/pages/home/tap/tabList/special_wrok/mbcd_work/BlindboardDetailFormWidget.dart
View File

@ -444,7 +444,7 @@ class _BlindboardDetailFormWidgetState
label: '材质：',
isRequired: widget.isEditable,
isEditable: widget.isEditable,
text: board['BOARD_MATERIAL'] ?? '',
text: board['BOARD_MATERIAL'],
hintText: '请输入材质',
onChanged: (val) {
setState(() {
@ -458,7 +458,7 @@ class _BlindboardDetailFormWidgetState
label: '规格：',
isRequired: widget.isEditable,
isEditable: widget.isEditable,
text: board['BOARD_SPECIFICATION'] ?? '',
text: board['BOARD_SPECIFICATION'],
onChanged: (val) {
setState(() {
board['BOARD_SPECIFICATION'] = val;
@ -472,7 +472,7 @@ class _BlindboardDetailFormWidgetState
label: '编号：',
isEditable: widget.isEditable,
isRequired: widget.isEditable,
text: board['BOARD_NO'] ?? '',
text: board['BOARD_NO'],
onChanged: (val) {
setState(() {
board['BOARD_NO'] = val;

13
lib/pages/home/tap/tabList/special_wrok/mbcd_work/aqcs_work_detail/blindboard_safe_func_sure.dart
View File

@ -202,7 +202,7 @@ class _BlindboardSafeFuncSureState extends State<BlindboardSafeFuncSure> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
if (status == '1') {
if (!_validateAndProceed(context)) {
@ -220,17 +220,10 @@ class _BlindboardSafeFuncSureState extends State<BlindboardSafeFuncSure> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
final Map<String, dynamic> formData = {};
// 提交参数

13
lib/pages/home/tap/tabList/special_wrok/mbcd_work/aqjd_work_detail/blindboard_aqjd_detail.dart
View File

@ -176,7 +176,7 @@ class _BlindboardAqjdDetailState extends State<BlindboardAqjdDetail> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
if (status == '1') {
} else {
@ -187,17 +187,10 @@ class _BlindboardAqjdDetailState extends State<BlindboardAqjdDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 抽取所有非空的 serverPath 并拼成逗号分隔的字符串
final serverPathString = imgList

13
lib/pages/home/tap/tabList/special_wrok/mbcd_work/cjry_work_detail/blindboard_cjry_detail.dart
View File

@ -144,7 +144,7 @@ class _BlindboardCjryDetailState extends State<BlindboardCjryDetail> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
if (status == '1') {
if (imgList.isEmpty) {
@ -164,17 +164,10 @@ class _BlindboardCjryDetailState extends State<BlindboardCjryDetail> {
cancelText: '取消',
confirmText: '确定',
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
final serverPathString = imgList
.map((e) => e.serverPath)

13
lib/pages/home/tap/tabList/special_wrok/mbcd_work/jhr_work_detail/blindboard_jhr_detail.dart
View File

@ -131,7 +131,7 @@ class _BlindboardJhrDetailState extends State<BlindboardJhrDetail> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
if (status == '1') {
} else {
@ -142,17 +142,10 @@ class _BlindboardJhrDetailState extends State<BlindboardJhrDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
final Map<String, dynamic> formData = {};

13
lib/pages/home/tap/tabList/special_wrok/mbcd_work/jsjd_work_detail/blindboard_jsjd_detail.dart
View File

@ -130,7 +130,7 @@ class _BlindboardJsjdDetailState extends State<BlindboardJsjdDetail> {
ToastUtil.showNormal(context, '请签字');
return;
}
String? reasonText = '';
String reasonText = '';
if (status == '1') {
} else {
@ -141,17 +141,10 @@ class _BlindboardJsjdDetailState extends State<BlindboardJsjdDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 存回 measures

13
lib/pages/home/tap/tabList/special_wrok/mbcd_work/jszy_work_detail/blindboard_jszy_detail.dart
View File

@ -69,7 +69,7 @@ class _BlindboardJszyDetailState extends State<BlindboardJszyDetail> {
/// 作废 -1 通过 1
Future<void> _submit(String status) async {
String? reasonText = '';
String reasonText = '';
if (status == '1') {
if (endTime.isEmpty) {
ToastUtil.showNormal(context, '请选择作业结束时间');
@ -86,17 +86,10 @@ class _BlindboardJszyDetailState extends State<BlindboardJszyDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 存回 measures

13
lib/pages/home/tap/tabList/special_wrok/mbcd_work/kszy_work_detail/blindboard_kszy_detail.dart
View File

@ -56,7 +56,7 @@ class _BlindboardKszyDetailState extends State<BlindboardKszyDetail> {
/// 作废 -1 通过 1
Future<void> _submit(String status) async {
String? reasonText = '';
String reasonText = '';
if (status == '1') {
if (startTime.isEmpty) {
ToastUtil.showNormal(context, '请选择作业开始时间');
@ -70,17 +70,10 @@ class _BlindboardKszyDetailState extends State<BlindboardKszyDetail> {
cancelText: '取消',
confirmText: '确定'
);
// 用户取消（或点遮罩、返回键）
if (reasonText == null) {
// 取消时什么也不做，不提示
return;
}
// 用户点击确认但没填内容
if (reasonText.isEmpty) {
if (reasonText.isEmpty) {
ToastUtil.showNormal(context, '请填写作废原因');
return;
}
}
}
// 存回 measures

Some files were not shown because too many files have changed in this diff Show More