Commit 01e2dff48222632c1ff9ebd54f4c4b9a660ea692

Authored by “gaiyaguang”
1 parent 3961f60c

合并

@@ -62,6 +62,30 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -62,6 +62,30 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
62 widget.detailEntity.pnum, 62 widget.detailEntity.pnum,
63 widget.detailEntity.tables); 63 widget.detailEntity.tables);
64 _initData(); 64 _initData();
  65 + // //输入框焦点
  66 + // _nameNode.addListener(() {
  67 + // if (!_nameNode.hasFocus) {
  68 + // print('失去焦点');
  69 + // } else {
  70 + // print('得到焦点');
  71 + // _phoneNode.unfocus();
  72 + // }
  73 + // });
  74 + // //输入框焦点
  75 + // _phoneNode.addListener(() {
  76 + // if (!_phoneNode.hasFocus) {
  77 + // print('失去焦点');
  78 + // } else {
  79 + // print('得到焦点');
  80 + // }
  81 + // });
  82 + }
  83 +
  84 + @override
  85 + void dispose() {
  86 + _nameNode.unfocus();
  87 + _phoneNode.unfocus();
  88 + super.dispose();
65 } 89 }
66 90
67 _initData() { 91 _initData() {
@@ -122,10 +146,12 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -122,10 +146,12 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
122 } 146 }
123 } 147 }
124 //选完今天明天刷新页面 148 //选完今天明天刷新页面
125 - int ddate = Utils.getDdate(_notebookDetailChangeModel.dateList);  
126 - String ddateSolt =  
127 - Utils.getDdateSolt(_notebookDetailChangeModel.sunDateList);  
128 - String pnum = Utils.getPnum(_notebookDetailChangeModel.personNumList); 149 + int ddate =
  150 + Utils.getDdate(_notebookDetailChangeModel.dateList);
  151 + String ddateSolt = Utils.getDdateSolt(
  152 + _notebookDetailChangeModel.sunDateList);
  153 + String pnum = Utils.getPnum(
  154 + _notebookDetailChangeModel.personNumList);
129 List<t.TableList> list = 155 List<t.TableList> list =
130 await _notebookDetailChangeModel.getNewTableList( 156 await _notebookDetailChangeModel.getNewTableList(
131 context, 157 context,
@@ -183,9 +209,12 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -183,9 +209,12 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
183 _notebookDetailChangeModel.notifyListeners(); 209 _notebookDetailChangeModel.notifyListeners();
184 } 210 }
185 } 211 }
186 - int ddate = Utils.getDdate(_notebookDetailChangeModel.dateList);  
187 - String pnum = Utils.getPnum(_notebookDetailChangeModel.personNumList);  
188 - String ddateSolt = Utils.getDdateSolt(_notebookDetailChangeModel.sunDateList); 212 + int ddate =
  213 + Utils.getDdate(_notebookDetailChangeModel.dateList);
  214 + String pnum =
  215 + Utils.getPnum(_notebookDetailChangeModel.personNumList);
  216 + String ddateSolt = Utils.getDdateSolt(
  217 + _notebookDetailChangeModel.sunDateList);
189 _notebookDetailChangeModel.getNewTableList( 218 _notebookDetailChangeModel.getNewTableList(
190 context, 219 context,
191 '${ddate}', 220 '${ddate}',
@@ -235,9 +264,12 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -235,9 +264,12 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
235 } 264 }
236 _notebookDetailChangeModel.notifyListeners(); 265 _notebookDetailChangeModel.notifyListeners();
237 //人数选择页面刷新 266 //人数选择页面刷新
238 - String pnum = Utils.getPnum(_notebookDetailChangeModel.personNumList);  
239 - int ddate = Utils.getDdate(_notebookDetailChangeModel.dateList);  
240 - String ddateSolt = Utils.getDdateSolt(_notebookDetailChangeModel.sunDateList); 267 + String pnum =
  268 + Utils.getPnum(_notebookDetailChangeModel.personNumList);
  269 + int ddate =
  270 + Utils.getDdate(_notebookDetailChangeModel.dateList);
  271 + String ddateSolt = Utils.getDdateSolt(
  272 + _notebookDetailChangeModel.sunDateList);
241 273
242 _notebookDetailChangeModel.getNewTableList( 274 _notebookDetailChangeModel.getNewTableList(
243 context, 275 context,
@@ -285,14 +317,11 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -285,14 +317,11 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
285 _notebookDetailChangeModel.dateList[2]['title'] = '其他'; 317 _notebookDetailChangeModel.dateList[2]['title'] = '其他';
286 } 318 }
287 // 选完日历刷新页面 319 // 选完日历刷新页面
288 - String ddateSolt = Utils.getDdateSolt(_notebookDetailChangeModel.sunDateList); 320 + String ddateSolt =
  321 + Utils.getDdateSolt(_notebookDetailChangeModel.sunDateList);
289 String pnum = Utils.getPnum(_notebookDetailChangeModel.personNumList); 322 String pnum = Utils.getPnum(_notebookDetailChangeModel.personNumList);
290 - _notebookDetailChangeModel.getNewTableList(  
291 - context,  
292 - '${dateTimeMill}',  
293 - ddateSolt,  
294 - pnum,  
295 - _notebookDetailChangeModel.tableList); 323 + _notebookDetailChangeModel.getNewTableList(context, '${dateTimeMill}',
  324 + ddateSolt, pnum, _notebookDetailChangeModel.tableList);
