Commit 864b61732b12d12c7295ac0b05a5e30da026d530

Authored by wdn127929
1 parent 3c2adcc6

宴会多时段bug ,点击添加桌位时请求多时段接口

@@ -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 }
@@ -643,7 +643,7 @@ class _FeastCreatePageState extends State<FeastCreatePage> { @@ -643,7 +643,7 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
643 'code': '3', 643 'code': '3',
644 'hasLeftBorder': false 644 'hasLeftBorder': false
645 }, 645 },
646 - { 646 + {
647 'title': '贵宾', 647 'title': '贵宾',
648 'select': sexStr == '4' ? true : false, 648 'select': sexStr == '4' ? true : false,
649 'code': '4', 649 'code': '4',
@@ -2614,10 +2614,16 @@ class _FeastCreatePageState extends State<FeastCreatePage> { @@ -2614,10 +2614,16 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
2614 // Utils.showToast('请选择宴会日期'); 2614 // Utils.showToast('请选择宴会日期');
2615 // return; 2615 // return;
2616 // } 2616 // }
  2617 +//获取当前日期的餐段 ,默认餐段选中index
  2618 + await getMealSectionByDay(xuantaiSelIndex,
  2619 + xuantaiData[xuantaiSelIndex].dateTimext,
  2620 + showLoading: true);
  2621 +
2617 //带餐 2622 //带餐
2618 int ddate = xuantaiData[xuantaiSelIndex] 2623 int ddate = xuantaiData[xuantaiSelIndex]
2619 .dateTimext 2624 .dateTimext
2620 .millisecondsSinceEpoch; 2625 .millisecondsSinceEpoch;
  2626 +
2621 String ddateSolt = 2627 String ddateSolt =
2622 xuantaiData[xuantaiSelIndex] 2628 xuantaiData[xuantaiSelIndex]
2623 .dsoltList[ 2629 .dsoltList[
@@ -5385,7 +5391,7 @@ class _FeastCreatePageState extends State<FeastCreatePage> { @@ -5385,7 +5391,7 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
5385 titleColor: MyColours.color_F6F6F6, 5391 titleColor: MyColours.color_F6F6F6,
5386 onTap: () { 5392 onTap: () {
5387 if (Navigator.canPop(context)) { 5393 if (Navigator.canPop(context)) {
5388 - Navigator.pop(context); 5394 + Navigator.pop(context);
5389 } 5395 }
5390 }, 5396 },
5391 ), 5397 ),