|
@@ -910,7 +910,7 @@ export class FuwutaiComponent implements OnInit {
|
910
|
910
|
if (stateId == 1) {
|
911
|
911
|
// 未分派
|
912
|
912
|
that.unassignedList = data.list || [];
|
913
|
|
- if (that.unassignedListClone === null) {
|
|
913
|
+ // if (that.unassignedListClone === null) {
|
914
|
914
|
that.unassignedList.forEach((item) => {
|
915
|
915
|
item.checked = false;
|
916
|
916
|
});
|
|
@@ -919,18 +919,18 @@ export class FuwutaiComponent implements OnInit {
|
919
|
919
|
that.unassignedListClone = JSON.parse(
|
920
|
920
|
JSON.stringify(that.unassignedList)
|
921
|
921
|
);
|
922
|
|
- } else {
|
923
|
|
- that.unassignedList.forEach((item1) => {
|
924
|
|
- that.unassignedListClone.forEach((item2) => {
|
925
|
|
- if (item1.id == item2.id) {
|
926
|
|
- item1.checked = item2.checked;
|
927
|
|
- }
|
928
|
|
- });
|
929
|
|
- });
|
930
|
|
- this.batchType = this.unassignedListClone.some(
|
931
|
|
- (item) => item.checked
|
932
|
|
- );
|
933
|
|
- }
|
|
922
|
+ // } else {
|
|
923
|
+ // that.unassignedList.forEach((item1) => {
|
|
924
|
+ // that.unassignedListClone.forEach((item2) => {
|
|
925
|
+ // if (item1.id == item2.id) {
|
|
926
|
+ // item1.checked = item2.checked;
|
|
927
|
+ // }
|
|
928
|
+ // });
|
|
929
|
+ // });
|
|
930
|
+ // this.batchType = this.unassignedListClone.some(
|
|
931
|
+ // (item) => item.checked
|
|
932
|
+ // );
|
|
933
|
+ // }
|
934
|
934
|
if (
|
935
|
935
|
this.audioNotDispatched &&
|
936
|
936
|
that.unassignedList.length > 0 &&
|
|
@@ -948,23 +948,23 @@ export class FuwutaiComponent implements OnInit {
|
948
|
948
|
} else if (stateId == 2) {
|
949
|
949
|
// 待到达
|
950
|
950
|
that.arriveList = data.list || [];
|
951
|
|
- if (that.arriveListClone === null) {
|
|
951
|
+ // if (that.arriveListClone === null) {
|
952
|
952
|
that.arriveList.forEach((item) => {
|
953
|
953
|
item.checked = false;
|
954
|
954
|
});
|
955
|
955
|
that.batchType1 = false;
|
956
|
956
|
that.allArriveList = false;
|
957
|
957
|
that.arriveListClone = JSON.parse(JSON.stringify(that.arriveList));
|
958
|
|
- } else {
|
959
|
|
- that.arriveList.forEach((item1) => {
|
960
|
|
- that.arriveListClone.forEach((item2) => {
|
961
|
|
- if (item1.id == item2.id) {
|
962
|
|
- item1.checked = item2.checked;
|
963
|
|
- }
|
964
|
|
- });
|
965
|
|
- });
|
966
|
|
- this.batchType1 = this.arriveListClone.some((item) => item.checked);
|
967
|
|
- }
|
|
958
|
+ // } else {
|
|
959
|
+ // that.arriveList.forEach((item1) => {
|
|
960
|
+ // that.arriveListClone.forEach((item2) => {
|
|
961
|
+ // if (item1.id == item2.id) {
|
|
962
|
+ // item1.checked = item2.checked;
|
|
963
|
+ // }
|
|
964
|
+ // });
|
|
965
|
+ // });
|
|
966
|
+ // this.batchType1 = this.arriveListClone.some((item) => item.checked);
|
|
967
|
+ // }
|
968
|
968
|
that.loading2 = false;
|
969
|
969
|
} else if (stateId == 3) {
|
970
|
970
|
// 执行中
|