已预订订单按照桌位区域排序

@@ -15,7 +15,15 @@ Notebook _$NotebookFromJson(Map<String, dynamic> json) {
       data.add(new ReserveRecheckSunModel.fromJson(v));
       data.add(new ReserveRecheckSunModel.fromJson(v));
     });
     });
   }
   }
+
+  List<dynamic> tabletemp = convert.jsonDecode(json['tableinfo'] as String);
+
+  List<t.TableList> temp = [];
+  tabletemp.forEach((element) {
+    temp.add(t.TableList.fromJson(element));
+  });
   return Notebook()
   return Notebook()
+    ..tableinfoList = temp
     ..tableinfo = json['tableinfo'] as String
     ..tableinfo = json['tableinfo'] as String
     ..id = json['id'] as String
     ..id = json['id'] as String
     ..orderid = json['orderid'] as String
     ..orderid = json['orderid'] as String

 import 'package:json_annotation/json_annotation.dart';
 import 'package:json_annotation/json_annotation.dart';
 
 
+import 'notebook.dart';
+
 part 'table.g.dart';
 part 'table.g.dart';
 
 
 @JsonSerializable()
 @JsonSerializable()
@@ -41,6 +43,8 @@ class Table {
   String reserveCount; //预订总次数
   String reserveCount; //预订总次数
   String phone; //订餐人电话
   String phone; //订餐人电话
 
 
+  Notebook notebook;
+
 //预订总次数显示
 //预订总次数显示
   String get reserveCountShow {
   String get reserveCountShow {
     if (reserveCount == '1' || phone == null || phone == ''
     if (reserveCount == '1' || phone == null || phone == ''

+import 'package:one_key/models/notebook.dart';
 import 'package:one_key/models/table.dart';
 import 'package:one_key/models/table.dart';
 import 'package:one_key/models/table.dart' as t;
 import 'package:one_key/models/table.dart' as t;
 
 
@@ -10,6 +11,8 @@ class TableOuter {
   List<t.Table> selectTables = []; //选择的桌位
   List<t.Table> selectTables = []; //选择的桌位
     String orderId;
     String orderId;
 
 
+  
+
   // bool get isAll {
   // bool get isAll {
   //   return list.every((element) => element.selected);
   //   return list.every((element) => element.selected);
   // }
   // }

@@ -29,6 +29,8 @@ import 'package:one_key/widgets/v_empty_view.dart';
 import 'package:provider/provider.dart';
 import 'package:provider/provider.dart';
 import 'package:table_calendar/table_calendar.dart';
 import 'package:table_calendar/table_calendar.dart';
 
 
+import '../../provider/table_manager_model.dart';
+
 class NoteBookPage extends StatefulWidget {
 class NoteBookPage extends StatefulWidget {
   final int tabIndex;
   final int tabIndex;
 
 
@@ -207,6 +209,8 @@ class NoteBookPageState extends State<NoteBookPage> {
 
 
   //获取已预订列表
   //获取已预订列表
   _getReserveList({bool needLoading = false, bool showLoading = true}) async {
   _getReserveList({bool needLoading = false, bool showLoading = true}) async {
+  
+  
     Map<String, String> params = {
     Map<String, String> params = {
       "sid": userModel.user.sellerid,
       "sid": userModel.user.sellerid,
       "rdate": _getRdate(),
       "rdate": _getRdate(),
@@ -225,6 +229,10 @@ class NoteBookPageState extends State<NoteBookPage> {
     _simpleState();
     _simpleState();
   }
   }
 
 
+
+ 
+
+
   //解析返回显示的日期
   //解析返回显示的日期
   _parseDateDay(DateTime dateTime) {
   _parseDateDay(DateTime dateTime) {
     DateTime now = DateTime.now();
     DateTime now = DateTime.now();

@@ -6,6 +6,7 @@ import 'package:one_key/models/notebook.dart';
 import 'package:one_key/net/base_resp.dart';
 import 'package:one_key/net/base_resp.dart';
 import 'package:one_key/net/dio_util.dart';
 import 'package:one_key/net/dio_util.dart';
 import 'package:one_key/net/http_url.dart';
 import 'package:one_key/net/http_url.dart';
+import 'package:one_key/provider/table_manager_model.dart';
 import 'package:one_key/provider/user_model.dart';
 import 'package:one_key/provider/user_model.dart';
 import 'package:one_key/utils/utils.dart';
 import 'package:one_key/utils/utils.dart';
 import 'package:provider/provider.dart';
 import 'package:provider/provider.dart';
@@ -30,8 +31,7 @@ class NoteBookModel extends ChangeNotifier {
       showLoading = false;
       showLoading = false;
       notifyListeners();
       notifyListeners();
     }
     }
-    // pageState = PageState.Loading;
-    // notifyListeners();
+
     BaseResp<List> baseResp = await DioUtil()
     BaseResp<List> baseResp = await DioUtil()
         .request<List>(context, Method.get, HttpUrl.get_reserve_list,
         .request<List>(context, Method.get, HttpUrl.get_reserve_list,
             data: params, showLoading: needLoading ? false : showLoading)
             data: params, showLoading: needLoading ? false : showLoading)
@@ -62,11 +62,64 @@ class NoteBookModel extends ChangeNotifier {
       if (notebooks.isEmpty) {
       if (notebooks.isEmpty) {
         pageState = PageState.Empty;
         pageState = PageState.Empty;
       } else {
       } else {
+        TableManagerModel tableManagerModel =
+            Provider.of<TableManagerModel>(context, listen: false);
+
+        await tableManagerModel.getTableList(context);
+        List<Notebook> temp = [];
+
+        notebooks.forEach((notebook) {
+          if (notebook.tableinfoList.length > 0) {
+            tableManagerModel.tableOuterList.forEach((elementAll) {
+              if (notebook.tableinfoList[0].rid == elementAll.rid) {
+                elementAll.list.forEach((element) {
+                 if(notebook.tableinfoList[0].id == element.id){
+//桌子ID
+element.notebook = notebook;
+//
+                 } 
+                });
+              }
+            });
+
+            // // if(   elementTable.rid  ==  element.tableinfoList[0].rid){
+            // //     //区域ID
+
+            // //     element.orderRID = elementTable.orderId;
+
+            // // }
+          }
+        });
+
+        for(int i=0;i<tableManagerModel.tableOuterList.length;i++){
+
+for(int j=0;j<tableManagerModel.tableOuterList[i].list.length;j++){
+if(tableManagerModel.tableOuterList[i].list[j].notebook != null){
+  temp.add(tableManagerModel.tableOuterList[i].list[j].notebook);
+}
+ 
+
+}
+        }
+
+        
+
+        print(temp);
+        print(notebooks);
+
+        notebooks = temp.toList();
+
+         
+
+        // tableManagerModel.tableOuterList //桌子
+        // tableManagerModel.areaSunModelList //区域
+
         pageState = PageState.Success;
         pageState = PageState.Success;
       }
       }
     } else {
     } else {
       Utils.showToast(baseResp.msg ?? "");
       Utils.showToast(baseResp.msg ?? "");
     }
     }
+
     notifyListeners();
     notifyListeners();
     return notebooks;
     return notebooks;
   }
   }