|
|
|
1
|
+import 'dart:convert';
|
|
|
|
2
|
+
|
|
1
|
import 'package:common_utils/common_utils.dart';
|
3
|
import 'package:common_utils/common_utils.dart';
|
|
2
|
import 'package:flutter/material.dart';
|
4
|
import 'package:flutter/material.dart';
|
|
3
|
import 'package:one_key/app.dart';
|
5
|
import 'package:one_key/app.dart';
|
|
@@ -15,6 +17,9 @@ import 'package:one_key/provider/notebook_detail_model.dart'; |
|
@@ -15,6 +17,9 @@ import 'package:one_key/provider/notebook_detail_model.dart'; |
|
15
|
import 'package:one_key/provider/user_model.dart';
|
17
|
import 'package:one_key/provider/user_model.dart';
|
|
16
|
import 'package:one_key/utils/utils.dart';
|
18
|
import 'package:one_key/utils/utils.dart';
|
|
17
|
import 'package:provider/provider.dart';
|
19
|
import 'package:provider/provider.dart';
|
|
|
|
20
|
+import 'package:one_key/models/table.dart' as t;
|
|
|
|
21
|
+
|
|
|
|
22
|
+import '../models/tableOuter.dart';
|
|
18
|
|
23
|
|
|
19
|
class NotebookDetailChangeModel with ChangeNotifier {
|
24
|
class NotebookDetailChangeModel with ChangeNotifier {
|
|
20
|
List dateList = []; //日期选择 月-日 某天
|
25
|
List dateList = []; //日期选择 月-日 某天
|
|
@@ -401,6 +406,20 @@ class NotebookDetailChangeModel with ChangeNotifier { |
|
@@ -401,6 +406,20 @@ class NotebookDetailChangeModel with ChangeNotifier { |
|
401
|
LogUtil.v(dailyMap);
|
406
|
LogUtil.v(dailyMap);
|
|
402
|
}
|
407
|
}
|
|
403
|
|
408
|
|
|
|
|
409
|
+ List<t.Table> getSpTableList() {
|
|
|
|
410
|
+ List<t.Table> tables = [];
|
|
|
|
411
|
+ String tableList = App.sp.getString('table_list');
|
|
|
|
412
|
+ if (tableList != null) {
|
|
|
|
413
|
+ List list = json.decode(tableList);
|
|
|
|
414
|
+ if (list.length > 0) {
|
|
|
|
415
|
+ list.forEach((element) {
|
|
|
|
416
|
+ tables.addAll(TableOuter.fromJson2(element).list);
|
|
|
|
417
|
+ });
|
|
|
|
418
|
+ }
|
|
|
|
419
|
+ }
|
|
|
|
420
|
+ return tables;
|
|
|
|
421
|
+ }
|
|
|
|
422
|
+
|
|
404
|
/// 根据时间和分钟组装 格式：11:00
|
423
|
/// 根据时间和分钟组装 格式：11:00
|
|
405
|
_dealTime(int begin, int mm) {
|
424
|
_dealTime(int begin, int mm) {
|
|
406
|
String sb = '';
|
425
|
String sb = '';
|
|
@@ -493,18 +512,21 @@ class NotebookDetailChangeModel with ChangeNotifier { |
|
@@ -493,18 +512,21 @@ class NotebookDetailChangeModel with ChangeNotifier { |
|
493
|
|
512
|
|
|
494
|
List<String> tableIds = []; //所有桌位的id
|
513
|
List<String> tableIds = []; //所有桌位的id
|
|
495
|
List<String> tableIdsOld = []; //带过来所有桌位的id
|
514
|
List<String> tableIdsOld = []; //带过来所有桌位的id
|
|
496
|
- for (var table in oldTableList) {
|
|
|
|
497
|
- tableIdsOld.add(table.id);
|
|
|
|
498
|
- }
|
515
|
+
|
|
|
|
516
|
+ List<t.Table> tableS = getSpTableList(); //缓存的所有桌子
|
|
|
|
517
|
+ for (t.Table elementT in tableS) {
|
|
|
|
518
|
+ tableIds.add(elementT.id);
|
|
|
|
519
|
+ }
|
|
|
|
520
|
+ for (var table in oldTableList) {
|
|
|
|
521
|
+ tableIdsOld.add(table.id);
|
|
|
|
522
|
+ }
|
|
499
|
for (TableListSunModel item in itemModelList) {
|
523
|
for (TableListSunModel item in itemModelList) {
|
|
500
|
if (item.name == "推荐") {
|
524
|
if (item.name == "推荐") {
|
|
501
|
itemModelList.remove(item);
|
525
|
itemModelList.remove(item);
|
|
502
|
}
|
526
|
}
|
|
503
|
|
527
|
|
|
504
|
for (var item in item.list) {
|
528
|
for (var item in item.list) {
|
|
505
|
- tableIds.add(item.id);
|
|
|
|
506
|
for (var table in oldTableList) {
|
529
|
for (var table in oldTableList) {
|
|
507
|
-
|
|
|
|
508
|
if (item.id == table.id) {
|
530
|
if (item.id == table.id) {
|
|
509
|
item.selected = true;
|
531
|
item.selected = true;
|
|
510
|
if (!tableList.contains(item)) {
|
532
|
if (!tableList.contains(item)) {
|
|
@@ -573,7 +595,6 @@ class NotebookDetailChangeModel with ChangeNotifier { |
|
@@ -573,7 +595,6 @@ class NotebookDetailChangeModel with ChangeNotifier { |
|
573
|
msg += '${item.name},';
|
595
|
msg += '${item.name},';
|
|
574
|
}
|
596
|
}
|
|
575
|
if (delTablesid.contains(item.id)) {
|
597
|
if (delTablesid.contains(item.id)) {
|
|
576
|
-
|
|
|
|
577
|
msgDel += '${item.name},';
|
598
|
msgDel += '${item.name},';
|
|
578
|
}
|
599
|
}
|
|
579
|
}
|
600
|
}
|
|
@@ -586,10 +607,10 @@ class NotebookDetailChangeModel with ChangeNotifier { |
|
@@ -586,10 +607,10 @@ class NotebookDetailChangeModel with ChangeNotifier { |
|
586
|
|
607
|
|
|
587
|
if (msg != '' && msgDel == '') {
|
608
|
if (msg != '' && msgDel == '') {
|
|
588
|
Utils.showToast('${msg}已被占用啦');
|
609
|
Utils.showToast('${msg}已被占用啦');
|
|
589
|
- }else if(msg == '' && msgDel != '') {
|
610
|
+ } else if (msg == '' && msgDel != '') {
|
|
590
|
Utils.showToast('${msgDel}已被删除啦');
|
611
|
Utils.showToast('${msgDel}已被删除啦');
|
|
591
|
- }else if(msg != '' && msgDel != '') {
|
|
|
|
592
|
- Utils.showToast('${msg}已被占用啦\n'+'${msgDel}已被删除啦');
|
612
|
+ } else if (msg != '' && msgDel != '') {
|
|
|
|
613
|
+ Utils.showToast('${msg}已被占用啦\n' + '${msgDel}已被删除啦');
|
|
593
|
}
|
614
|
}
|
|
594
|
}
|
615
|
}
|
|
595
|
|
616
|
|
