diff --git a/lib/pages/home/Tap/special_header.dart b/lib/pages/home/Tap/special_header.dart index cad4a34..15a8c5d 100644 --- a/lib/pages/home/Tap/special_header.dart +++ b/lib/pages/home/Tap/special_header.dart @@ -41,10 +41,16 @@ class SpecialListInitData { List getInitData(SpecialWorkTypeEnum type) { List list = [ // 动火 - "work_place",//动火部位 + "work_place", //动火部位 "work_way", + "workMonitor", + "hotWorkActUser", + "corpinfoId", + "projectExecutionLocationCorpId", + "projectExecutionLocationCorpName", + // 受限空间 - "applyUnit", + "applyDepartment", "applyUser", "checkNo", "signStepFlag", @@ -121,11 +127,11 @@ class SpecialListInitData { "number", "blindboardWorkParams", "applyUserSignImage", - ]; + return list; } } -bool isKF = true; +bool isKF = false; diff --git a/lib/pages/home/Tap/special_work/dh_work/HotWorkDetailFormWidget.dart b/lib/pages/home/Tap/special_work/dh_work/HotWorkDetailFormWidget.dart index 780c221..55afbab 100644 --- a/lib/pages/home/Tap/special_work/dh_work/HotWorkDetailFormWidget.dart +++ b/lib/pages/home/Tap/special_work/dh_work/HotWorkDetailFormWidget.dart @@ -241,7 +241,7 @@ class _HotWorkDetailFormWidgetState extends State { ItemListWidget.singleLineTitleText( label: '申请单位:', isEditable: false, - text: pd['applyUnit'] ?? '', + text: pd['applyDepartment'] ?? '', ), const Divider(), ItemListWidget.singleLineTitleText( diff --git a/lib/pages/home/Tap/special_work/dh_work/dh_wait_page.dart b/lib/pages/home/Tap/special_work/dh_work/dh_wait_page.dart index a57bf62..c73e277 100644 --- a/lib/pages/home/Tap/special_work/dh_work/dh_wait_page.dart +++ b/lib/pages/home/Tap/special_work/dh_work/dh_wait_page.dart @@ -301,7 +301,7 @@ class _DhWaitPageState extends State { const SizedBox(width: 8), Expanded( child: Text( - "申请部门: ${hotInfo['applyUnit'] ?? ''}", + "申请部门: ${hotInfo['applyDepartment'] ?? ''}", textAlign: TextAlign.right, softWrap: true, maxLines: null, diff --git a/lib/pages/home/Tap/special_work/dh_work/hot_apply_page.dart b/lib/pages/home/Tap/special_work/dh_work/hot_apply_page.dart index 44cc557..cab2477 100644 --- a/lib/pages/home/Tap/special_work/dh_work/hot_apply_page.dart +++ b/lib/pages/home/Tap/special_work/dh_work/hot_apply_page.dart @@ -863,7 +863,7 @@ class _HotworkApplyDetailState extends State { ItemListWidget.singleLineTitleText( label: '申请单位:', isEditable: false, - text: pd['applyUnit'] ?? '', + text: pd['applyDepartment'] ?? '', ), const Divider(), ItemListWidget.singleLineTitleText( @@ -980,6 +980,7 @@ class _HotworkApplyDetailState extends State { pd['workStartTime'] = DateFormat( 'yyyy-MM-dd HH:mm:ss', ).format(picked); + pd['workEndTime'] = ''; }); } }, diff --git a/lib/pages/home/Tap/special_work/dl_work/breakgroundDetailFormWidget.dart b/lib/pages/home/Tap/special_work/dl_work/breakgroundDetailFormWidget.dart index b3d6879..804c0ba 100644 --- a/lib/pages/home/Tap/special_work/dl_work/breakgroundDetailFormWidget.dart +++ b/lib/pages/home/Tap/special_work/dl_work/breakgroundDetailFormWidget.dart @@ -244,7 +244,7 @@ class _BreakgroundDetailFormWidgetState extends State { ItemListWidget.singleLineTitleText( label: '申请单位:', isEditable: false, - text: pd['applyUnit'] ?? '', + text: pd['applyDepartment'] ?? '', ), const Divider(), ItemListWidget.singleLineTitleText( @@ -1118,6 +1118,7 @@ class _DlApplyPageState extends State { pd['workStartTime'] = DateFormat( 'yyyy-MM-dd HH:mm:ss', ).format(picked); + pd['workEndTime'] = ''; }); } }, diff --git a/lib/pages/home/Tap/special_work/dl_work/dl_wait_page.dart b/lib/pages/home/Tap/special_work/dl_work/dl_wait_page.dart index 479b949..bd83504 100644 --- a/lib/pages/home/Tap/special_work/dl_work/dl_wait_page.dart +++ b/lib/pages/home/Tap/special_work/dl_work/dl_wait_page.dart @@ -354,7 +354,7 @@ class _DlWaitPageState extends State { const SizedBox(width: 8), Expanded( child: Text( - "申请单位: ${info['applyUnit'] ?? ''}", + "申请单位: ${info['applyDepartment'] ?? ''}", textAlign: TextAlign.right, softWrap: true, maxLines: null, diff --git a/lib/pages/home/Tap/special_work/dt_work/cutRoadDetailFormWidget.dart b/lib/pages/home/Tap/special_work/dt_work/cutRoadDetailFormWidget.dart index 83b3957..0214495 100644 --- a/lib/pages/home/Tap/special_work/dt_work/cutRoadDetailFormWidget.dart +++ b/lib/pages/home/Tap/special_work/dt_work/cutRoadDetailFormWidget.dart @@ -244,7 +244,7 @@ class _CutRoadDetailFormWidgetState extends State { ItemListWidget.singleLineTitleText( label: '申请单位:', isEditable: false, - text: pd['applyUnit'] ?? '', + text: pd['applyDepartment'] ?? '', ), const Divider(), ItemListWidget.singleLineTitleText( diff --git a/lib/pages/home/Tap/special_work/dt_work/dt_apply_page.dart b/lib/pages/home/Tap/special_work/dt_work/dt_apply_page.dart index fb3361b..aa9e8d2 100644 --- a/lib/pages/home/Tap/special_work/dt_work/dt_apply_page.dart +++ b/lib/pages/home/Tap/special_work/dt_work/dt_apply_page.dart @@ -977,7 +977,7 @@ class _DtApplyPageState extends State { ItemListWidget.singleLineTitleText( label: '申请单位:', isEditable: false, - text: pd['applyUnit'] ?? '', + text: pd['applyDepartment'] ?? '', ), const Divider(), ItemListWidget.singleLineTitleText( @@ -1039,6 +1039,7 @@ class _DtApplyPageState extends State { pd['workStartTime'] = DateFormat( 'yyyy-MM-dd HH:mm:ss', ).format(picked); + pd['workEndTime'] = ''; }); } }, diff --git a/lib/pages/home/Tap/special_work/dt_work/dt_wait_page.dart b/lib/pages/home/Tap/special_work/dt_work/dt_wait_page.dart index 2a45bf3..caa09a3 100644 --- a/lib/pages/home/Tap/special_work/dt_work/dt_wait_page.dart +++ b/lib/pages/home/Tap/special_work/dt_work/dt_wait_page.dart @@ -334,7 +334,7 @@ class _DtWaitPageState extends State { const SizedBox(width: 8), Expanded( child: Text( - "申请单位: ${info['applyUnit'] ?? ''}", + "申请单位: ${info['applyDepartment'] ?? ''}", textAlign: TextAlign.right, softWrap: true, maxLines: null, diff --git a/lib/pages/home/Tap/special_work/dz_work/dz_apply_page.dart b/lib/pages/home/Tap/special_work/dz_work/dz_apply_page.dart index e1c8791..65c09a7 100644 --- a/lib/pages/home/Tap/special_work/dz_work/dz_apply_page.dart +++ b/lib/pages/home/Tap/special_work/dz_work/dz_apply_page.dart @@ -983,7 +983,7 @@ class _DzApplyPageState extends State { ItemListWidget.singleLineTitleText( label: '申请单位:', isEditable: false, - text: pd['applyUnit'] ?? '', + text: pd['applyDepartment'] ?? '', ), const Divider(), ItemListWidget.singleLineTitleText( @@ -1119,6 +1119,7 @@ class _DzApplyPageState extends State { pd['workStartTime'] = DateFormat( 'yyyy-MM-dd HH:mm:ss', ).format(picked); + pd['workEndTime'] = ''; }); } }, diff --git a/lib/pages/home/Tap/special_work/dz_work/dz_wait_page.dart b/lib/pages/home/Tap/special_work/dz_work/dz_wait_page.dart index b709a31..2b05f97 100644 --- a/lib/pages/home/Tap/special_work/dz_work/dz_wait_page.dart +++ b/lib/pages/home/Tap/special_work/dz_work/dz_wait_page.dart @@ -333,7 +333,7 @@ class _DzWaitPageState extends State { const SizedBox(width: 8), Expanded( child: Text( - "申请单位: ${info['applyUnit'] ?? ''}", + "申请单位: ${info['applyDepartment'] ?? ''}", textAlign: TextAlign.right, softWrap: true, maxLines: null, diff --git a/lib/pages/home/Tap/special_work/dz_work/hoistingDetailFormWidget.dart b/lib/pages/home/Tap/special_work/dz_work/hoistingDetailFormWidget.dart index 29ba212..e7c3df1 100644 --- a/lib/pages/home/Tap/special_work/dz_work/hoistingDetailFormWidget.dart +++ b/lib/pages/home/Tap/special_work/dz_work/hoistingDetailFormWidget.dart @@ -244,7 +244,7 @@ class _HoistingDetailFormWidgetState extends State { ItemListWidget.singleLineTitleText( label: '申请单位:', isEditable: false, - text: pd['applyUnit'] ?? '', + text: pd['applyDepartment'] ?? '', ), const Divider(), ItemListWidget.singleLineTitleText( diff --git a/lib/pages/home/Tap/special_work/gc_work/HeighWorkDetailFormWidget.dart b/lib/pages/home/Tap/special_work/gc_work/HeighWorkDetailFormWidget.dart index 3a5cf5c..37feac3 100644 --- a/lib/pages/home/Tap/special_work/gc_work/HeighWorkDetailFormWidget.dart +++ b/lib/pages/home/Tap/special_work/gc_work/HeighWorkDetailFormWidget.dart @@ -240,7 +240,7 @@ class _HeighWorkDetailFormWidgetState extends State { ItemListWidget.singleLineTitleText( label: '申请单位:', isEditable: false, - text: pd['applyUnit'] ?? '', + text: pd['applyDepartment'] ?? '', ), const Divider(), ItemListWidget.singleLineTitleText( diff --git a/lib/pages/home/Tap/special_work/gc_work/gc_apply_page.dart b/lib/pages/home/Tap/special_work/gc_work/gc_apply_page.dart index 969e24b..462394e 100644 --- a/lib/pages/home/Tap/special_work/gc_work/gc_apply_page.dart +++ b/lib/pages/home/Tap/special_work/gc_work/gc_apply_page.dart @@ -936,7 +936,7 @@ class _GcApplyPageState extends State { ItemListWidget.singleLineTitleText( label: '申请单位:', isEditable: false, - text: pd['applyUnit'] ?? '', + text: pd['applyDepartment'] ?? '', ), const Divider(), ItemListWidget.singleLineTitleText( @@ -1097,6 +1097,7 @@ class _GcApplyPageState extends State { pd['workStartTime'] = DateFormat( 'yyyy-MM-dd HH:mm:ss', ).format(picked); + pd['workEndTime'] = ''; // 如果作业开始时间大于作业结束时间,则清除作业结束时间 if (FormUtils.hasValue(pd, 'workEndTime')) { if (picked.isAfter( diff --git a/lib/pages/home/Tap/special_work/gc_work/gc_wait_page.dart b/lib/pages/home/Tap/special_work/gc_work/gc_wait_page.dart index 206266a..9e33835 100644 --- a/lib/pages/home/Tap/special_work/gc_work/gc_wait_page.dart +++ b/lib/pages/home/Tap/special_work/gc_work/gc_wait_page.dart @@ -318,7 +318,7 @@ class _GcWaitPageState extends State { const SizedBox(width: 8), Expanded( child: Text( - "申请单位: ${info['applyUnit'] ?? ''}", + "申请单位: ${info['applyDepartment'] ?? ''}", textAlign: TextAlign.right, softWrap: true, maxLines: null, diff --git a/lib/pages/home/Tap/special_work/lsyd_work/LsydWorkDetailFormWidget.dart b/lib/pages/home/Tap/special_work/lsyd_work/LsydWorkDetailFormWidget.dart index d821c3b..743fd4d 100644 --- a/lib/pages/home/Tap/special_work/lsyd_work/LsydWorkDetailFormWidget.dart +++ b/lib/pages/home/Tap/special_work/lsyd_work/LsydWorkDetailFormWidget.dart @@ -237,7 +237,7 @@ class _LsydWorkDetailFormWidgetState extends State { ItemListWidget.singleLineTitleText( label: '申请单位:', isEditable: false, - text: pd['applyUnit'] ?? '', + text: pd['applyDepartment'] ?? '', ), const Divider(), ItemListWidget.singleLineTitleText( diff --git a/lib/pages/home/Tap/special_work/lsyd_work/lsyd_apply_page.dart b/lib/pages/home/Tap/special_work/lsyd_work/lsyd_apply_page.dart index 4fcbe91..07e7d2e 100644 --- a/lib/pages/home/Tap/special_work/lsyd_work/lsyd_apply_page.dart +++ b/lib/pages/home/Tap/special_work/lsyd_work/lsyd_apply_page.dart @@ -1022,7 +1022,7 @@ class _LsydApplyPageState extends State { ItemListWidget.singleLineTitleText( label: '申请单位:', isEditable: false, - text: pd['applyUnit'] ?? '', + text: pd['applyDepartment'] ?? '', ), const Divider(), ItemListWidget.singleLineTitleText( @@ -1130,6 +1130,7 @@ class _LsydApplyPageState extends State { pd['workStartTime'] = DateFormat( 'yyyy-MM-dd HH:mm:ss', ).format(picked); + pd['workEndTime'] = ''; }); } }, diff --git a/lib/pages/home/Tap/special_work/lsyd_work/lsyd_wait_page.dart b/lib/pages/home/Tap/special_work/lsyd_work/lsyd_wait_page.dart index c6996bb..acc07ce 100644 --- a/lib/pages/home/Tap/special_work/lsyd_work/lsyd_wait_page.dart +++ b/lib/pages/home/Tap/special_work/lsyd_work/lsyd_wait_page.dart @@ -352,7 +352,7 @@ class _LsydWaitPageState extends State { const SizedBox(width: 8), Expanded( child: Text( - "申请单位: ${info['applyUnit'] ?? ''}", + "申请单位: ${info['applyDepartment'] ?? ''}", textAlign: TextAlign.right, softWrap: true, maxLines: null, diff --git a/lib/pages/home/Tap/special_work/mbcd_work/mbcdDetailFormWidget.dart b/lib/pages/home/Tap/special_work/mbcd_work/mbcdDetailFormWidget.dart index 55df04a..1a093df 100644 --- a/lib/pages/home/Tap/special_work/mbcd_work/mbcdDetailFormWidget.dart +++ b/lib/pages/home/Tap/special_work/mbcd_work/mbcdDetailFormWidget.dart @@ -293,7 +293,7 @@ class _MbcdDetailFormWidgetState extends State { ItemListWidget.singleLineTitleText( label: '申请单位:', isEditable: false, - text: pd['applyUnit'] ?? '', + text: pd['applyDepartment'] ?? '', ), const Divider(), ItemListWidget.singleLineTitleText( diff --git a/lib/pages/home/Tap/special_work/mbcd_work/mbcd_apply_page.dart b/lib/pages/home/Tap/special_work/mbcd_work/mbcd_apply_page.dart index 45d1c0f..0e21106 100644 --- a/lib/pages/home/Tap/special_work/mbcd_work/mbcd_apply_page.dart +++ b/lib/pages/home/Tap/special_work/mbcd_work/mbcd_apply_page.dart @@ -1193,7 +1193,7 @@ class _MbcdApplyPageState extends State { ItemListWidget.singleLineTitleText( label: '申请单位:', isEditable: false, - text: pd['applyUnit'] ?? '', + text: pd['applyDepartment'] ?? '', ), const Divider(), ItemListWidget.singleLineTitleText( @@ -1291,6 +1291,7 @@ class _MbcdApplyPageState extends State { pd['workStartTime'] = DateFormat( 'yyyy-MM-dd HH:mm:ss', ).format(picked); + pd['workEndTime'] = ''; }); } }, diff --git a/lib/pages/home/Tap/special_work/mbcd_work/mbcd_wait_page.dart b/lib/pages/home/Tap/special_work/mbcd_work/mbcd_wait_page.dart index f507000..dbabeea 100644 --- a/lib/pages/home/Tap/special_work/mbcd_work/mbcd_wait_page.dart +++ b/lib/pages/home/Tap/special_work/mbcd_work/mbcd_wait_page.dart @@ -333,7 +333,7 @@ class _MbcdWaitPageState extends State { const SizedBox(width: 8), Expanded( child: Text( - "申请单位: ${info['applyUnit'] ?? ''}", + "申请单位: ${info['applyDepartment'] ?? ''}", textAlign: TextAlign.right, softWrap: true, maxLines: null, diff --git a/lib/pages/home/Tap/special_work/sxkj_work/SxkjWorkDetailFormWidget.dart b/lib/pages/home/Tap/special_work/sxkj_work/SxkjWorkDetailFormWidget.dart index 05e6ac0..527cf1f 100644 --- a/lib/pages/home/Tap/special_work/sxkj_work/SxkjWorkDetailFormWidget.dart +++ b/lib/pages/home/Tap/special_work/sxkj_work/SxkjWorkDetailFormWidget.dart @@ -303,7 +303,7 @@ class _SxkjWorkDetailFormWidgetState extends State { ItemListWidget.singleLineTitleText( label: '申请单位:', isEditable: false, - text: pd['applyUnit'] ?? '', + text: pd['applyDepartment'] ?? '', ), const Divider(), ItemListWidget.singleLineTitleText( diff --git a/lib/pages/home/Tap/special_work/sxkj_work/sxkj_apply_page.dart b/lib/pages/home/Tap/special_work/sxkj_work/sxkj_apply_page.dart index 1aa0a23..20d5eab 100644 --- a/lib/pages/home/Tap/special_work/sxkj_work/sxkj_apply_page.dart +++ b/lib/pages/home/Tap/special_work/sxkj_work/sxkj_apply_page.dart @@ -886,7 +886,7 @@ class _SxkjApplyPageState extends State { ItemListWidget.singleLineTitleText( label: '申请单位:', isEditable: false, - text: pd['applyUnit'] ?? '', + text: pd['applyDepartment'] ?? '', ), const Divider(), ItemListWidget.singleLineTitleText( diff --git a/lib/pages/home/Tap/special_work/sxkj_work/sxkj_wait_page.dart b/lib/pages/home/Tap/special_work/sxkj_work/sxkj_wait_page.dart index 9de6afc..86f613e 100644 --- a/lib/pages/home/Tap/special_work/sxkj_work/sxkj_wait_page.dart +++ b/lib/pages/home/Tap/special_work/sxkj_work/sxkj_wait_page.dart @@ -296,7 +296,7 @@ class _SxkjWaitPageState extends State { const SizedBox(width: 8), Expanded( child: Text( - "申请单位: ${info['applyUnit'] ?? ''}", + "申请单位: ${info['applyDepartment'] ?? ''}", textAlign: TextAlign.right, softWrap: true, maxLines: null,