|
@@ -112,16 +112,18 @@ class SelectTableFPageOrReserveState extends State<SelectTableFPageOrReserve> { |
|
@@ -112,16 +112,18 @@ class SelectTableFPageOrReserveState extends State<SelectTableFPageOrReserve> { |
|
112
|
await tableManagerModel.getTableListOrReserve(
|
112
|
await tableManagerModel.getTableListOrReserve(
|
|
113
|
context, int.parse(widget.ddate_slot), widget.dateTime, _selectNumber);
|
113
|
context, int.parse(widget.ddate_slot), widget.dateTime, _selectNumber);
|
|
114
|
tableManagerModel.tablesOrReserveDataShow.forEach((element) {
|
114
|
tableManagerModel.tablesOrReserveDataShow.forEach((element) {
|
|
115
|
- element.tableList.forEach((element) {
|
|
|
|
116
|
- element.selected = false;
|
|
|
|
117
|
- for (var table in widget.tableList) {
|
|
|
|
118
|
- if (element.id == table.id) {
|
|
|
|
119
|
- element.selected = true;
|
|
|
|
120
|
- selectNum++;
|
|
|
|
121
|
- tableManagerModel.selectTablesOrReserve.add(element);
|
115
|
+ if (element.name == '全部') {
|
|
|
|
116
|
+ element.tableList.forEach((element) {
|
|
|
|
117
|
+ element.selected = false;
|
|
|
|
118
|
+ for (var table in widget.tableList) {
|
|
|
|
119
|
+ if (element.id == table.id) {
|
|
|
|
120
|
+ element.selected = true;
|
|
|
|
121
|
+ selectNum++;
|
|
|
|
122
|
+ tableManagerModel.selectTablesOrReserve.add(element);
|
|
|
|
123
|
+ }
|
|
122
|
}
|
124
|
}
|
|
123
|
- }
|
|
|
|
124
|
- });
|
125
|
+ });
|
|
|
|
126
|
+ }
|
|
125
|
});
|
127
|
});
|
|
126
|
tableManagerModel.notifyListeners();
|
128
|
tableManagerModel.notifyListeners();
|
|
127
|
}
|
129
|
}
|
|
@@ -293,12 +295,15 @@ class SelectTableFPageOrReserveState extends State<SelectTableFPageOrReserve> { |
|
@@ -293,12 +295,15 @@ class SelectTableFPageOrReserveState extends State<SelectTableFPageOrReserve> { |
|
293
|
child: Consumer<TableManagerModelOrReserve>(
|
295
|
child: Consumer<TableManagerModelOrReserve>(
|
|
294
|
builder: (context, model, child) {
|
296
|
builder: (context, model, child) {
|
|
295
|
if (model.pageStateOrReserve != PageState.Success) {
|
297
|
if (model.pageStateOrReserve != PageState.Success) {
|
|
296
|
- return Expanded(
|
298
|
+ return Expanded(
|
|
297
|
child: ExceptionPage(
|
299
|
child: ExceptionPage(
|
|
298
|
pageState: model.pageStateOrReserve,
|
300
|
pageState: model.pageStateOrReserve,
|
|
299
|
callback: () {
|
301
|
callback: () {
|
|
300
|
- tableManagerModel.getTableListOrReserve(context,
|
|
|
|
301
|
- int.parse(widget.ddate_slot), widget.dateTime, _selectNumber,
|
302
|
+ tableManagerModel.getTableListOrReserve(
|
|
|
|
303
|
+ context,
|
|
|
|
304
|
+ int.parse(widget.ddate_slot),
|
|
|
|
305
|
+ widget.dateTime,
|
|
|
|
306
|
+ _selectNumber,
|
|
302
|
showLoading: true);
|
307
|
showLoading: true);
|
|
303
|
},
|
308
|
},
|
|
304
|
emptyMsg: "暂时没有桌位哦",
|
309
|
emptyMsg: "暂时没有桌位哦",
|
|
@@ -448,13 +453,10 @@ class SelectTableFPageOrReserveState extends State<SelectTableFPageOrReserve> { |
|
@@ -448,13 +453,10 @@ class SelectTableFPageOrReserveState extends State<SelectTableFPageOrReserve> { |
|
448
|
element.tableList.length > 0) {
|
453
|
element.tableList.length > 0) {
|
|
449
|
List<TableListReserve> tableList = [];
|
454
|
List<TableListReserve> tableList = [];
|
|
450
|
element.tableList.forEach((element1) {
|
455
|
element.tableList.forEach((element1) {
|
|
451
|
- if (element1.reserveList ==
|
|
|
|
452
|
- null &&
|
|
|
|
453
|
- (element1.banquetList ==
|
|
|
|
454
|
- null ||
|
|
|
|
455
|
- element1.banquetList
|
|
|
|
456
|
- .length ==
|
|
|
|
457
|
- 0)) {
|
456
|
+ if (element1.reserveList == null &&
|
|
|
|
457
|
+ (element1.banquetList == null ||
|
|
|
|
458
|
+ element1.banquetList.length ==
|
|
|
|
459
|
+ 0)) {
|
|
458
|
//空桌子
|
460
|
//空桌子
|
|
459
|
tableList.add(element1);
|
461
|
tableList.add(element1);
|
|
460
|
}
|
462
|
}
|