From da1044b7441c84db5482bbf62bdc6ff3d40f7129 Mon Sep 17 00:00:00 2001 From: xufei <727302827@qq.com> Date: Wed, 13 May 2026 17:32:07 +0800 Subject: [PATCH] =?UTF-8?q?2026.5.13=20=E9=87=8D=E7=82=B9=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/pages/home/home_page.dart | 4 +- .../keyTasks/key_tasks_confirm_list_page.dart | 45 ++++++++++--------- 2 files changed, 27 insertions(+), 22 deletions(-) diff --git a/lib/pages/home/home_page.dart b/lib/pages/home/home_page.dart index 5b4a7be..678fe02 100644 --- a/lib/pages/home/home_page.dart +++ b/lib/pages/home/home_page.dart @@ -1009,7 +1009,9 @@ class HomePageState extends RouteAwareState case "特殊作业": await pushPage(WorkTabListPage(), context); break; - + case "重点作业": + await pushPage(KeyTasksTabPage(), context); + break; } _getToDoWorkList(pcType); diff --git a/lib/pages/home/keyTasks/key_tasks_confirm_list_page.dart b/lib/pages/home/keyTasks/key_tasks_confirm_list_page.dart index d9d5525..35f340b 100644 --- a/lib/pages/home/keyTasks/key_tasks_confirm_list_page.dart +++ b/lib/pages/home/keyTasks/key_tasks_confirm_list_page.dart @@ -193,28 +193,31 @@ class _KeyTasksConfirmListPageState extends State { buttonStyle:ButtonStyleType.primary, text: '查看'),), - const SizedBox(width: 8), - Expanded(child: CustomButton( - height: 35, - onPressed: () async { - if( item["applyStatus"]==1){ - _goToDetail(item,index,2); - }else{ - final ok = await CustomAlertDialog.showConfirm( - context, - title: '完工申请', - content: '确定要提交吗?', - cancelText: '取消', - ); - if (ok) { - _upKeyTasksData(item); + if((item['uncheckHiddenCount']==0&&item['unFinishInspectionCount']==0)||item["applyStatus"]==1)...[ + const SizedBox(width: 8), + Expanded(child: CustomButton( + height: 35, + onPressed: () async { + if( item["applyStatus"]==1){ + _goToDetail(item,index,2); + }else{ + final ok = await CustomAlertDialog.showConfirm( + context, + title: '完工申请', + content: '确定要提交吗?', + cancelText: '取消', + ); + if (ok) { + _upKeyTasksData(item); + } } - } - }, - backgroundColor: h_AppBarColor(), - textStyle: const TextStyle(color: Colors.white), - buttonStyle:ButtonStyleType.primary, - text: item["applyStatus"]==1?'开工申请':'完工申请'),), + }, + backgroundColor: h_AppBarColor(), + textStyle: const TextStyle(color: Colors.white), + buttonStyle:ButtonStyleType.primary, + text: item["applyStatus"]==1?'开工申请':'完工申请'),), + ], + ],),