xt / Flutter-ReserveApp · Commits

Go to a project

Commit 5c3336938b86114001092d111d253f1698802e2c

Authored by wdn127929
1 parent 8a3632f1
build: skipped

桌位区域顺序设置

Inline Side-by-side
Showing 15 changed files with 289 additions and 148 deletions
@@ -3,13 +3,15 @@ class Area { @@ -3,13 +3,15 @@ class Area {
3 String name; 3 String name;
4 int count; 4 int count;
5 String rid; 5 String rid;
  6 + String orderId;
6 7
7 Area(); 8 Area();
8 9
9 factory Area.fromJson(Map<String, dynamic> json) => Area() 10 factory Area.fromJson(Map<String, dynamic> json) => Area()
10 ..name = json["name"] 11 ..name = json["name"]
11 - ..count = json["count"]; 12 + ..count = json["count"]
  13 + ..orderId = json['order_id'];
12 14
13 Map<String, dynamic> toJson() => 15 Map<String, dynamic> toJson() =>
14 - <String, dynamic>{"name": name, "count": count}; 16 + <String, dynamic>{"name": name, "count": count, 'order_id': orderId};
15 } 17 }
@@ -8,6 +8,7 @@ class TableOuter { @@ -8,6 +8,7 @@ class TableOuter {
8 bool isSelect = false; //批量选择桌位 8 bool isSelect = false; //批量选择桌位
9 bool isAll = false; //全选 9 bool isAll = false; //全选
10 List<t.Table> selectTables = []; //选择的桌位 10 List<t.Table> selectTables = []; //选择的桌位
  11 + String orderId;
11 12
12 // bool get isAll { 13 // bool get isAll {
13 // return list.every((element) => element.selected); 14 // return list.every((element) => element.selected);
@@ -506,4 +506,7 @@ class HttpUrl { @@ -506,4 +506,7 @@ class HttpUrl {
506 static const String sort_by_region = 506 static const String sort_by_region =
507 "?service=App.Tables.SortByRegion"; // 区域排序 507 "?service=App.Tables.SortByRegion"; // 区域排序
508 508
  509 + static const String sort_by_table =
  510 + "?service=App.Tables.SortByTable"; // 区域内桌位排序
  511 +
509 } 512 }
@@ -592,6 +592,7 @@ class SelectTableFPageState extends State<SelectTableFPage> { @@ -592,6 +592,7 @@ class SelectTableFPageState extends State<SelectTableFPage> {
592 area.name = outer.name; 592 area.name = outer.name;
593 area.count = outer.list.length == 0 ? -1 : count; 593 area.count = outer.list.length == 0 ? -1 : count;
594 area.rid = outer.list.length == 0 ? outer.rid : outer.list[0].rid; 594 area.rid = outer.list.length == 0 ? outer.rid : outer.list[0].rid;
  595 + area.orderId = outer.orderId;
595 areas.add(area); 596 areas.add(area);
596 } 597 }
597 _chooseTableModel.tablesCanNote = tempTableAll; 598 _chooseTableModel.tablesCanNote = tempTableAll;
@@ -1058,22 +1058,27 @@ class _FeastCreatePageState extends State<FeastCreatePage> { @@ -1058,22 +1058,27 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
1058 }), 1058 }),
1059 _selectWidget('跟单人', gdShow, onTap: () { 1059 _selectWidget('跟单人', gdShow, onTap: () {
1060 FocusScope.of(context).requestFocus(FocusNode()); //隐藏键盘 1060 FocusScope.of(context).requestFocus(FocusNode()); //隐藏键盘
1061 - DialogUtil.showSelectCusmanDialog(  
1062 - context,  
1063 - feastModel.personnalList.map((item) {  
1064 - return item.title;  
1065 - }).toList(), (value) {  
1066 - if (value != null) {  
1067 - setState(() {  
1068 - gdSelIndex = value.first;  
1069 - gdShow = feastModel.personnalList[gdSelIndex].title;  
1070 - });  
1071 - }  
1072 - },  
1073 - cancelText: '',  
1074 - title: '选择经理',  
1075 - selecteds: gdSelIndex == null ? [] : [gdSelIndex])  
1076 - .then((value) {}); 1061 + if (feastModel.personnalList != null &&
  1062 + feastModel.personnalList.length > 0) {
  1063 + DialogUtil.showSelectCusmanDialog(
  1064 + context,
  1065 + feastModel.personnalList.map((item) {
  1066 + return item.title;
  1067 + }).toList(), (value) {
  1068 + if (value != null) {
  1069 + setState(() {
  1070 + gdSelIndex = value.first;
  1071 + gdShow = feastModel.personnalList[gdSelIndex].title;
  1072 + });
  1073 + }
  1074 + },
  1075 + cancelText: '',
  1076 + title: '选择经理',
  1077 + selecteds: gdSelIndex == null ? [] : [gdSelIndex])
  1078 + .then((value) {});
  1079 + } else {
  1080 + Utils.showToast('暂时没有跟单人,请在我的-宴会管理-宴会员工去设置');
  1081 + }
1077 }), 1082 }),
1078 _selectWidget('宴会类型', feastTypeShow, onTap: () { 1083 _selectWidget('宴会类型', feastTypeShow, onTap: () {
1079 FocusScope.of(context).requestFocus(FocusNode()); //隐藏键盘 1084 FocusScope.of(context).requestFocus(FocusNode()); //隐藏键盘
@@ -293,6 +293,7 @@ class FeastSelectTablePageState extends State<FeastSelectTablePage> { @@ -293,6 +293,7 @@ class FeastSelectTablePageState extends State<FeastSelectTablePage> {
293 area.name = outer.name; 293 area.name = outer.name;
294 area.count = outer.list.length == 0 ? -1 : count; 294 area.count = outer.list.length == 0 ? -1 : count;
295 area.rid = outer.list.length == 0 ? outer.rid : outer.list[0].rid; 295 area.rid = outer.list.length == 0 ? outer.rid : outer.list[0].rid;
  296 + area.orderId = outer.orderId;
296 areas.add(area); 297 areas.add(area);
297 } 298 }
298 _chooseTableModel.tablesCanNote = tempTableAll; 299 _chooseTableModel.tablesCanNote = tempTableAll;
@@ -336,6 +336,7 @@ class PhotoManagerPageState extends State<PhotoManagerPage> { @@ -336,6 +336,7 @@ class PhotoManagerPageState extends State<PhotoManagerPage> {
336 area.name = outer.name; 336 area.name = outer.name;
337 area.count = outer.list.length == 0 ? -1 : count; 337 area.count = outer.list.length == 0 ? -1 : count;
338 area.rid = outer.list.length == 0 ? outer.rid : outer.list[0].rid; 338 area.rid = outer.list.length == 0 ? outer.rid : outer.list[0].rid;
  339 + area.orderId = outer.orderId;
339 areas.add(area); 340 areas.add(area);
340 } 341 }
341 _chooseTableModel.tablesCanNote = tempTableAll; 342 _chooseTableModel.tablesCanNote = tempTableAll;
@@ -372,6 +372,7 @@ class MergeTableSelectPageState extends State<MergeTableSelectPage> { @@ -372,6 +372,7 @@ class MergeTableSelectPageState extends State<MergeTableSelectPage> {
372 area.name = outer.name; 372 area.name = outer.name;
373 area.count = outer.list.length == 0 ? -1 : count; 373 area.count = outer.list.length == 0 ? -1 : count;
374 area.rid = outer.list.length == 0 ? outer.rid : outer.list[0].rid; 374 area.rid = outer.list.length == 0 ? outer.rid : outer.list[0].rid;
  375 + area.orderId = outer.orderId;
375 areas.add(area); 376 areas.add(area);
376 } 377 }
377 _chooseTableModel.tablesCanNote = tempTableAll; 378 _chooseTableModel.tablesCanNote = tempTableAll;
@@ -76,110 +76,50 @@ class _MyAreaManagePageState extends State<MyAreaManagePage> { @@ -76,110 +76,50 @@ class _MyAreaManagePageState extends State<MyAreaManagePage> {
76 emptyImg: "table_manage_empty", 76 emptyImg: "table_manage_empty",
77 showMsg: "加载中，请稍后...", 77 showMsg: "加载中，请稍后...",
78 ) 78 )
79 - : ReorderableListView(  
80 - children: <Widget>[  
81 - for (Area item in tableManagerModel.areas)  
82 - Container(  
83 - padding: EdgeInsets.symmetric(  
84 - horizontal: ScreenUtil().setWidth(16),  
85 - vertical: ScreenUtil().setWidth(30)),  
86 - decoration: BoxDecoration(  
87 - border: Border(  
88 - bottom: BorderSide(  
89 - width: ScreenUtil().setWidth(2),  
90 - color: MyColours.color_E7E7E7))),  
91 - child: Row(  
92 - mainAxisAlignment: MainAxisAlignment.spaceBetween,  
93 - children: [  
94 - Expanded(  
95 - child: InkWell(  
96 - onTap: () async {  
97 - //修改区域弹框  
98 - await DialogUtil  
99 - .openTableManageCreateAreaDialog(  
100 - context,  
101 - title: '修改区域',  
102 - content: item.name,  
103 - onTap: (value) async {  
104 - print(value);  
105 - //添加区域  
106 - bool success = await tableManagerModel  
107 - .setTableRegionById(  
108 - context, value, item.rid);  
109 - print(success);  
110 - if (success) {  
111 - Utils.showToast('修改成功！');  
112 - tableManagerModel.currentArea = value;  
113 -  
114 - // TableManagerModel tableManagerModel1 =  
115 - // Provider.of<TableManagerModel>(  
116 - // context,  
117 - // listen: false);  
118 - // tableManagerModel1.getTableList(  
119 - // context,  
120 - // needLoading: false,  
121 - // );  
122 -  
123 - await tableManagerModel  
124 - .refreshTable(context);  
125 - EventBus().emit("refresh_table_area");  
126 - // await tableManagerModel  
127 - // .getTableList(context,  
128 - // needLoading: false);  
129 - // tableManagerModel.initData();  
130 -  
131 - // setState(() {  
132 - // updateMenu();  
133 - // });  
134 - // _scrollToIndex(widget  
135 - // .tableManagerModel  
136 - // .areas  
137 - // .length);  
138 -  
139 - }  
140 - });  
141 - },  
142 - child: Text(item.name,  
143 - style: TextStyle(  
144 - color: MyColours.color_000000,  
145 - fontSize:  
146 - ScreenUtil().setSp(32))))),  
147 - InkWell(  
148 - onTap: () {  
149 - DialogUtil.cupertinoAlertDialog(context,  
150 - title: "",  
151 - content: "是否确定删除该区域",  
152 - lTitle: "取消",  
153 - rTitle: "确认删除",  
154 - isBold: true,  
155 - isBoldContent: true,  
156 - rColor: MyColours.color_E34D59,  
157 - lCallback: () {  
158 - print("取消");  
159 - }, rCallback: () async { 79 + : Padding(
  80 + padding: EdgeInsets.symmetric(
  81 + horizontal: ScreenUtil().setWidth(32),
  82 + vertical: ScreenUtil().setWidth(54)),
  83 + child: ReorderableListView(
  84 + children: <Widget>[
  85 + for (Area item in tableManagerModel.areas)
  86 + Container(
  87 + key: ValueKey(item),
  88 + padding: EdgeInsets.symmetric(
  89 + horizontal: ScreenUtil().setWidth(16),
  90 + vertical: ScreenUtil().setWidth(30)),
  91 + decoration: BoxDecoration(
  92 + border: Border(
  93 + bottom: BorderSide(
  94 + width: ScreenUtil().setWidth(2),
  95 + color: MyColours.color_E7E7E7))),
  96 + child: Row(
  97 + mainAxisAlignment: MainAxisAlignment.spaceBetween,
  98 + children: [
  99 + Expanded(
  100 + child: InkWell(
  101 + highlightColor: MyColours.color_ffffff,
  102 + onTap: () async {
  103 + //修改区域弹框
  104 + await DialogUtil
  105 + .openTableManageCreateAreaDialog(context,
  106 + title: '修改区域', content: item.name,
  107 + onTap: (value) async {
  108 + print(value);
  109 + //添加区域
160 bool success = await tableManagerModel 110 bool success = await tableManagerModel
161 - .delTableRegion(context, item.rid); 111 + .setTableRegionById(
  112 + context, value, item.rid);
162 print(success); 113 print(success);
163 if (success) { 114 if (success) {
164 - Utils.showToast('删除成功！');  
165 - // TableOuter tableOuter = TableOuter();  
166 - // tableOuter.name = value;  
167 - // tableOuter.list = [];  
168 - // tableManagerModel.tableOuterList.add(tableOuter);  
169 - // tableManagerModel.initData();  
170 - // Timer(  
171 - // Duration(milliseconds: 500),  
172 - // () => _areaController.jumpTo(  
173 - // _areaController.position.maxScrollExtent)); 115 + Utils.showToast('修改成功！');
  116 + tableManagerModel.currentArea = value;
174 117
175 - // await tableManagerModel  
176 - // .getTableList(context);  
177 - // await tableManagerModel  
178 - // .initData();  
179 - // TableManagerModel tableManagerModel =  
180 - // Provider.of<TableManagerModel>(context, 118 + // TableManagerModel tableManagerModel1 =
  119 + // Provider.of<TableManagerModel>(
  120 + // context,
181 // listen: false); 121 // listen: false);
182 - // tableManagerModel.getTableList( 122 + // tableManagerModel1.getTableList(
183 // context, 123 // context,
184 // needLoading: false, 124 // needLoading: false,
185 // ); 125 // );
@@ -187,27 +127,104 @@ class _MyAreaManagePageState extends State<MyAreaManagePage> { @@ -187,27 +127,104 @@ class _MyAreaManagePageState extends State<MyAreaManagePage> {
187 await tableManagerModel 127 await tableManagerModel
188 .refreshTable(context); 128 .refreshTable(context);
189 EventBus().emit("refresh_table_area"); 129 EventBus().emit("refresh_table_area");
  130 + // await tableManagerModel
  131 + // .getTableList(context,
  132 + // needLoading: false);
  133 + // tableManagerModel.initData();
  134 +
  135 + // setState(() {
  136 + // updateMenu();
  137 + // });
  138 + // _scrollToIndex(widget
  139 + // .tableManagerModel
  140 + // .areas
  141 + // .length);
  142 +
190 } 143 }
191 }); 144 });
192 }, 145 },
193 - child: Text('删除', 146 + child: Text(item.name,
194 style: TextStyle( 147 style: TextStyle(
195 - color: MyColours.color_438E93,  
196 - decoration: TextDecoration.underline,  
197 - fontSize: ScreenUtil().setSp(32))))  
198 - ],  
199 - ),  
200 - )  
201 - ],  
202 - onReorder: (int oldIndex, int newIndex) {  
203 - if (oldIndex < newIndex) {  
204 - newIndex -= 1;  
205 - }  
206 - var child = tableManagerModel.areas.removeAt(oldIndex);  
207 - tableManagerModel.areas.insert(newIndex, child);  
208 - setState(() {});  
209 - },  
210 - ); 148 + color: MyColours.color_000000,
  149 + fontSize: ScreenUtil().setSp(32))),
  150 + )),
  151 + InkWell(
  152 + onTap: () {
  153 + DialogUtil.cupertinoAlertDialog(context,
  154 + title: "",
  155 + content: "是否确定删除该区域",
  156 + lTitle: "取消",
  157 + rTitle: "确认删除",
  158 + isBold: true,
  159 + isBoldContent: true,
  160 + rColor: MyColours.color_E34D59,
  161 + lCallback: () {
  162 + print("取消");
  163 + }, rCallback: () async {
  164 + bool success = await tableManagerModel
  165 + .delTableRegion(context, item.rid);
  166 + print(success);
  167 + if (success) {
  168 + Utils.showToast('删除成功！');
  169 + // TableOuter tableOuter = TableOuter();
  170 + // tableOuter.name = value;
  171 + // tableOuter.list = [];
  172 + // tableManagerModel.tableOuterList.add(tableOuter);
  173 + // tableManagerModel.initData();
  174 + // Timer(
  175 + // Duration(milliseconds: 500),
  176 + // () => _areaController.jumpTo(
  177 + // _areaController.position.maxScrollExtent));
  178 +
  179 + // await tableManagerModel
  180 + // .getTableList(context);
  181 + // await tableManagerModel
  182 + // .initData();
  183 + // TableManagerModel tableManagerModel =
  184 + // Provider.of<TableManagerModel>(context,
  185 + // listen: false);
  186 + // tableManagerModel.getTableList(
  187 + // context,
  188 + // needLoading: false,
  189 + // );
  190 +
  191 + await tableManagerModel
  192 + .refreshTable(context);
  193 + EventBus().emit("refresh_table_area");
  194 + }
  195 + });
  196 + },
  197 + child: Text('删除',
  198 + style: TextStyle(
  199 + color: MyColours.color_438E93,
  200 + decoration: TextDecoration.underline,
  201 + fontSize: ScreenUtil().setSp(32))))
  202 + ],
  203 + ),
  204 + )
  205 + ],
  206 + onReorder: (int oldIndex, int newIndex) async {
  207 + if (oldIndex < newIndex) {
  208 + newIndex -= 1;
  209 + }
  210 +
  211 + var childold = tableManagerModel.areas[oldIndex];
  212 + Map<String, String> params = {
  213 + 'sid': Provider.of<UserModel>(context, listen: false)
  214 + .user
  215 + .sellerid,
  216 + 'regionid': childold.rid,
  217 + 'order_o': tableManagerModel.areas[newIndex].orderId,
  218 + 'sort': oldIndex < newIndex ? '2' : '1'
  219 + };
  220 + var child = tableManagerModel.areas.removeAt(oldIndex);
  221 + tableManagerModel.areas.insert(newIndex, child);
  222 + setState(() {});
  223 + await tableManagerModel.sortByRegion(context, params);
  224 + //刷新前一页数据
  225 + bus.emit('refresh_table_area');
  226 + },
  227 + ));
211 228
212 // ListView.builder( 229 // ListView.builder(
213 // padding: EdgeInsets.symmetric( 230 // padding: EdgeInsets.symmetric(
@@ -590,15 +590,20 @@ class MyTableManagerHomePageState extends State<MyTableManagerHomePage> { @@ -590,15 +590,20 @@ class MyTableManagerHomePageState extends State<MyTableManagerHomePage> {
590 } 590 }
591 591
592 // 592 //
593 - Future<bool> _setTableByIdOrder(int beforeIndex, int afterIndex) async { 593 + Future<bool> _setTableByIdOrder(int oldIndex, int newIndex) async {
594 t.Table move = tableManagerModel 594 t.Table move = tableManagerModel
595 - .tableOuterList[tableManagerModel.selectNumber].list[beforeIndex]; 595 + .tableOuterList[tableManagerModel.selectNumber].list[oldIndex];
596 596
597 t.Table after = tableManagerModel 597 t.Table after = tableManagerModel
598 - .tableOuterList[tableManagerModel.selectNumber].list[afterIndex];  
599 - Map<String, String> params = {'id': move.id, 'order': after.order_o};  
600 -  
601 - bool success = await tableManagerModel.setTableById(context, params); 598 + .tableOuterList[tableManagerModel.selectNumber].list[newIndex];
  599 + Map<String, String> params = {
  600 + 'sid': Provider.of<UserModel>(context, listen: false).user.sellerid,
  601 + 'regionid': move.rid,
  602 + 'order_o': after.order_o,
  603 + 'tableid': move.id,
  604 + 'sort': oldIndex < newIndex ? '2' : '1'
  605 + };
  606 + bool success = await tableManagerModel.sortByTable(context, params);
602 if (success) { 607 if (success) {
603 return true; 608 return true;
604 } else { 609 } else {
@@ -186,6 +186,7 @@ class SelectTablePageState extends State<SelectTablePage> { @@ -186,6 +186,7 @@ class SelectTablePageState extends State<SelectTablePage> {
186 area.name = outer.name; 186 area.name = outer.name;
187 area.count = count; 187 area.count = count;
188 area.rid = outer.list.length == 0 ? outer.rid : outer.list[0].rid; 188 area.rid = outer.list.length == 0 ? outer.rid : outer.list[0].rid;
  189 + area.orderId = outer.orderId;
189 areas.add(area); 190 areas.add(area);
190 } 191 }
191 if (widget.tid == '') { 192 if (widget.tid == '') {
@@ -32,7 +32,6 @@ class ChooseTableModel with ChangeNotifier { @@ -32,7 +32,6 @@ class ChooseTableModel with ChangeNotifier {
32 List<t.Table> tablesShow = []; //页面展示 32 List<t.Table> tablesShow = []; //页面展示
33 33
34 List<FeastBoardModel> banquetByDateData = []; //宴会看板数据/宴会预订的数据 34 List<FeastBoardModel> banquetByDateData = []; //宴会看板数据/宴会预订的数据
35 -  
36 35
37 //指定日期、时段宴会预定 36 //指定日期、时段宴会预定
38 37
@@ -122,6 +121,12 @@ class ChooseTableModel with ChangeNotifier { @@ -122,6 +121,12 @@ class ChooseTableModel with ChangeNotifier {
122 tableOuter.list = enableList.map((table) { 121 tableOuter.list = enableList.map((table) {
123 return t.Table.fromJson(table as Map<String, dynamic>); 122 return t.Table.fromJson(table as Map<String, dynamic>);
124 }).toList(); 123 }).toList();
  124 + try {
  125 + tableOuter.list.sort(((a, b) =>
  126 + int.parse(a.order_o).compareTo(int.parse(b.order_o)))); //排序
  127 + } catch (e) {
  128 + print(e);
  129 + }
125 130
126 return tableOuter; 131 return tableOuter;
127 }).toList(); 132 }).toList();
@@ -149,11 +154,27 @@ class ChooseTableModel with ChangeNotifier { @@ -149,11 +154,27 @@ class ChooseTableModel with ChangeNotifier {
149 tableOuter.name = item; 154 tableOuter.name = item;
150 tableOuter.list = []; 155 tableOuter.list = [];
151 tableOuter.rid = itemarea.id; 156 tableOuter.rid = itemarea.id;
  157 + tableOuter.orderId = itemarea.orderO;
152 tableOuterList.add(tableOuter); //区域信息包含有桌子和没有桌子两部分类型 158 tableOuterList.add(tableOuter); //区域信息包含有桌子和没有桌子两部分类型
153 } 159 }
154 } 160 }
155 } 161 }
156 } 162 }
  163 + for (AreaSunModel itemarea in areaSunModelList) {
  164 + for (TableOuter itemto in tableOuterList) {
  165 + if (itemto.name == itemarea.name) {
  166 + itemto.orderId = itemarea.orderO;
  167 + itemto.rid = itemarea.id;
  168 + }
  169 + }
  170 + }
  171 + print(tableOuterList);
  172 + try {
  173 + tableOuterList.sort(((a, b) =>
  174 + int.parse(a.orderId).compareTo(int.parse(b.orderId)))); //排序
  175 + } catch (e) {}
  176 +
  177 + print(tableOuterList);
157 } 178 }
158 } 179 }
159 180
@@ -217,6 +238,10 @@ class ChooseTableModel with ChangeNotifier { @@ -217,6 +238,10 @@ class ChooseTableModel with ChangeNotifier {
217 return areaSunModelList; 238 return areaSunModelList;
218 } else if (baseResp.data.length > 0) { 239 } else if (baseResp.data.length > 0) {
219 areaSunModelList = AreaModel.fromJson(baseResp.responseData).data; 240 areaSunModelList = AreaModel.fromJson(baseResp.responseData).data;
  241 + try {
  242 + areaSunModelList.sort(((a, b) =>
  243 + int.parse(a.orderO).compareTo(int.parse(b.orderO)))); //排序
  244 + } catch (e) {}
220 } 245 }
221 } 246 }
222 return areaSunModelList; 247 return areaSunModelList;
@@ -996,7 +996,9 @@ class FeastModel extends ChangeNotifier { @@ -996,7 +996,9 @@ class FeastModel extends ChangeNotifier {
996 data.forEach((element) { 996 data.forEach((element) {
997 getPersonnalList.add(element.userId); 997 getPersonnalList.add(element.userId);
998 FilterBtnModel model = returnModelStaff(element); 998 FilterBtnModel model = returnModelStaff(element);
999 - personnalList.add(model); 999 + if (model.account != null) {
  1000 + personnalList.add(model);
  1001 + }
1000 }); 1002 });
1001 return true; 1003 return true;
1002 } else { 1004 } else {
@@ -123,8 +123,11 @@ class MyTableManageHomeModel with ChangeNotifier { @@ -123,8 +123,11 @@ class MyTableManageHomeModel with ChangeNotifier {
123 tableOuter.list = enableList.map((table) { 123 tableOuter.list = enableList.map((table) {
124 return t.Table.fromJson(table as Map<String, dynamic>); 124 return t.Table.fromJson(table as Map<String, dynamic>);
125 }).toList(); 125 }).toList();
126 - tableOuter.list.sort(((a, b) =>  
127 - int.parse(a.order_o).compareTo(int.parse(b.order_o)))); //排序 126 + try {
  127 + tableOuter.list.sort(((a, b) =>
  128 + int.parse(a.order_o).compareTo(int.parse(b.order_o)))); //排序
  129 + } catch (e) {}
  130 +
128 print(tableOuter.list); 131 print(tableOuter.list);
129 // tableOuter.list = tableOuter.list.reversed.toList(); 132 // tableOuter.list = tableOuter.list.reversed.toList();
130 // print(tableOuter.list); 133 // print(tableOuter.list);
@@ -153,11 +156,29 @@ class MyTableManageHomeModel with ChangeNotifier { @@ -153,11 +156,29 @@ class MyTableManageHomeModel with ChangeNotifier {
153 tableOuter.name = item; 156 tableOuter.name = item;
154 tableOuter.list = []; 157 tableOuter.list = [];
155 tableOuter.rid = itemarea.id; 158 tableOuter.rid = itemarea.id;
  159 + tableOuter.orderId = itemarea.orderO;
156 tableOuterList.add(tableOuter); //区域信息包含有桌子和没有桌子两部分类型 160 tableOuterList.add(tableOuter); //区域信息包含有桌子和没有桌子两部分类型
157 } 161 }
158 } 162 }
159 } 163 }
160 } 164 }
  165 + for (AreaSunModel itemarea in areaSunModelList) {
  166 + for (TableOuter itemto in tableOuterList) {
  167 + if (itemto.name == itemarea.name) {
  168 + itemto.orderId = itemarea.orderO;
  169 + itemto.rid = itemarea.id;
  170 + }
  171 + }
  172 + }
  173 + print(tableOuterList);
  174 + try {
  175 + tableOuterList.sort(((a, b) =>
  176 + int.parse(a.orderId).compareTo(int.parse(b.orderId)))); //排序
  177 + } catch (e) {
  178 + print(e);
  179 + }
  180 +
  181 + print(tableOuterList);