296 } 325 }
297 _notebookDetailChangeModel.notifyListeners(); 326 _notebookDetailChangeModel.notifyListeners();
298 }); 327 });
@@ -517,12 +546,14 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -517,12 +546,14 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
517 // EdgeInsets.only(bottom: ScreenUtil().setWidth(17)), 546 // EdgeInsets.only(bottom: ScreenUtil().setWidth(17)),
518 border: InputBorder.none, 547 border: InputBorder.none,
519 ), 548 ),
520 - onChanged: (value) {}, 549 + onChanged: (value) {
  550 + print('ggg');
  551 + },
521 onEditingComplete: () { 552 onEditingComplete: () {
522 print('fff'); 553 print('fff');
523 _nameNode.unfocus(); 554 _nameNode.unfocus();
524 }, 555 },
525 - // keyboardType: TextInputType.number, 556 + keyboardType: TextInputType.text,
526 ), 557 ),
527 ), 558 ),
528 HEmptyView(40), 559 HEmptyView(40),
@@ -755,7 +786,7 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -755,7 +786,7 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
755 body: Column(children: <Widget>[ 786 body: Column(children: <Widget>[
756 SizedBox(height: ScreenUtil.statusBarHeight), 787 SizedBox(height: ScreenUtil.statusBarHeight),
757 MyAppBar( 788 MyAppBar(
758 - widget.detailEntity.id=="-1"?"录入订座信息":"变更预订", 789 + widget.detailEntity.id == "-1" ? "录入订座信息" : "变更预订",
759 showBack: true, 790 showBack: true,
760 ), 791 ),
761 Expanded( 792 Expanded(
@@ -772,7 +803,7 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -772,7 +803,7 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
772 width: double.infinity, 803 width: double.infinity,
773 height: 84, 804 height: 84,
774 fontSize: 34, 805 fontSize: 34,
775 - content: widget.detailEntity.id=="-1"?"完成预订":"确定修改", 806 + content: widget.detailEntity.id == "-1" ? "完成预订" : "确定修改",
776 state: 2, 807 state: 2,
777 onPress: () async { 808 onPress: () async {
778 String name = 809 String name =
@@ -785,9 +816,13 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -785,9 +816,13 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
785 Utils.showToast("请选择桌位"); 816 Utils.showToast("请选择桌位");
786 return; 817 return;
787 } 818 }
788 - SunReserveInfoModel _model =_notebookDetailChangeModel.detailEntity.type=="1"?//判断是否在线预订  
789 - await _notebookDetailChangeModel  
790 - .updateOnlineReserveInfo(context):await _notebookDetailChangeModel.setReserveInfo(context); 819 + SunReserveInfoModel _model =
  820 + _notebookDetailChangeModel.detailEntity.type == "1"
  821 + ? //判断是否在线预订
  822 + await _notebookDetailChangeModel
  823 + .updateOnlineReserveInfo(context)
  824 + : await _notebookDetailChangeModel
  825 + .setReserveInfo(context);
791 if (ObjectUtil.isNotEmpty(_model.row) || 826 if (ObjectUtil.isNotEmpty(_model.row) ||
792 ObjectUtil.isNotEmpty(_model.row.id)) { 827 ObjectUtil.isNotEmpty(_model.row.id)) {
793 print('成功'); 828 print('成功');
@@ -813,17 +848,20 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> { @@ -813,17 +848,20 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
813 List<dynamic> tableinfo = 848 List<dynamic> tableinfo =
814 convert.jsonDecode(_model.row.tableinfo); 849 convert.jsonDecode(_model.row.tableinfo);
815 print(tableinfo); 850 print(tableinfo);
816 - String _nameStr=t.TableList.fromJson(tableinfo[0]).name; 851 + String _nameStr = t.TableList.fromJson(tableinfo[0]).name;
817 if (tableinfo.length > 1) { 852 if (tableinfo.length > 1) {
818 - _nameStr = t.TableList.fromJson(tableinfo[0]).name + '等${tableinfo.length}桌'; 853 + _nameStr = t.TableList.fromJson(tableinfo[0]).name +
  854 + '等${tableinfo.length}桌';
819 } 855 }
820 LogUtil.v(_nameStr); 856 LogUtil.v(_nameStr);
821 NavigatorUtil.goInvicationPage(context, _model.row.id, 857 NavigatorUtil.goInvicationPage(context, _model.row.id,
822 _nameStr, _model.row.ddate, ddate_solt, 858 _nameStr, _model.row.ddate, ddate_solt,
823 replace: true); 859 replace: true);
824 - EventBus().emit("refresh_tablemanager");//刷新桌位 860 + EventBus().emit("refresh_tablemanager"); //刷新桌位
825 } else { 861 } else {
826 - Utils.showToast(widget.detailEntity.id=="-1"?"录入预订订单失败,请重试!":"变更预订订单失败,请重试!"); 862 + Utils.showToast(widget.detailEntity.id == "-1"
  863 + ? "录入预订订单失败,请重试!"
  864 + : "变更预订订单失败,请重试!");
827 } 865 }
828 }, 866 },
829 )) 867 ))
@@ -952,7 +990,8 @@ class _ButtonState extends State<CustomButton> { @@ -952,7 +990,8 @@ class _ButtonState extends State<CustomButton> {
952 onEditingComplete: () { 990 onEditingComplete: () {
953 _cancelNode.unfocus(); 991 _cancelNode.unfocus();
954 int ddate = Utils.getDdate(widget.model.dateList); 992 int ddate = Utils.getDdate(widget.model.dateList);
955 - String ddateSolt = Utils.getDdateSolt(widget.model.sunDateList); 993 + String ddateSolt =
  994 + Utils.getDdateSolt(widget.model.sunDateList);
956 String pnum = Utils.getPnum(widget.model.personNumList); 995 String pnum = Utils.getPnum(widget.model.personNumList);
957 996
958 widget.model.getNewTableList(context, '${ddate}', 997 widget.model.getNewTableList(context, '${ddate}',