From e44c86d2d4a7da3edaf6711ee1ba18b41be543ad Mon Sep 17 00:00:00 2001 From: xufei <727302827@qq.com> Date: Mon, 22 Jun 2026 17:36:30 +0800 Subject: [PATCH] =?UTF-8?q?2026.6.22=20=E9=87=8D=E7=82=B9=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E5=A4=84=E7=BD=9A=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../key_tasks_hidden_danger_detail.dart | 83 +++++++++++++++++-- .../key_tasks_punishment_list.dart | 23 ++--- 2 files changed, 90 insertions(+), 16 deletions(-) diff --git a/lib/pages/home/keyTasks/keyTasksDetail/keyTasksHiddenDanger/key_tasks_hidden_danger_detail.dart b/lib/pages/home/keyTasks/keyTasksDetail/keyTasksHiddenDanger/key_tasks_hidden_danger_detail.dart index e5ed1e2..84dcf46 100644 --- a/lib/pages/home/keyTasks/keyTasksDetail/keyTasksHiddenDanger/key_tasks_hidden_danger_detail.dart +++ b/lib/pages/home/keyTasks/keyTasksDetail/keyTasksHiddenDanger/key_tasks_hidden_danger_detail.dart @@ -46,6 +46,7 @@ class KeyTasksHiddenDangerDetail extends StatefulWidget { Key? key, this.inspectId, this.inspectCodeId, + this.itemData, }) : super(key: key); final item; // 1 隐患整改 2 隐患记录 3 处罚反馈 @@ -55,6 +56,7 @@ class KeyTasksHiddenDangerDetail extends StatefulWidget { final bool canChange; final String? inspectId; final String? inspectCodeId; + final Map? itemData; // 整个item @override _KeyTasksHiddenDangerDetailState createState() => _KeyTasksHiddenDangerDetailState(); @@ -134,7 +136,7 @@ class _KeyTasksHiddenDangerDetailState extends State break; } - + penaltyFeedbackData['feedbackTime']= DateFormat('yyyy-MM-dd HH:mm:ss').format(DateTime.now()); _getUserData(); getData(); } @@ -614,6 +616,72 @@ class _KeyTasksHiddenDangerDetailState extends State ), ], + // 处罚信息 + if (pd['hiddenPenaltyCO'] != null) ...[ + SizedBox(height: 10), + // const Divider(height: 10,color: Colors.grey,), + Card( + color: Colors.white, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Padding( + padding: EdgeInsets.only( + top: 10, + left: 10, + right: 10, + ), + child: Row( + children: [ + Container( + width: 3, + height: 15, + color: Colors.blue, + ), + const SizedBox(width: 8), + Text( + "处罚信息", + style: const TextStyle( + fontSize: 16, + fontWeight: FontWeight.bold, + ), + ), + ], + ), + ), + + _buildInfoItem( + '是否进行处罚', + pd["hiddenPenaltyCO"]['fineFlag'] ==1?'是':'否', + ), + Divider(height: 1), + _buildInfoItem( + '下发人', + pd["hiddenPenaltyCO"]['penalizedUserName'] ?? '', + ), + Divider(height: 1), + _buildInfoItem( + '下发时间', + _changeTime( pd["hiddenPenaltyCO"]['penaltyTime'] ?? ''), + // pd["rectificationRecord"]['rectificationTime'] ?? '', + ), + Divider(height: 1), + _buildInfoItem( + '处罚原因', + pd["hiddenPenaltyCO"]['penaltyDesc'] ?? '', + // pd["rectificationRecord"]['rectificationTime'] ?? '', + ), + Divider(height: 1), + _buildInfoItem( + '处罚金额', + pd["hiddenPenaltyCO"]['penaltyAmount']?.toString() ?? '' + // pd["rectificationRecord"]['rectificationTime'] ?? '', + ), + + ], + ), + ), + ], // // 整改信息 // if (pd['hiddenRectifyUserCO'] != null && @@ -821,7 +889,11 @@ class _KeyTasksHiddenDangerDetailState extends State ), Divider(height: 1), - _buildInfoItem('处罚反馈人', widget.foreignKey ,), + Padding( + padding: EdgeInsets.symmetric(horizontal: 8), + child: _buildInfoItem('处罚反馈人', widget.itemData?['feedbackUserName']??'',), + ), + const Divider(height: 1), GestureDetector( @@ -843,7 +915,7 @@ class _KeyTasksHiddenDangerDetailState extends State child: ListItemFactory.createRowSpaceBetweenItem( isRequired:true, leftText: "处罚反馈时间", - rightText: penaltyFeedbackData['feedbackTime'].isNotEmpty?hiddenDangerRectification['feedbackTime']:"请选择", + rightText: penaltyFeedbackData['feedbackTime']??"请选择", isRight: true, ), ), @@ -1121,8 +1193,9 @@ class _KeyTasksHiddenDangerDetailState extends State return; } - penaltyFeedbackData['hiddenPenaltyId']=widget.itemId; - penaltyFeedbackData['feedbackUserId']=widget.hiddenId; + penaltyFeedbackData['hiddenPenaltyId']=widget.itemData?['hiddenPenaltyId']; + penaltyFeedbackData['feedbackUserId']=widget.itemData?['feedbackUserId']; + LoadingDialogHelper.show(); if (gaiHouImages.isNotEmpty) { diff --git a/lib/pages/home/keyTasks/keyTasksDetail/punishmentKeyTasks/key_tasks_punishment_list.dart b/lib/pages/home/keyTasks/keyTasksDetail/punishmentKeyTasks/key_tasks_punishment_list.dart index f3f52c1..9897314 100644 --- a/lib/pages/home/keyTasks/keyTasksDetail/punishmentKeyTasks/key_tasks_punishment_list.dart +++ b/lib/pages/home/keyTasks/keyTasksDetail/punishmentKeyTasks/key_tasks_punishment_list.dart @@ -234,7 +234,7 @@ class _KeyTasksPunishmentListState extends State { // 隐患状态 Expanded( child: Text( - '被处罚单位: ${pageData['']??''}', + '被处罚单位: ${pageData['xgfCorpinfoName']??''}', style: TextStyle(fontSize: 14, color: Colors.black87), ), ), @@ -253,7 +253,7 @@ class _KeyTasksPunishmentListState extends State { // 隐患发现人 - 使用 Expanded 包裹 Expanded( child: Text( - '被处罚人:${pageData['findUserName'] ?? ''}', + '被处罚人:${pageData['feedbackUserName'] ?? ''}', style: TextStyle(fontSize: 14, color: Colors.black87), maxLines: 1, overflow: TextOverflow.ellipsis, @@ -282,7 +282,7 @@ class _KeyTasksPunishmentListState extends State { // 整改人 Expanded( child: - Text('处罚原因: ${pageData['projectName'] ?? ''}', + Text('处罚原因: ${pageData['penaltyDesc'] ?? ''}', style: TextStyle(fontSize: 14, color: Colors.black87), ), ), @@ -299,7 +299,7 @@ class _KeyTasksPunishmentListState extends State { // 整改人 Expanded( child: - Text('下发人: ${pageData['projectName'] ?? ''}', + Text('下发人: ${pageData['findUserName'] ?? ''}', style: TextStyle(fontSize: 14, color: Colors.black87), ), ), @@ -316,7 +316,7 @@ class _KeyTasksPunishmentListState extends State { // 整改人 Expanded( child: - Text('处罚反馈状态: ${pageData['projectName'] ?? ''}', + Text('处罚反馈状态: ${pageData['feedbackStatus'] ?? ''}', style: TextStyle(fontSize: 14, color: Colors.black87), ), ), @@ -368,9 +368,9 @@ class _KeyTasksPunishmentListState extends State { await pushPage( KeyTasksHiddenDangerDetail( 2, - pageData['id'], - pageData['hiddenId'], - pageData['foreignKey'], + pageData['hiddenTableId']??'', + pageData['hiddenId']??'', + pageData['foreignKey']??'', false, ), context, @@ -394,9 +394,10 @@ class _KeyTasksPunishmentListState extends State { await pushPage( KeyTasksHiddenDangerDetail( 3, - pageData['hiddenPenaltyId']??'', - pageData['feedbackUserId']??'', - pageData['feedbackUserName']??'', + pageData['hiddenTableId']??'', + pageData['hiddenId']??'', + pageData['foreignKey']??'', + itemData:pageData, false, ), context,