xt / Flutter-ReserveApp · Commits

Go to a project

Commit 7490aaeeae9c630f0f81907de02828acebedd600

Authored by wdn127929
1 parent ae4fe892
build: skipped

桌位管理页面----合并桌位

Inline Side-by-side
Showing 9 changed files with 172 additions and 92 deletions
@@ -32,6 +32,7 @@ class Table { @@ -32,6 +32,7 @@ class Table {
32 String isLock; //是否被合并上锁 32 String isLock; //是否被合并上锁
33 String isMerge; //是否打开桌位合并开关 33 String isMerge; //是否打开桌位合并开关
34 String tids; //被合并桌位tids 34 String tids; //被合并桌位tids
  35 + String lockTname; //被谁合并了
35 36
36 //获取桌位类型 37 //获取桌位类型
37 String get tidStr { 38 String get tidStr {
@@ -107,6 +108,6 @@ class Table { @@ -107,6 +108,6 @@ class Table {
107 108
108 @override 109 @override
109 String toString() { 110 String toString() {
110 - return 'Table{id: $id,isPhoto:$isPhoto rid: $rid, tid: $tid, name: $name, table_pnum: $table_pnum, most_pnum: $most_pnum, order_o: $order_o, status: $status, tablestatus: $tablestatus, enable: $enable, spell: $spell, rname: $rname, isExitsClass:$isExitsClass,max: $max, low: $low, is_lock: $isLock, is_merge: $isMerge,tids:$tids}'; 111 + return 'Table{id: $id,isPhoto:$isPhoto rid: $rid, tid: $tid, name: $name, table_pnum: $table_pnum, most_pnum: $most_pnum, order_o: $order_o, status: $status, tablestatus: $tablestatus, enable: $enable, spell: $spell, rname: $rname, isExitsClass:$isExitsClass,max: $max, low: $low, is_lock: $isLock, is_merge: $isMerge,tids:$tids,lock_tname:$lockTname}';
111 } 112 }
112 } 113 }
@@ -30,7 +30,8 @@ Table _$TableFromJson(Map<String, dynamic> json) { @@ -30,7 +30,8 @@ Table _$TableFromJson(Map<String, dynamic> json) {
30 ..selected = json['selected'] as bool 30 ..selected = json['selected'] as bool
31 ..isLock = json['is_lock'] as String 31 ..isLock = json['is_lock'] as String
32 ..isMerge = json['is_merge'] as String 32 ..isMerge = json['is_merge'] as String
33 - ..tids = json['tids'] as String; 33 + ..tids = json['tids'] as String
  34 + ..lockTname = json['lock_tname'] as String;
34 } 35 }
35 36
36 Map<String, dynamic> _$TableToJson(Table instance) => <String, dynamic>{ 37 Map<String, dynamic> _$TableToJson(Table instance) => <String, dynamic>{
@@ -56,5 +57,6 @@ Map<String, dynamic> _$TableToJson(Table instance) => <String, dynamic>{ @@ -56,5 +57,6 @@ Map<String, dynamic> _$TableToJson(Table instance) => <String, dynamic>{
56 'selected': instance.selected, 57 'selected': instance.selected,
57 'is_lock': instance.isLock, 58 'is_lock': instance.isLock,
58 'is_merge': instance.isMerge, 59 'is_merge': instance.isMerge,
59 - 'tids': instance.tids 60 + 'tids': instance.tids,
  61 + 'lock_tname': instance.lockTname
60 }; 62 };
@@ -46,13 +46,15 @@ class MergeTableSelectPage extends StatefulWidget { @@ -46,13 +46,15 @@ class MergeTableSelectPage extends StatefulWidget {
46 final String fromPage; 46 final String fromPage;
47 final String tid; 47 final String tid;
48 final String tableid; 48 final String tableid;
  49 + final String tids; //用于判断当前桌位选中的桌子，islock == '1',的桌子还可以被选中，不随当前页面操作选中不选中改变
49 50
50 MergeTableSelectPage( 51 MergeTableSelectPage(
51 {this.canChoose = false, 52 {this.canChoose = false,
52 this.tableList, 53 this.tableList,
53 this.fromPage, 54 this.fromPage,
54 this.tid, 55 this.tid,
55 - this.tableid}); 56 + this.tableid,
  57 + this.tids});
56 58
57 @override 59 @override
58 State<StatefulWidget> createState() { 60 State<StatefulWidget> createState() {
@@ -205,6 +207,7 @@ class MergeTableSelectPageState extends State<MergeTableSelectPage> { @@ -205,6 +207,7 @@ class MergeTableSelectPageState extends State<MergeTableSelectPage> {
205 if (item1.id == table.id) { 207 if (item1.id == table.id) {
206 item1.selected = true; 208 item1.selected = true;
207 // selectNum++; 209 // selectNum++;
  210 +
208 selectTables.add(tableListToTable(table)); 211 selectTables.add(tableListToTable(table));
209 212
210 // if (!tableList.contains(item)) { 213 // if (!tableList.contains(item)) {
@@ -214,7 +217,17 @@ class MergeTableSelectPageState extends State<MergeTableSelectPage> { @@ -214,7 +217,17 @@ class MergeTableSelectPageState extends State<MergeTableSelectPage> {
214 } 217 }
215 } 218 }
216 //如果当前的桌子全部选中，则全选按钮---选中状态 219 //如果当前的桌子全部选中，则全选按钮---选中状态
217 - item.isAll = item.list.every((element) => element.selected); 220 + List<t.Table> temp = [];
  221 + temp.addAll(item.list);
  222 + temp.removeWhere((element) {
  223 + if (element.isLock == '1' &&
  224 + !widget.tids.split(',').contains(element.id)) {
  225 + return true;
  226 + }
  227 + return false;
  228 + });
  229 + item.isAll = temp.every((element) => element.selected);
  230 +
218 // selectAreaAll[] 231 // selectAreaAll[]
219 232
220 print(selectTables); 233 print(selectTables);
@@ -457,7 +470,11 @@ class MergeTableSelectPageState extends State<MergeTableSelectPage> { @@ -457,7 +470,11 @@ class MergeTableSelectPageState extends State<MergeTableSelectPage> {
457 onTap: () { 470 onTap: () {
458 tableOuterList[i].isAll = !tableOuterList[i].isAll; 471 tableOuterList[i].isAll = !tableOuterList[i].isAll;
459 tableOuterList[i].list.forEach((element) { 472 tableOuterList[i].list.forEach((element) {
460 - element.selected = tableOuterList[i].isAll; 473 + if (element.isLock == '1' &&
  474 + !widget.tids.split(',').contains(element.id)) {
  475 + } else {
  476 + element.selected = tableOuterList[i].isAll;
  477 + }
461 }); 478 });
462 479
463 if (tableOuterList[i].isAll) { 480 if (tableOuterList[i].isAll) {
@@ -469,7 +486,11 @@ class MergeTableSelectPageState extends State<MergeTableSelectPage> { @@ -469,7 +486,11 @@ class MergeTableSelectPageState extends State<MergeTableSelectPage> {
469 486
470 //加入当前区域全部桌子 487 //加入当前区域全部桌子
471 tableOuterList[i].list.forEach((value) { 488 tableOuterList[i].list.forEach((value) {
472 - selectTables.add(value); 489 + if (value.isLock == '1' &&
  490 + !widget.tids.split(',').contains(value.id)) {
  491 + } else {
  492 + selectTables.add(value);
  493 + }
473 }); 494 });
474 495
475 //全选 496 //全选
@@ -634,50 +655,66 @@ class MergeTableSelectPageState extends State<MergeTableSelectPage> { @@ -634,50 +655,66 @@ class MergeTableSelectPageState extends State<MergeTableSelectPage> {
634 shouldRebuild: (pre, next) => true, 655 shouldRebuild: (pre, next) => true,
635 selector: (context, model) => data[index], 656 selector: (context, model) => data[index],
636 builder: (context, table, _) { 657 builder: (context, table, _) {
637 - return MergeTableItem(data[index], canSelected: true,  
638 - onSelected: (t.Table table) {  
639 - print(areaTableMap.keys);  
640 - // for (String item in areaTableMap.keys) {  
641 - // for (t.Table tableItem in areaTableMap[item]) {  
642 - // tableItem.selected = false;  
643 - // selectNum = 0;  
644 - // if (table.id == tableItem.id) {  
645 - // selectTableId = table.id; 658 + return MergeTableItem(
  659 + data[index],
  660 + canSelected: true,
  661 + onSelected: (t.Table table) {
  662 + print(areaTableMap.keys);
  663 + // for (String item in areaTableMap.keys) {
  664 + // for (t.Table tableItem in areaTableMap[item]) {
  665 + // tableItem.selected = false;
  666 + // selectNum = 0;
  667 + // if (table.id == tableItem.id) {
  668 + // selectTableId = table.id;
646 669
647 - // selectTables = [];  
648 - // selectNum++;  
649 - if (table.selected) {  
650 - //选中  
651 - selectTables.add(table);  
652 - Map temp = {  
653 - 'tid': selectTables.length > 0 ? selectTables[0].id : '',  
654 - 'tname':  
655 - selectTables.length > 0 ? selectTables[0].name : ''  
656 - };  
657 - // print(selectNum);  
658 - print(selectTables);  
659 - //检测当前选中区域全选按钮状态更新 670 + // selectTables = [];
  671 + // selectNum++;
  672 + if (table.selected) {
  673 + //选中
  674 + selectTables.add(table);
  675 + Map temp = {
  676 + 'tid':
  677 + selectTables.length > 0 ? selectTables[0].id : '',
  678 + 'tname':
  679 + selectTables.length > 0 ? selectTables[0].name : ''
  680 + };
  681 + // print(selectNum);
  682 + print(selectTables);
  683 + //检测当前选中区域全选按钮状态更新
660 684
661 - } else {  
662 - //取消选中  
663 - selectTables  
664 - .removeWhere((element) => table.id == element.id);  
665 - }  
666 - tableOuterList[i].isAll = tableOuterList[i]  
667 - .list  
668 - .every((element) => element.selected); 685 + } else {
  686 + //取消选中
  687 + selectTables
  688 + .removeWhere((element) => table.id == element.id);
  689 + }
  690 + List<t.Table> temp = [];
  691 + temp.addAll(tableOuterList[i].list);
  692 + temp.removeWhere((element) {
  693 + if (element.isLock == '1' &&
  694 + !widget.tids.split(',').contains(element.id)) {
  695 + return true;
  696 + }
  697 + return false;
  698 + });
  699 + tableOuterList[i].isAll =
  700 + temp.every((element) => element.selected);
669 701
670 - setState(() {}); 702 + setState(() {});
671 703
672 - // NavigatorUtil.goTableMergeTableSelectPage(context,  
673 - // tid: table.id, tname: table.name);  
674 - // setState(() {  
675 - // tableItem.selected = true;  
676 - // });  
677 - // }  
678 - // }  
679 - // }  
680 - }, fromPage: widget.fromPage, tableMap: tableMap, rid: null); 704 + // NavigatorUtil.goTableMergeTableSelectPage(context,
  705 + // tid: table.id, tname: table.name);
  706 + // setState(() {
  707 + // tableItem.selected = true;
  708 + // });
  709 + // }
  710 + // }
  711 + // }
  712 + },
  713 + fromPage: widget.fromPage,
  714 + tableMap: tableMap,
  715 + rid: null,
  716 + tids: widget.tids,
  717 + );
681 }, 718 },
682 ); 719 );
683 // } 720 // }
@@ -922,7 +959,7 @@ class MergeTableSelectPageState extends State<MergeTableSelectPage> { @@ -922,7 +959,7 @@ class MergeTableSelectPageState extends State<MergeTableSelectPage> {
922 gradientStart: MyColours.color_DBDBDB, 959 gradientStart: MyColours.color_DBDBDB,
923 gradientEnd: MyColours.color_DBDBDB, 960 gradientEnd: MyColours.color_DBDBDB,
924 onPressed: () { 961 onPressed: () {
925 - Navigator.pop(context); 962 + Navigator.of(context).pop();
926 }, 963 },
927 ), 964 ),
928 RoundButton( 965 RoundButton(
@@ -969,25 +1006,21 @@ class MergeTableSelectPageState extends State<MergeTableSelectPage> { @@ -969,25 +1006,21 @@ class MergeTableSelectPageState extends State<MergeTableSelectPage> {
969 // Navigator.of(context).pop(temp); 1006 // Navigator.of(context).pop(temp);
970 // // } 1007 // // }
971 // } else { 1008 // } else {
972 - if (selectTables.length > 0) {  
973 - String tid = "";  
974 - for (t.Table table  
975 - in selectTables) {  
976 - tid += table.id + ",";  
977 - }  
978 - if (selectTables.length > 0) {  
979 - tid = tid.substring(  
980 - 0, tid.length - 1);  
981 - }  
982 1009
983 - Map temp = {  
984 - 'object': selectTables,  
985 - 'tid': tid  
986 - };  
987 - Navigator.of(context).pop(temp);  
988 - } else {  
989 - Navigator.of(context).pop(); 1010 + String tid = "";
  1011 + for (t.Table table in selectTables) {
  1012 + tid += table.id + ",";
  1013 + }
  1014 + if (selectTables.length > 0) {
  1015 + tid = tid.substring(
  1016 + 0, tid.length - 1);
990 } 1017 }
  1018 +
  1019 + Map temp = {
  1020 + 'object': selectTables,
  1021 + 'tid': tid
  1022 + };
  1023 + Navigator.of(context).pop(temp);
991 } 1024 }
992 // } 1025 // }
993 }, 1026 },
@@ -1004,6 +1037,24 @@ class MergeTableSelectPageState extends State<MergeTableSelectPage> { @@ -1004,6 +1037,24 @@ class MergeTableSelectPageState extends State<MergeTableSelectPage> {
1004 )); 1037 ));
1005 } 1038 }
1006 1039
  1040 + _backLastPage() {
  1041 + if (selectTables.length > 0) {
  1042 + String tid = "";
  1043 + for (t.Table table in selectTables) {
  1044 + tid += table.id + ",";
  1045 + }
  1046 + if (selectTables.length > 0) {
  1047 + tid = tid.substring(0, tid.length - 1);
  1048 + }
  1049 +
  1050 + Map temp = {'object': selectTables, 'tid': tid};
  1051 + Navigator.of(context).pop(temp);
  1052 + } else {
  1053 + Map temp = {'object': [], 'tid': ''};
  1054 + Navigator.of(context).pop(temp);
  1055 + }
  1056 + }
  1057 +
1007 tableToTableList(t.Table table) { 1058 tableToTableList(t.Table table) {
1008 TableList _tableList = TableList( 1059 TableList _tableList = TableList(
1009 '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', ''); 1060 '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '');
@@ -410,6 +410,7 @@ class MyTableManagerHomePageState extends State<MyTableManagerHomePage> { @@ -410,6 +410,7 @@ class MyTableManagerHomePageState extends State<MyTableManagerHomePage> {
410 isLock: table.isLock ?? '0', 410 isLock: table.isLock ?? '0',
411 isMerge: table.isMerge ?? '0', 411 isMerge: table.isMerge ?? '0',
412 tableid: table.id, 412 tableid: table.id,
  413 + table:table,
413 selectTables: selectTables, 414 selectTables: selectTables,
414 onTapDel: (Map<String, dynamic> value) async { 415 onTapDel: (Map<String, dynamic> value) async {
415 Map<String, String> params = { 416 Map<String, String> params = {
@@ -486,8 +486,9 @@ class MyTableManageHomeModel with ChangeNotifier { @@ -486,8 +486,9 @@ class MyTableManageHomeModel with ChangeNotifier {
486 }); 486 });
487 487
488 if (baseResp.code == Constant.status_success) { 488 if (baseResp.code == Constant.status_success) {
489 - if (baseResp.responseData['data'] != null &&  
490 - baseResp.responseData['data'] == 1) { 489 + if (baseResp.responseData['data'] != null) {
  490 + // &&
  491 + // baseResp.responseData['data'] == 1
491 return true; 492 return true;
492 } else { 493 } else {
493 Utils.showToast(baseResp.msg ?? '合并桌位失败！'); 494 Utils.showToast(baseResp.msg ?? '合并桌位失败！');
@@ -1110,7 +1110,8 @@ class NavigatorUtil { @@ -1110,7 +1110,8 @@ class NavigatorUtil {
1110 Map object, 1110 Map object,
1111 String fromPage = 'table_manage', 1111 String fromPage = 'table_manage',
1112 String tableidNow, 1112 String tableidNow,
1113 - String tid = ''}) { 1113 + String tid = '',
  1114 + String tids}) {
1114 // if (invoice != null) { 1115 // if (invoice != null) {
1115 // return _navigateTo(context, 1116 // return _navigateTo(context,
1116 // "${Routes.merge_table_select_page}?invoice=${FluroConvertUtils.object2string(invoice)}", 1117 // "${Routes.merge_table_select_page}?invoice=${FluroConvertUtils.object2string(invoice)}",
@@ -1118,10 +1119,10 @@ class NavigatorUtil { @@ -1118,10 +1119,10 @@ class NavigatorUtil {
1118 // } 1119 // }
1119 if (object != null) { 1120 if (object != null) {
1120 return _navigateTo(context, 1121 return _navigateTo(context,
1121 - "${Routes.merge_table_select_page}?tableidNow=$tableidNow&fromPage=$fromPage&canChoose=$canChoose&object=${FluroConvertUtils.object2string(object)}"); 1122 + "${Routes.merge_table_select_page}?tids=$tids&tableidNow=$tableidNow&fromPage=$fromPage&canChoose=$canChoose&object=${FluroConvertUtils.object2string(object)}");
1122 } 1123 }
1123 return _navigateTo(context, 1124 return _navigateTo(context,
1124 - "${Routes.merge_table_select_page}?tableidNow=$tableidNow&fromPage=$fromPage&canChoose=$canChoose", 1125 + "${Routes.merge_table_select_page}?tids=$tids&tableidNow=$tableidNow&fromPage=$fromPage&canChoose=$canChoose",
1125 replace: replace); 1126 replace: replace);
1126 } 1127 }
1127 } 1128 }
@@ -1788,6 +1788,7 @@ var feastInvoiceDetailPageHandle = new Handler( @@ -1788,6 +1788,7 @@ var feastInvoiceDetailPageHandle = new Handler(
1788 var mergeTableSelectPageHandle = new Handler( 1788 var mergeTableSelectPageHandle = new Handler(
1789 handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) { 1789 handlerFunc: (BuildContext context, Map<dynamic, List<Object>> params) {
1790 String fromPage = params["fromPage"].first; 1790 String fromPage = params["fromPage"].first;
  1791 + String tids = params["tids"].first;
1791 1792
1792 String tableidNow = params["tableidNow"].first; 1793 String tableidNow = params["tableidNow"].first;
1793 bool canChoose = params["canChoose"].first == "true" ? true : false; 1794 bool canChoose = params["canChoose"].first == "true" ? true : false;
@@ -1806,5 +1807,6 @@ var mergeTableSelectPageHandle = new Handler( @@ -1806,5 +1807,6 @@ var mergeTableSelectPageHandle = new Handler(
1806 tableid: tableidNow, 1807 tableid: tableidNow,
1807 tableList: res, 1808 tableList: res,
1808 canChoose: canChoose, 1809 canChoose: canChoose,
1809 - fromPage: fromPage)); 1810 + fromPage: fromPage,
  1811 + tids:tids));
1810 }); 1812 });
@@ -2064,6 +2064,7 @@ class DialogUtil { @@ -2064,6 +2064,7 @@ class DialogUtil {
2064 String isLock = '0', 2064 String isLock = '0',
2065 String isMerge = '0', 2065 String isMerge = '0',
2066 String tableid, 2066 String tableid,
  2067 + t.Table table,
2067 List<t.Table> selectTables, 2068 List<t.Table> selectTables,
2068 CustomCallBackMap onTap, 2069 CustomCallBackMap onTap,
2069 CustomCallBackMap onTapDel}) async { 2070 CustomCallBackMap onTapDel}) async {
@@ -2348,7 +2349,7 @@ class DialogUtil { @@ -2348,7 +2349,7 @@ class DialogUtil {
2348 // Spacer(), 2349 // Spacer(),
2349 Expanded( 2350 Expanded(
2350 child: Text( 2351 child: Text(
2351 - '桌位23333', 2352 + table.lockTname ?? '',
2352 maxLines: 1, 2353 maxLines: 1,
2353 textAlign: TextAlign.right, 2354 textAlign: TextAlign.right,
2354 overflow: 2355 overflow:
@@ -2425,6 +2426,7 @@ class DialogUtil { @@ -2425,6 +2426,7 @@ class DialogUtil {
2425 .goMergeTableSelectPage( 2426 .goMergeTableSelectPage(
2426 context, 2427 context,
2427 tableidNow: tableid, 2428 tableidNow: tableid,
  2429 + tids: table.tids,
2428 object: { 2430 object: {
2429 'object': selectTables 2431 'object': selectTables
2430 }); 2432 });
@@ -2433,16 +2435,18 @@ class DialogUtil { @@ -2433,16 +2435,18 @@ class DialogUtil {
2433 .goMergeTableSelectPage( 2435 .goMergeTableSelectPage(
2434 context, 2436 context,
2435 tableidNow: tableid, 2437 tableidNow: tableid,
  2438 + tids: table.tids,
2436 ); 2439 );
2437 } 2440 }
2438 2441
2439 if (object != null) { 2442 if (object != null) {
2440 selectTables = object['object']; 2443 selectTables = object['object'];
2441 tids = object['tid']; 2444 tids = object['tid'];
2442 - } else {  
2443 - selectTables = []; //没有选择桌子  
2444 - tids = '';  
2445 } 2445 }
  2446 + // else {
  2447 + // selectTables = []; //没有选择桌子
  2448 + // tids = '';
  2449 + // }
2446 tableNames = ''; 2450 tableNames = '';
2447 selectTables.forEach((element) { 2451 selectTables.forEach((element) {
2448 tableNames += '${element.name}、'; 2452 tableNames += '${element.name}、';
@@ -16,6 +16,7 @@ class MergeTableItem extends StatefulWidget { @@ -16,6 +16,7 @@ class MergeTableItem extends StatefulWidget {
16 16
17 final int height; //高度 17 final int height; //高度
18 final bool need; 18 final bool need;
  19 + final String tids;
19 20
20 MergeTableItem(this.table, 21 MergeTableItem(this.table,
21 {this.onSelected, 22 {this.onSelected,
@@ -24,7 +25,8 @@ class MergeTableItem extends StatefulWidget { @@ -24,7 +25,8 @@ class MergeTableItem extends StatefulWidget {
24 this.fromPage = 'new', 25 this.fromPage = 'new',
25 this.rid, 26 this.rid,
26 this.tableMap, 27 this.tableMap,
27 - this.need = true}); 28 + this.need = true,
  29 + this.tids});
28 30
29 @override 31 @override
30 State<StatefulWidget> createState() { 32 State<StatefulWidget> createState() {
@@ -56,6 +58,13 @@ class MergeTableItemState extends State<MergeTableItem> { @@ -56,6 +58,13 @@ class MergeTableItemState extends State<MergeTableItem> {
56 } 58 }
57 } 59 }
58 60
  61 + bool locked = false;
  62 + List<String> tids = [];
  63 +
  64 + if (table.isLock == '1' && !widget.tids.split(',').contains(table.id)) {
  65 + locked = true;
  66 + }
  67 +
59 return GestureDetector( 68 return GestureDetector(
60 onTap: () { 69 onTap: () {
61 if (widget.canSelected && widget.fromPage == 'change') { 70 if (widget.canSelected && widget.fromPage == 'change') {
@@ -95,11 +104,13 @@ class MergeTableItemState extends State<MergeTableItem> { @@ -95,11 +104,13 @@ class MergeTableItemState extends State<MergeTableItem> {
95 widget.onSelected(table); 104 widget.onSelected(table);
96 } else if (widget.fromPage == 'table_manage' || 105 } else if (widget.fromPage == 'table_manage' ||
97 widget.fromPage == 'room_manage') { 106 widget.fromPage == 'room_manage') {
98 - setState(() {  
99 - table.selected = !(table.selected ?? false);  
100 - }); 107 + if (!locked) {
  108 + setState(() {
  109 + table.selected = !(table.selected ?? false);
  110 + });
101 111
102 - widget.onSelected(table); 112 + widget.onSelected(table);
  113 + }
103 } else if (widget.fromPage == 'tablePhoto') { 114 } else if (widget.fromPage == 'tablePhoto') {
104 // setState(() { 115 // setState(() {
105 // table.selected = true; 116 // table.selected = true;
@@ -127,7 +138,9 @@ class MergeTableItemState extends State<MergeTableItem> { @@ -127,7 +138,9 @@ class MergeTableItemState extends State<MergeTableItem> {
127 : MyColours.color_ffffff, 138 : MyColours.color_ffffff,
128 border: Border.all( 139 border: Border.all(
129 width: ScreenUtil().setWidth(2), 140 width: ScreenUtil().setWidth(2),
130 - color: MyColours.color_E0E0E0), 141 + color: locked
  142 + ? MyColours.color_BFC4D4
  143 + : MyColours.color_438E93),
131 borderRadius: BorderRadius.all( 144 borderRadius: BorderRadius.all(
132 Radius.circular(ScreenUtil().setWidth(10)))), 145 Radius.circular(ScreenUtil().setWidth(10)))),
133 child: Stack( 146 child: Stack(
@@ -155,12 +168,15 @@ class MergeTableItemState extends State<MergeTableItem> { @@ -155,12 +168,15 @@ class MergeTableItemState extends State<MergeTableItem> {
155 table.name, 168 table.name,
156 maxLines: 1, 169 maxLines: 1,
157 style: TextStyle( 170 style: TextStyle(
158 - color:  
159 - (widget.need && signStr == '已预订' && !isSelf)  
160 - ? MyColours.color_333333 171 + color: (widget.need &&
  172 + signStr == '已预订' &&
  173 + !isSelf)
  174 + ? MyColours.color_333333
  175 + : locked
  176 + ? MyColours.color_BFC4D4
161 : (widget.canSelected && table.selected) 177 : (widget.canSelected && table.selected)
162 ? MyColours.color_ffffff 178 ? MyColours.color_ffffff
163 - : MyColours.color_333333, 179 + : MyColours.color_438E93,
164 fontSize: ScreenUtil().setSp(30), 180 fontSize: ScreenUtil().setSp(30),
165 decoration: TextDecoration.none, 181 decoration: TextDecoration.none,
166 fontWeight: FontWeight.bold), 182 fontWeight: FontWeight.bold),
@@ -194,9 +210,12 @@ class MergeTableItemState extends State<MergeTableItem> { @@ -194,9 +210,12 @@ class MergeTableItemState extends State<MergeTableItem> {
194 style: TextStyle( 210 style: TextStyle(
195 color: signStr == '已预订' && !isSelf 211 color: signStr == '已预订' && !isSelf
196 ? MyColours.color_353535 212 ? MyColours.color_353535
197 - : (widget.canSelected && table.selected)  
198 - ? MyColours.color_ffffff  
199 - : MyColours.color_353535, 213 + : locked
  214 + ? MyColours.color_BFC4D4
  215 + : (widget.canSelected &&
  216 + table.selected)
  217 + ? MyColours.color_ffffff
  218 + : MyColours.color_438E93,
200 fontSize: ScreenUtil().setSp(14), 219 fontSize: ScreenUtil().setSp(14),
201 decoration: TextDecoration.none, 220 decoration: TextDecoration.none,
202 fontWeight: FontWeight.normal), 221 fontWeight: FontWeight.normal),
@@ -297,7 +316,7 @@ class MergeTableItemState extends State<MergeTableItem> { @@ -297,7 +316,7 @@ class MergeTableItemState extends State<MergeTableItem> {
297 : MyColours.color_999999, 316 : MyColours.color_999999,
298 borderRadius: BorderRadius.only( 317 borderRadius: BorderRadius.only(
299 topLeft: Radius.circular( 318 topLeft: Radius.circular(
300 - ScreenUtil().setWidth(10)), 319 + ScreenUtil().setWidth(8)),
301 // topRight: 320 // topRight:
302 // Radius.circular(ScreenUtil().setWidth(8)), 321 // Radius.circular(ScreenUtil().setWidth(8)),
303 // bottomRight: Radius.circular( 322 // bottomRight: Radius.circular(
@@ -305,9 +324,7 @@ class MergeTableItemState extends State<MergeTableItem> { @@ -305,9 +324,7 @@ class MergeTableItemState extends State<MergeTableItem> {
305 )), 324 )),
306 child: Text(table.tidStr, 325 child: Text(table.tidStr,
307 style: TextStyle( 326 style: TextStyle(
308 - color:  
309 - MyColours.color_ffffff  
310 - , 327 + color: MyColours.color_ffffff,
311 fontSize: ScreenUtil().setSp(14), 328 fontSize: ScreenUtil().setSp(14),
312 decoration: TextDecoration.none, 329 decoration: TextDecoration.none,
313 fontWeight: FontWeight.normal)), 330 fontWeight: FontWeight.normal)),