危险作业bug修改1
parent
627ef2201f
commit
c792b58e07
|
|
@ -41,10 +41,16 @@ class SpecialListInitData {
|
|||
List<String> getInitData(SpecialWorkTypeEnum type) {
|
||||
List<String> 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;
|
||||
|
||||
|
|
|
|||
|
|
@ -241,7 +241,7 @@ class _HotWorkDetailFormWidgetState extends State<HotWorkDetailFormWidget> {
|
|||
ItemListWidget.singleLineTitleText(
|
||||
label: '申请单位:',
|
||||
isEditable: false,
|
||||
text: pd['applyUnit'] ?? '',
|
||||
text: pd['applyDepartment'] ?? '',
|
||||
),
|
||||
const Divider(),
|
||||
ItemListWidget.singleLineTitleText(
|
||||
|
|
|
|||
|
|
@ -301,7 +301,7 @@ class _DhWaitPageState extends State<DhWaitPage> {
|
|||
const SizedBox(width: 8),
|
||||
Expanded(
|
||||
child: Text(
|
||||
"申请部门: ${hotInfo['applyUnit'] ?? ''}",
|
||||
"申请部门: ${hotInfo['applyDepartment'] ?? ''}",
|
||||
textAlign: TextAlign.right,
|
||||
softWrap: true,
|
||||
maxLines: null,
|
||||
|
|
|
|||
|
|
@ -863,7 +863,7 @@ class _HotworkApplyDetailState extends State<HotworkApplyDetail> {
|
|||
ItemListWidget.singleLineTitleText(
|
||||
label: '申请单位:',
|
||||
isEditable: false,
|
||||
text: pd['applyUnit'] ?? '',
|
||||
text: pd['applyDepartment'] ?? '',
|
||||
),
|
||||
const Divider(),
|
||||
ItemListWidget.singleLineTitleText(
|
||||
|
|
@ -980,6 +980,7 @@ class _HotworkApplyDetailState extends State<HotworkApplyDetail> {
|
|||
pd['workStartTime'] = DateFormat(
|
||||
'yyyy-MM-dd HH:mm:ss',
|
||||
).format(picked);
|
||||
pd['workEndTime'] = '';
|
||||
});
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -244,7 +244,7 @@ class _BreakgroundDetailFormWidgetState extends State<BreakgroundDetailFormWidge
|
|||
ItemListWidget.singleLineTitleText(
|
||||
label: '申请单位:',
|
||||
isEditable: false,
|
||||
text: pd['applyUnit'] ?? '',
|
||||
text: pd['applyDepartment'] ?? '',
|
||||
),
|
||||
const Divider(),
|
||||
ItemListWidget.singleLineTitleText(
|
||||
|
|
|
|||
|
|
@ -980,7 +980,7 @@ class _DlApplyPageState extends State<DlApplyPage> {
|
|||
ItemListWidget.singleLineTitleText(
|
||||
label: '申请单位:',
|
||||
isEditable: false,
|
||||
text: pd['applyUnit'] ?? '',
|
||||
text: pd['applyDepartment'] ?? '',
|
||||
),
|
||||
const Divider(),
|
||||
ItemListWidget.singleLineTitleText(
|
||||
|
|
@ -1118,6 +1118,7 @@ class _DlApplyPageState extends State<DlApplyPage> {
|
|||
pd['workStartTime'] = DateFormat(
|
||||
'yyyy-MM-dd HH:mm:ss',
|
||||
).format(picked);
|
||||
pd['workEndTime'] = '';
|
||||
});
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -354,7 +354,7 @@ class _DlWaitPageState extends State<DlWaitPage> {
|
|||
const SizedBox(width: 8),
|
||||
Expanded(
|
||||
child: Text(
|
||||
"申请单位: ${info['applyUnit'] ?? ''}",
|
||||
"申请单位: ${info['applyDepartment'] ?? ''}",
|
||||
textAlign: TextAlign.right,
|
||||
softWrap: true,
|
||||
maxLines: null,
|
||||
|
|
|
|||
|
|
@ -244,7 +244,7 @@ class _CutRoadDetailFormWidgetState extends State<CutRoadDetailFormWidget> {
|
|||
ItemListWidget.singleLineTitleText(
|
||||
label: '申请单位:',
|
||||
isEditable: false,
|
||||
text: pd['applyUnit'] ?? '',
|
||||
text: pd['applyDepartment'] ?? '',
|
||||
),
|
||||
const Divider(),
|
||||
ItemListWidget.singleLineTitleText(
|
||||
|
|
|
|||
|
|
@ -977,7 +977,7 @@ class _DtApplyPageState extends State<DtApplyPage> {
|
|||
ItemListWidget.singleLineTitleText(
|
||||
label: '申请单位:',
|
||||
isEditable: false,
|
||||
text: pd['applyUnit'] ?? '',
|
||||
text: pd['applyDepartment'] ?? '',
|
||||
),
|
||||
const Divider(),
|
||||
ItemListWidget.singleLineTitleText(
|
||||
|
|
@ -1039,6 +1039,7 @@ class _DtApplyPageState extends State<DtApplyPage> {
|
|||
pd['workStartTime'] = DateFormat(
|
||||
'yyyy-MM-dd HH:mm:ss',
|
||||
).format(picked);
|
||||
pd['workEndTime'] = '';
|
||||
});
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -334,7 +334,7 @@ class _DtWaitPageState extends State<DtWaitPage> {
|
|||
const SizedBox(width: 8),
|
||||
Expanded(
|
||||
child: Text(
|
||||
"申请单位: ${info['applyUnit'] ?? ''}",
|
||||
"申请单位: ${info['applyDepartment'] ?? ''}",
|
||||
textAlign: TextAlign.right,
|
||||
softWrap: true,
|
||||
maxLines: null,
|
||||
|
|
|
|||
|
|
@ -983,7 +983,7 @@ class _DzApplyPageState extends State<DzApplyPage> {
|
|||
ItemListWidget.singleLineTitleText(
|
||||
label: '申请单位:',
|
||||
isEditable: false,
|
||||
text: pd['applyUnit'] ?? '',
|
||||
text: pd['applyDepartment'] ?? '',
|
||||
),
|
||||
const Divider(),
|
||||
ItemListWidget.singleLineTitleText(
|
||||
|
|
@ -1119,6 +1119,7 @@ class _DzApplyPageState extends State<DzApplyPage> {
|
|||
pd['workStartTime'] = DateFormat(
|
||||
'yyyy-MM-dd HH:mm:ss',
|
||||
).format(picked);
|
||||
pd['workEndTime'] = '';
|
||||
});
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -333,7 +333,7 @@ class _DzWaitPageState extends State<DzWaitPage> {
|
|||
const SizedBox(width: 8),
|
||||
Expanded(
|
||||
child: Text(
|
||||
"申请单位: ${info['applyUnit'] ?? ''}",
|
||||
"申请单位: ${info['applyDepartment'] ?? ''}",
|
||||
textAlign: TextAlign.right,
|
||||
softWrap: true,
|
||||
maxLines: null,
|
||||
|
|
|
|||
|
|
@ -244,7 +244,7 @@ class _HoistingDetailFormWidgetState extends State<HoistingDetailFormWidget> {
|
|||
ItemListWidget.singleLineTitleText(
|
||||
label: '申请单位:',
|
||||
isEditable: false,
|
||||
text: pd['applyUnit'] ?? '',
|
||||
text: pd['applyDepartment'] ?? '',
|
||||
),
|
||||
const Divider(),
|
||||
ItemListWidget.singleLineTitleText(
|
||||
|
|
|
|||
|
|
@ -240,7 +240,7 @@ class _HeighWorkDetailFormWidgetState extends State<HeighWorkDetailFormWidget> {
|
|||
ItemListWidget.singleLineTitleText(
|
||||
label: '申请单位:',
|
||||
isEditable: false,
|
||||
text: pd['applyUnit'] ?? '',
|
||||
text: pd['applyDepartment'] ?? '',
|
||||
),
|
||||
const Divider(),
|
||||
ItemListWidget.singleLineTitleText(
|
||||
|
|
|
|||
|
|
@ -936,7 +936,7 @@ class _GcApplyPageState extends State<GcApplyPage> {
|
|||
ItemListWidget.singleLineTitleText(
|
||||
label: '申请单位:',
|
||||
isEditable: false,
|
||||
text: pd['applyUnit'] ?? '',
|
||||
text: pd['applyDepartment'] ?? '',
|
||||
),
|
||||
const Divider(),
|
||||
ItemListWidget.singleLineTitleText(
|
||||
|
|
@ -1097,6 +1097,7 @@ class _GcApplyPageState extends State<GcApplyPage> {
|
|||
pd['workStartTime'] = DateFormat(
|
||||
'yyyy-MM-dd HH:mm:ss',
|
||||
).format(picked);
|
||||
pd['workEndTime'] = '';
|
||||
// 如果作业开始时间大于作业结束时间,则清除作业结束时间
|
||||
if (FormUtils.hasValue(pd, 'workEndTime')) {
|
||||
if (picked.isAfter(
|
||||
|
|
|
|||
|
|
@ -318,7 +318,7 @@ class _GcWaitPageState extends State<GcWaitPage> {
|
|||
const SizedBox(width: 8),
|
||||
Expanded(
|
||||
child: Text(
|
||||
"申请单位: ${info['applyUnit'] ?? ''}",
|
||||
"申请单位: ${info['applyDepartment'] ?? ''}",
|
||||
textAlign: TextAlign.right,
|
||||
softWrap: true,
|
||||
maxLines: null,
|
||||
|
|
|
|||
|
|
@ -237,7 +237,7 @@ class _LsydWorkDetailFormWidgetState extends State<LsydWorkDetailFormWidget> {
|
|||
ItemListWidget.singleLineTitleText(
|
||||
label: '申请单位:',
|
||||
isEditable: false,
|
||||
text: pd['applyUnit'] ?? '',
|
||||
text: pd['applyDepartment'] ?? '',
|
||||
),
|
||||
const Divider(),
|
||||
ItemListWidget.singleLineTitleText(
|
||||
|
|
|
|||
|
|
@ -1022,7 +1022,7 @@ class _LsydApplyPageState extends State<LsydApplyPage> {
|
|||
ItemListWidget.singleLineTitleText(
|
||||
label: '申请单位:',
|
||||
isEditable: false,
|
||||
text: pd['applyUnit'] ?? '',
|
||||
text: pd['applyDepartment'] ?? '',
|
||||
),
|
||||
const Divider(),
|
||||
ItemListWidget.singleLineTitleText(
|
||||
|
|
@ -1130,6 +1130,7 @@ class _LsydApplyPageState extends State<LsydApplyPage> {
|
|||
pd['workStartTime'] = DateFormat(
|
||||
'yyyy-MM-dd HH:mm:ss',
|
||||
).format(picked);
|
||||
pd['workEndTime'] = '';
|
||||
});
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -352,7 +352,7 @@ class _LsydWaitPageState extends State<LsydWaitPage> {
|
|||
const SizedBox(width: 8),
|
||||
Expanded(
|
||||
child: Text(
|
||||
"申请单位: ${info['applyUnit'] ?? ''}",
|
||||
"申请单位: ${info['applyDepartment'] ?? ''}",
|
||||
textAlign: TextAlign.right,
|
||||
softWrap: true,
|
||||
maxLines: null,
|
||||
|
|
|
|||
|
|
@ -293,7 +293,7 @@ class _MbcdDetailFormWidgetState extends State<MbcdDetailFormWidget> {
|
|||
ItemListWidget.singleLineTitleText(
|
||||
label: '申请单位:',
|
||||
isEditable: false,
|
||||
text: pd['applyUnit'] ?? '',
|
||||
text: pd['applyDepartment'] ?? '',
|
||||
),
|
||||
const Divider(),
|
||||
ItemListWidget.singleLineTitleText(
|
||||
|
|
|
|||
|
|
@ -1193,7 +1193,7 @@ class _MbcdApplyPageState extends State<MbcdApplyPage> {
|
|||
ItemListWidget.singleLineTitleText(
|
||||
label: '申请单位:',
|
||||
isEditable: false,
|
||||
text: pd['applyUnit'] ?? '',
|
||||
text: pd['applyDepartment'] ?? '',
|
||||
),
|
||||
const Divider(),
|
||||
ItemListWidget.singleLineTitleText(
|
||||
|
|
@ -1291,6 +1291,7 @@ class _MbcdApplyPageState extends State<MbcdApplyPage> {
|
|||
pd['workStartTime'] = DateFormat(
|
||||
'yyyy-MM-dd HH:mm:ss',
|
||||
).format(picked);
|
||||
pd['workEndTime'] = '';
|
||||
});
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -333,7 +333,7 @@ class _MbcdWaitPageState extends State<MbcdWaitPage> {
|
|||
const SizedBox(width: 8),
|
||||
Expanded(
|
||||
child: Text(
|
||||
"申请单位: ${info['applyUnit'] ?? ''}",
|
||||
"申请单位: ${info['applyDepartment'] ?? ''}",
|
||||
textAlign: TextAlign.right,
|
||||
softWrap: true,
|
||||
maxLines: null,
|
||||
|
|
|
|||
|
|
@ -303,7 +303,7 @@ class _SxkjWorkDetailFormWidgetState extends State<SxkjWorkDetailFormWidget> {
|
|||
ItemListWidget.singleLineTitleText(
|
||||
label: '申请单位:',
|
||||
isEditable: false,
|
||||
text: pd['applyUnit'] ?? '',
|
||||
text: pd['applyDepartment'] ?? '',
|
||||
),
|
||||
const Divider(),
|
||||
ItemListWidget.singleLineTitleText(
|
||||
|
|
|
|||
|
|
@ -886,7 +886,7 @@ class _SxkjApplyPageState extends State<SxkjApplyPage> {
|
|||
ItemListWidget.singleLineTitleText(
|
||||
label: '申请单位:',
|
||||
isEditable: false,
|
||||
text: pd['applyUnit'] ?? '',
|
||||
text: pd['applyDepartment'] ?? '',
|
||||
),
|
||||
const Divider(),
|
||||
ItemListWidget.singleLineTitleText(
|
||||
|
|
|
|||
|
|
@ -296,7 +296,7 @@ class _SxkjWaitPageState extends State<SxkjWaitPage> {
|
|||
const SizedBox(width: 8),
|
||||
Expanded(
|
||||
child: Text(
|
||||
"申请单位: ${info['applyUnit'] ?? ''}",
|
||||
"申请单位: ${info['applyDepartment'] ?? ''}",
|
||||
textAlign: TextAlign.right,
|
||||
softWrap: true,
|
||||
maxLines: null,
|
||||
|
|
|
|||
Loading…
Reference in New Issue