Commit 82c2b661fdc70b4e0582aadfa0b05ca5a27d4dd1
1 parent
d205d464
合并桌位弹窗,跳转至被合并桌位区域选中(原来区域默认选中0,改后:选中被合并桌位所在的区域)
Showing
1 changed file
with
14 additions
and
13 deletions
| 1 | - | ||
| 2 | import 'dart:ffi'; | 1 | import 'dart:ffi'; |
| 3 | 2 | ||
| 4 | import 'package:common_utils/common_utils.dart'; | 3 | import 'package:common_utils/common_utils.dart'; |
| @@ -227,6 +226,10 @@ class MergeTableSelectPageState extends State<MergeTableSelectPage> { | @@ -227,6 +226,10 @@ class MergeTableSelectPageState extends State<MergeTableSelectPage> { | ||
| 227 | item1.selected = true; | 226 | item1.selected = true; |
| 228 | // selectNum++; | 227 | // selectNum++; |
| 229 | 228 | ||
| 229 | + if (currentArea == null) { | ||
| 230 | + currentArea = item.name; | ||
| 231 | + } | ||
| 232 | + | ||
| 230 | selectTables.add(tableListToTable(table)); | 233 | selectTables.add(tableListToTable(table)); |
| 231 | 234 | ||
| 232 | // if (!tableList.contains(item)) { | 235 | // if (!tableList.contains(item)) { |
| @@ -515,7 +518,6 @@ class MergeTableSelectPageState extends State<MergeTableSelectPage> { | @@ -515,7 +518,6 @@ class MergeTableSelectPageState extends State<MergeTableSelectPage> { | ||
| 515 | 518 | ||
| 516 | //全选 | 519 | //全选 |
| 517 | // object.addAll(elements) | 520 | // object.addAll(elements) |
| 518 | - | ||
| 519 | } else { | 521 | } else { |
| 520 | //取消全选 | 522 | //取消全选 |
| 521 | tableOuterList[i].list!.forEach((value) { | 523 | tableOuterList[i].list!.forEach((value) { |
| @@ -593,16 +595,16 @@ class MergeTableSelectPageState extends State<MergeTableSelectPage> { | @@ -593,16 +595,16 @@ class MergeTableSelectPageState extends State<MergeTableSelectPage> { | ||
| 593 | ), | 595 | ), |
| 594 | 596 | ||
| 595 | itemBuilder: (BuildContext context, int index) { | 597 | itemBuilder: (BuildContext context, int index) { |
| 596 | - List<t.Table>? data = | ||
| 597 | - _chooseTableModel.tablesShow.length == 0 || | ||
| 598 | - (i != null && | ||
| 599 | - _chooseTableModel | ||
| 600 | - .areaTableMapShow[areas[i].name]! | ||
| 601 | - .length == | ||
| 602 | - 0) | ||
| 603 | - ? 0 as List<t.Table>? | ||
| 604 | - : _chooseTableModel | ||
| 605 | - .areaTableMapShow[areas[i].name]; | 598 | + List<t.Table>? data = _chooseTableModel |
| 599 | + .tablesShow.length == | ||
| 600 | + 0 || | ||
| 601 | + (i != null && | ||
| 602 | + _chooseTableModel | ||
| 603 | + .areaTableMapShow[areas[i].name]! | ||
| 604 | + .length == | ||
| 605 | + 0) | ||
| 606 | + ? 0 as List<t.Table>? | ||
| 607 | + : _chooseTableModel.areaTableMapShow[areas[i].name]; | ||
| 606 | // if (index == data.length || data.length == 0) { | 608 | // if (index == data.length || data.length == 0) { |
| 607 | // return InkWell( | 609 | // return InkWell( |
| 608 | // onTap: () async { | 610 | // onTap: () async { |
| @@ -721,7 +723,6 @@ class MergeTableSelectPageState extends State<MergeTableSelectPage> { | @@ -721,7 +723,6 @@ class MergeTableSelectPageState extends State<MergeTableSelectPage> { | ||
| 721 | // print(selectNum); | 723 | // print(selectNum); |
| 722 | print(selectTables); | 724 | print(selectTables); |
| 723 | //检测当前选中区域全选按钮状态更新 | 725 | //检测当前选中区域全选按钮状态更新 |
| 724 | - | ||
| 725 | } else { | 726 | } else { |
| 726 | //取消选中 | 727 | //取消选中 |
| 727 | selectTables.removeWhere( | 728 | selectTables.removeWhere( |
-
Please register or login to post a comment