161 } 182 }
162 if (tableOuterList.length == 0) { 183 if (tableOuterList.length == 0) {
163 pageState = PageState.Success; 184 pageState = PageState.Success;
@@ -189,6 +210,7 @@ class MyTableManageHomeModel with ChangeNotifier { @@ -189,6 +210,7 @@ class MyTableManageHomeModel with ChangeNotifier {
189 area.name = outer.name; 210 area.name = outer.name;
190 area.count = outer.list.length == 0 ? -1 : count; 211 area.count = outer.list.length == 0 ? -1 : count;
191 area.rid = outer.list.length == 0 ? outer.rid : outer.list[0].rid; 212 area.rid = outer.list.length == 0 ? outer.rid : outer.list[0].rid;
  213 + area.orderId = outer.orderId;
192 areas.add(area); 214 areas.add(area);
193 } 215 }
194 216
@@ -233,11 +255,31 @@ class MyTableManageHomeModel with ChangeNotifier { @@ -233,11 +255,31 @@ class MyTableManageHomeModel with ChangeNotifier {
233 .catchError((error) { 255 .catchError((error) {
234 print(error.toString()); 256 print(error.toString());
235 }); 257 });
236 - if (baseResp == null) return null; 258 + if (baseResp == null) return false;
237 if (baseResp.code == Constant.status_success) { 259 if (baseResp.code == Constant.status_success) {
238 - return baseResp.data; 260 + Utils.showToast('设置成功');
  261 + return true;
239 } else { 262 } else {
240 Utils.showToast(baseResp.msg); 263 Utils.showToast(baseResp.msg);
  264 + return false;
  265 + }
  266 + }
  267 +
  268 + // 区域排序
  269 + Future<dynamic> sortByTable(
  270 + BuildContext context, Map<String, String> params) async {
  271 + BaseResp<dynamic> baseResp = await DioUtil()
  272 + .request<dynamic>(context, Method.get, HttpUrl.sort_by_table,
  273 + data: params, showLoading: true)
  274 + .catchError((error) {
  275 + print(error.toString());
  276 + });
  277 + if (baseResp == null) return false;
  278 + if (baseResp.code == Constant.status_success) {
  279 + return true;
  280 + } else {
  281 + Utils.showToast(baseResp.msg);
  282 + return false;
241 } 283 }
242 } 284 }
243 285
@@ -391,8 +433,10 @@ class MyTableManageHomeModel with ChangeNotifier { @@ -391,8 +433,10 @@ class MyTableManageHomeModel with ChangeNotifier {
391 return areaSunModelList; 433 return areaSunModelList;
392 } else if (baseResp.data.length > 0) { 434 } else if (baseResp.data.length > 0) {
393 areaSunModelList = AreaModel.fromJson(baseResp.responseData).data; 435 areaSunModelList = AreaModel.fromJson(baseResp.responseData).data;
394 - areaSunModelList.sort(((a, b) =>  
395 - int.parse(a.orderO).compareTo(int.parse(b.orderO)))); //排序 436 + try {
  437 + areaSunModelList.sort(((a, b) =>
  438 + int.parse(a.orderO).compareTo(int.parse(b.orderO)))); //排序
  439 + } catch (e) {}
396 } 440 }
397 } 441 }
398 return areaSunModelList; 442 return areaSunModelList;
@@ -657,6 +657,13 @@ class TableManagerModel with ChangeNotifier { @@ -657,6 +657,13 @@ class TableManagerModel with ChangeNotifier {
657 tableOuter.list = enableList.map((table) { 657 tableOuter.list = enableList.map((table) {
658 return t.Table.fromJson(table as Map<String, dynamic>); 658 return t.Table.fromJson(table as Map<String, dynamic>);
659 }).toList(); 659 }).toList();
  660 + try {
  661 + tableOuter.list.sort(((a, b) =>
  662 + int.parse(a.order_o).compareTo(int.parse(b.order_o)))); //排序
  663 + } catch (e) {
  664 + print(e);
  665 + }
  666 +
660 tablesAll.addAll(tableOuter.list); 667 tablesAll.addAll(tableOuter.list);
661 return tableOuter; 668 return tableOuter;
662 }).toList(); 669 }).toList();
@@ -682,12 +689,32 @@ class TableManagerModel with ChangeNotifier { @@ -682,12 +689,32 @@ class TableManagerModel with ChangeNotifier {
682 TableOuter tableOuter = TableOuter(); 689 TableOuter tableOuter = TableOuter();
683 tableOuter.name = item; 690 tableOuter.name = item;
684 tableOuter.list = []; 691 tableOuter.list = [];
  692 +
685 tableOuter.rid = itemarea.id; 693 tableOuter.rid = itemarea.id;
  694 + tableOuter.orderId = itemarea.orderO;
686 tableOuterList.add(tableOuter); //区域信息包含有桌子和没有桌子两部分类型 695 tableOuterList.add(tableOuter); //区域信息包含有桌子和没有桌子两部分类型
687 } 696 }
688 } 697 }
689 } 698 }
690 } 699 }
  700 +
  701 + for (AreaSunModel itemarea in areaSunModelList) {
  702 + for (TableOuter itemto in tableOuterList) {
  703 + if (itemto.name == itemarea.name) {
  704 + itemto.orderId = itemarea.orderO;
  705 + itemto.rid = itemarea.id;
  706 + }
  707 + }
  708 + }
  709 + print(tableOuterList);
  710 + try {
  711 + tableOuterList.sort(((a, b) =>
  712 + int.parse(a.orderId).compareTo(int.parse(b.orderId)))); //排序
  713 + } catch (e) {
  714 + print(e);
  715 + }
  716 +
  717 + print(tableOuterList);
