Compare commits

..

No commits in common. "b1b00ec469871035299741289235b6024f31f93e" and "67bf32e9192e908d95d6cf44910234bb0a370f34" have entirely different histories.

19 changed files with 261 additions and 289 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 69 KiB

After

Width:  |  Height:  |  Size: 0 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 0 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 0 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 0 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 0 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 0 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 0 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 0 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 0 B

View File

@ -47,7 +47,7 @@ class _workTabDhListState extends State<workTabDhList> {
_loading = true;
});
try {
final res = await SpecialWorkApi.getSpecialWorkStepList(SpecialWorkTypeEnum.hotWork.code);
final res = await SpecialWorkApi.getSpecialWorkStepList('confinedspace_work');
if (res != null && res['success'] == true) {
setState(() {
final rawData = res['data'] ?? [];

View File

@ -46,7 +46,7 @@ class _WorkTabDlListState extends State<WorkTabDlList> {
_loading = true;
});
try {
final res = await SpecialWorkApi.getSpecialWorkStepList(SpecialWorkTypeEnum.cutRoadWork.code);
final res = await SpecialWorkApi.getSpecialWorkStepList('confinedspace_work');
if (res != null && res['success'] == true) {
setState(() {
final rawData = res['data'] ?? [];

View File

@ -46,7 +46,7 @@ class _WorkTabDtListState extends State<WorkTabDtList> {
_loading = true;
});
try {
final res = await SpecialWorkApi.getSpecialWorkStepList(SpecialWorkTypeEnum.breakgroundWork.code);
final res = await SpecialWorkApi.getSpecialWorkStepList('confinedspace_work');
if (res != null && res['success'] == true) {
setState(() {
final rawData = res['data'] ?? [];

View File

@ -46,7 +46,7 @@ class _WorkTabDzListState extends State<WorkTabDzList> {
_loading = true;
});
try {
final res = await SpecialWorkApi.getSpecialWorkStepList(SpecialWorkTypeEnum.hoistingWork.code);
final res = await SpecialWorkApi.getSpecialWorkStepList('confinedspace_work');
if (res != null && res['success'] == true) {
setState(() {
final rawData = res['data'] ?? [];

View File

@ -46,7 +46,7 @@ class _WorkTabGcListState extends State<WorkTabGcList> {
_loading = true;
});
try {
final res = await SpecialWorkApi.getSpecialWorkStepList(SpecialWorkTypeEnum.highWork.code);
final res = await SpecialWorkApi.getSpecialWorkStepList('confinedspace_work');
if (res != null && res['success'] == true) {
setState(() {
final rawData = res['data'] ?? [];

View File

@ -46,7 +46,7 @@ class _WorkTabLsydListState extends State<WorkTabLsydList> {
_loading = true;
});
try {
final res = await SpecialWorkApi.getSpecialWorkStepList(SpecialWorkTypeEnum.electricityWork.code);
final res = await SpecialWorkApi.getSpecialWorkStepList('confinedspace_work');
if (res != null && res['success'] == true) {
setState(() {
final rawData = res['data'] ?? [];

View File

@ -46,7 +46,7 @@ class _WorkTabMbcdListState extends State<WorkTabMbcdList> {
_loading = true;
});
try {
final res = await SpecialWorkApi.getSpecialWorkStepList(SpecialWorkTypeEnum.blindboardWork.code);
final res = await SpecialWorkApi.getSpecialWorkStepList('confinedspace_work');
if (res != null && res['success'] == true) {
setState(() {
final rawData = res['data'] ?? [];

View File

@ -49,7 +49,7 @@ class _WorkTabSpaceListState extends State<WorkTabSpaceList> {
_loading = true;
});
try {
final res = await SpecialWorkApi.getSpecialWorkStepList(SpecialWorkTypeEnum.confinedspaceWork.code);
final res = await SpecialWorkApi.getSpecialWorkStepList('confinedspace_work');
if (res != null && res['success'] == true) {
setState(() {
final rawData = res['data'] ?? [];

View File

@ -556,11 +556,7 @@ abstract class SpecialWorkApplyBaseState<T extends SpecialWorkApplyBasePage>
//
if (stepId == '20') {
allowChoosePersonList[0] = data;
if (allowChoosePersonList.length > 1) {
allowChoosePersonList[1] = data;
}else{
allowChoosePersonList.add(data);
}
_clearRelatedPartiesPerson();
} else if (stepId == '21') {
allowChoosePersonList[1] = data;

File diff suppressed because it is too large Load Diff