Compare commits

..

No commits in common. "76f30a74753561b751cf54ebf38857a98f8d0efd" and "f5ec99a72ea1ea05e54ec80a38600bf6b4d5a6e8" have entirely different histories.

3 changed files with 4 additions and 27 deletions

View File

@ -193,8 +193,6 @@ class _HotDelayPageState extends State<HotDelayPage> {
ToastUtil.showNormal(context, '已转发'); ToastUtil.showNormal(context, '已转发');
Navigator.of(context).pop(); Navigator.of(context).pop();
} else if (type == SubmitType.complete || type == SubmitType.close) { } else if (type == SubmitType.complete || type == SubmitType.close) {
Navigator.of(context).pop();
ToastUtil.showNormal( ToastUtil.showNormal(
context, context,
type == SubmitType.complete ? '已完成' : '已关闭', type == SubmitType.complete ? '已完成' : '已关闭',

View File

@ -214,8 +214,6 @@ abstract class SpecialWorkApplyBaseState<T extends SpecialWorkApplyBasePage>
if (FormUtils.hasValue(pd, 'xgfId')) { if (FormUtils.hasValue(pd, 'xgfId')) {
_getRelatedPartiesUserList(true); _getRelatedPartiesUserList(true);
} }
_getWorkLevel();//
} else { } else {
pd = _toMap(initRes['data']); pd = _toMap(initRes['data']);
pd['xgfFlag'] = 1; pd['xgfFlag'] = 1;
@ -258,24 +256,7 @@ abstract class SpecialWorkApplyBaseState<T extends SpecialWorkApplyBasePage>
LoadingDialogHelper.dismiss(); LoadingDialogHelper.dismiss();
} }
} }
//
Future<void> _getWorkLevel() async {
try {
final response = await SpecialWorkApi.specialWorkLevelList(
workType.code,
);
if (response['success']) {
final List<dynamic> data = response['data'];
setState(() {
levelList.addAll(
data.map((item) => item as Map<String, dynamic>),
);
});
}
} catch (e) {
print(e);
}
}
/// ///
Future<void> _loadSafeMeasures() async { Future<void> _loadSafeMeasures() async {
final reqData = {'eqWorkId': form['workId'] ?? ''}; final reqData = {'eqWorkId': form['workId'] ?? ''};

View File

@ -179,9 +179,7 @@ class _SpecialWorkTaskPageBaseState extends State<SpecialWorkTaskPageBase> {
_measures = measuresData['data'] ?? []; _measures = measuresData['data'] ?? [];
for (final measure in _measures) { for (final measure in _measures) {
measure['workId'] = pd['workId']; measure['workId'] = pd['workId'];
if (!FormUtils.hasValue(measure, 'status')) { measure['status'] = 1;
measure['status'] = 1;
}
} }
} }
} }
@ -465,7 +463,7 @@ class _SpecialWorkTaskPageBaseState extends State<SpecialWorkTaskPageBase> {
children: [ children: [
if (item['selectLevel'] == 1) ...[ if (item['selectLevel'] == 1) ...[
ItemListWidget.selectableLineTitleTextRightButton( ItemListWidget.selectableLineTitleTextRightButton(
isRequired: (canSkip == 2), isRequired: (canSkip == 0),
label: deptLabel, label: deptLabel,
isEditable: true, isEditable: true,
isClean: (canSkip == 1), isClean: (canSkip == 1),
@ -487,7 +485,7 @@ class _SpecialWorkTaskPageBaseState extends State<SpecialWorkTaskPageBase> {
), ),
] else ...[ ] else ...[
ItemListWidget.selectableLineTitleTextRightButton( ItemListWidget.selectableLineTitleTextRightButton(
isRequired: (canSkip == 2), isRequired: (canSkip == 0),
label: personLabel, label: personLabel,
isEditable: true, isEditable: true,
text: (item['actUserName'] as String?)?.isNotEmpty == true text: (item['actUserName'] as String?)?.isNotEmpty == true