691 } 718 }
692 719
693 App.sp.setString('table_list', json.encode(tableOuterList)); 720 App.sp.setString('table_list', json.encode(tableOuterList));
@@ -1116,6 +1143,7 @@ class TableManagerModel with ChangeNotifier { @@ -1116,6 +1143,7 @@ class TableManagerModel with ChangeNotifier {
1116 area.name = outer.name; 1143 area.name = outer.name;
1117 area.count = outer.list.length == 0 ? -1 : count; 1144 area.count = outer.list.length == 0 ? -1 : count;
1118 area.rid = outer.list.length == 0 ? outer.rid : outer.list[0].rid; 1145 area.rid = outer.list.length == 0 ? outer.rid : outer.list[0].rid;
  1146 + area.orderId = outer.orderId;
1119 areas.add(area); 1147 areas.add(area);
1120 } 1148 }
1121 tablesCanNote = tempTableAll; 1149 tablesCanNote = tempTableAll;
@@ -1348,6 +1376,10 @@ class TableManagerModel with ChangeNotifier { @@ -1348,6 +1376,10 @@ class TableManagerModel with ChangeNotifier {
1348 return areaSunModelList; 1376 return areaSunModelList;
1349 } else if (baseResp.data.length > 0) { 1377 } else if (baseResp.data.length > 0) {
1350 areaSunModelList = AreaModel.fromJson(baseResp.responseData).data; 1378 areaSunModelList = AreaModel.fromJson(baseResp.responseData).data;
  1379 + try {
  1380 + areaSunModelList.sort(((a, b) =>
  1381 + int.parse(a.orderO).compareTo(int.parse(b.orderO)))); //排序
  1382 + } catch (e) {}
1351 } 1383 }
1352 } 1384 }
1353 return areaSunModelList; 1385 return areaSunModelList;