Commit 01e2dff48222632c1ff9ebd54f4c4b9a660ea692

Authored by “gaiyaguang”
1 parent 3961f60c

合并

... ... @@ -62,6 +62,30 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
widget.detailEntity.pnum,
widget.detailEntity.tables);
_initData();
// //输入框焦点
// _nameNode.addListener(() {
// if (!_nameNode.hasFocus) {
// print('失去焦点');
// } else {
// print('得到焦点');
// _phoneNode.unfocus();
// }
// });
// //输入框焦点
// _phoneNode.addListener(() {
// if (!_phoneNode.hasFocus) {
// print('失去焦点');
// } else {
// print('得到焦点');
// }
// });
}
@override
void dispose() {
_nameNode.unfocus();
_phoneNode.unfocus();
super.dispose();
}
_initData() {
... ... @@ -122,10 +146,12 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
}
}
//选完今天明天刷新页面
int ddate = Utils.getDdate(_notebookDetailChangeModel.dateList);
String ddateSolt =
Utils.getDdateSolt(_notebookDetailChangeModel.sunDateList);
String pnum = Utils.getPnum(_notebookDetailChangeModel.personNumList);
int ddate =
Utils.getDdate(_notebookDetailChangeModel.dateList);
String ddateSolt = Utils.getDdateSolt(
_notebookDetailChangeModel.sunDateList);
String pnum = Utils.getPnum(
_notebookDetailChangeModel.personNumList);
List<t.TableList> list =
await _notebookDetailChangeModel.getNewTableList(
context,
... ... @@ -183,9 +209,12 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
_notebookDetailChangeModel.notifyListeners();
}
}
int ddate = Utils.getDdate(_notebookDetailChangeModel.dateList);
String pnum = Utils.getPnum(_notebookDetailChangeModel.personNumList);
String ddateSolt = Utils.getDdateSolt(_notebookDetailChangeModel.sunDateList);
int ddate =
Utils.getDdate(_notebookDetailChangeModel.dateList);
String pnum =
Utils.getPnum(_notebookDetailChangeModel.personNumList);
String ddateSolt = Utils.getDdateSolt(
_notebookDetailChangeModel.sunDateList);
_notebookDetailChangeModel.getNewTableList(
context,
'${ddate}',
... ... @@ -235,9 +264,12 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
}
_notebookDetailChangeModel.notifyListeners();
//人数选择页面刷新
String pnum = Utils.getPnum(_notebookDetailChangeModel.personNumList);
int ddate = Utils.getDdate(_notebookDetailChangeModel.dateList);
String ddateSolt = Utils.getDdateSolt(_notebookDetailChangeModel.sunDateList);
String pnum =
Utils.getPnum(_notebookDetailChangeModel.personNumList);
int ddate =
Utils.getDdate(_notebookDetailChangeModel.dateList);
String ddateSolt = Utils.getDdateSolt(
_notebookDetailChangeModel.sunDateList);
_notebookDetailChangeModel.getNewTableList(
context,
... ... @@ -285,14 +317,11 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
_notebookDetailChangeModel.dateList[2]['title'] = '其他';
}
// 选完日历刷新页面
String ddateSolt = Utils.getDdateSolt(_notebookDetailChangeModel.sunDateList);
String ddateSolt =
Utils.getDdateSolt(_notebookDetailChangeModel.sunDateList);
String pnum = Utils.getPnum(_notebookDetailChangeModel.personNumList);
_notebookDetailChangeModel.getNewTableList(
context,
'${dateTimeMill}',
ddateSolt,
pnum,
_notebookDetailChangeModel.tableList);
_notebookDetailChangeModel.getNewTableList(context, '${dateTimeMill}',
ddateSolt, pnum, _notebookDetailChangeModel.tableList);
}
_notebookDetailChangeModel.notifyListeners();
});
... ... @@ -517,12 +546,14 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
// EdgeInsets.only(bottom: ScreenUtil().setWidth(17)),
border: InputBorder.none,
),
onChanged: (value) {},
onChanged: (value) {
print('ggg');
},
onEditingComplete: () {
print('fff');
_nameNode.unfocus();
},
// keyboardType: TextInputType.number,
keyboardType: TextInputType.text,
),
),
HEmptyView(40),
... ... @@ -755,7 +786,7 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
body: Column(children: <Widget>[
SizedBox(height: ScreenUtil.statusBarHeight),
MyAppBar(
widget.detailEntity.id=="-1"?"录入订座信息":"变更预订",
widget.detailEntity.id == "-1" ? "录入订座信息" : "变更预订",
showBack: true,
),
Expanded(
... ... @@ -772,7 +803,7 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
width: double.infinity,
height: 84,
fontSize: 34,
content: widget.detailEntity.id=="-1"?"完成预订":"确定修改",
content: widget.detailEntity.id == "-1" ? "完成预订" : "确定修改",
state: 2,
onPress: () async {
String name =
... ... @@ -785,9 +816,13 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
Utils.showToast("请选择桌位");
return;
}
SunReserveInfoModel _model =_notebookDetailChangeModel.detailEntity.type=="1"?//判断是否在线预订
await _notebookDetailChangeModel
.updateOnlineReserveInfo(context):await _notebookDetailChangeModel.setReserveInfo(context);
SunReserveInfoModel _model =
_notebookDetailChangeModel.detailEntity.type == "1"
? //判断是否在线预订
await _notebookDetailChangeModel
.updateOnlineReserveInfo(context)
: await _notebookDetailChangeModel
.setReserveInfo(context);
if (ObjectUtil.isNotEmpty(_model.row) ||
ObjectUtil.isNotEmpty(_model.row.id)) {
print('成功');
... ... @@ -813,17 +848,20 @@ class _NoteBookChangePageState extends State<NoteBookChangePage> {
List<dynamic> tableinfo =
convert.jsonDecode(_model.row.tableinfo);
print(tableinfo);
String _nameStr=t.TableList.fromJson(tableinfo[0]).name;
String _nameStr = t.TableList.fromJson(tableinfo[0]).name;
if (tableinfo.length > 1) {
_nameStr = t.TableList.fromJson(tableinfo[0]).name + '等${tableinfo.length}桌';
_nameStr = t.TableList.fromJson(tableinfo[0]).name +
'等${tableinfo.length}桌';
}
LogUtil.v(_nameStr);
NavigatorUtil.goInvicationPage(context, _model.row.id,
_nameStr, _model.row.ddate, ddate_solt,
replace: true);
EventBus().emit("refresh_tablemanager");//刷新桌位
EventBus().emit("refresh_tablemanager"); //刷新桌位
} else {
Utils.showToast(widget.detailEntity.id=="-1"?"录入预订订单失败,请重试!":"变更预订订单失败,请重试!");
Utils.showToast(widget.detailEntity.id == "-1"
? "录入预订订单失败,请重试!"
: "变更预订订单失败,请重试!");
}
},
))
... ... @@ -952,7 +990,8 @@ class _ButtonState extends State<CustomButton> {
onEditingComplete: () {
_cancelNode.unfocus();
int ddate = Utils.getDdate(widget.model.dateList);
String ddateSolt = Utils.getDdateSolt(widget.model.sunDateList);
String ddateSolt =
Utils.getDdateSolt(widget.model.sunDateList);
String pnum = Utils.getPnum(widget.model.personNumList);
widget.model.getNewTableList(context, '${ddate}',
... ...