Commit d051b364a2680057951a0431c268b9da0269d811

Authored by wdn127929
1 parent f9eb3310

桌位页面bug

... ... @@ -548,7 +548,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 5322;
CURRENT_PROJECT_VERSION = 5323;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -696,7 +696,7 @@
CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 5322;
CURRENT_PROJECT_VERSION = 5323;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ... @@ -732,7 +732,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 5322;
CURRENT_PROJECT_VERSION = 5323;
DEVELOPMENT_TEAM = 8J59HM8B82;
ENABLE_BITCODE = NO;
FLUTTER_BUILD_MODE = release;
... ...
... ... @@ -125,6 +125,7 @@ class TableManagerPageState extends State<TableManagerPage> {
String showErro = '';
String ddateSoltSelect = '';
bool isAddOver = true;
bool isRealAddOver = true;
// int
ScrollController _scrollCrl = ScrollController();
... ... @@ -362,12 +363,15 @@ class TableManagerPageState extends State<TableManagerPage> {
});
if (needInit) {
initCurruntIndex();
isRealAddOver = _getAddOrder(dateTimeSelect, currTimeIndex);
} else {
bool has = storeBaseIndoProvider.dayDateData
.any((element) => element.ddateSolt == ddateSoltSelect);
currTimeIndex = has
? int.parse(ddateSoltSelect)
: int.parse(storeBaseIndoProvider.dayDateData[0].ddateSolt);
isRealAddOver = _getAddOrder(dateTimeSelect, currTimeIndex);
}
selectDateStr = returnDayDateStr(dateTime);
... ... @@ -782,21 +786,23 @@ class TableManagerPageState extends State<TableManagerPage> {
// itemScrollController.jumpTo(index: index, alignment: 0);
/// Generate item number [i].
Widget item(int i) {
///
///
_getAddOrder(DateTime datetimeTemp, int dsolt) {
bool addOrder = true; //默认允许创建
//如果不允许新建过去的订单,则开始判断
if (!isAddOver) {
String times;
//找到当前餐段对应的时间段
if (currTimeIndex == 1) {
if (dsolt == 1) {
times = morning;
} else if (currTimeIndex == 2) {
} else if (dsolt == 2) {
times = noon;
} else if (currTimeIndex == 3) {
} else if (dsolt == 3) {
times = night;
} else if (currTimeIndex == 4) {
} else if (dsolt == 4) {
times = meal1;
} else if (currTimeIndex == 5) {
} else if (dsolt == 5) {
times = meal2;
}
//组装时间戳
... ... @@ -807,11 +813,11 @@ class TableManagerPageState extends State<TableManagerPage> {
// '-' +
// '${dateTimeSelect.day}' +
// ' ${datas[0]}:00'); //选中餐段开始时间戳
DateTime selectEtime = DateTime.parse('${dateTimeSelect.year}' +
DateTime selectEtime = DateTime.parse('${datetimeTemp.year}' +
'-' +
Utils.addZeroNumber(dateTimeSelect.month) +
Utils.addZeroNumber(datetimeTemp.month) +
'-' +
Utils.addZeroNumber(dateTimeSelect.day) +
Utils.addZeroNumber(datetimeTemp.day) +
' ${datas[1]}:00'); //选中餐段结束时间戳
// 过去的餐段界定
if (selectEtime.isBefore(DateTime.now())) {
... ... @@ -822,7 +828,10 @@ class TableManagerPageState extends State<TableManagerPage> {
addOrder = true;
}
}
return addOrder;
}
Widget item(int i) {
return GridView.builder(
// controller: _areaController,
// physics: NeverScrollableScrollPhysics(),
... ... @@ -857,7 +866,7 @@ class TableManagerPageState extends State<TableManagerPage> {
fromPage: 'table_manage',
canSelected: true,
selectTables: tableManagerModel.selectTablesOrReserve,
addOrder:addOrder ,onSelected: (table) {
addOrder: isRealAddOver, onSelected: (table) {
if (table.signStr == '已预订') {
if (table.sign == '10') {
//宴会订单
... ... @@ -3810,6 +3819,16 @@ class TableManagerPageState extends State<TableManagerPage> {
flex: 1,
child: InkWell(
onTap: () {
isRealAddOver =
_getAddOrder(dateTimeSelect, int.parse(element.ddateSolt));
if (!isRealAddOver &&
tableManagerModel.selectTablesOrReserve.length > 0) {
Utils.showToast('不允许新建过去餐段的订单!');
tableManagerModel.selectTablesOrReserve = [];
isRealAddOver = _getAddOrder(dateTimeSelect, currTimeIndex);
setState(() {});
return;
}
currTimeIndex = int.parse(element.ddateSolt);
setState(() {});
... ... @@ -3920,6 +3939,19 @@ class TableManagerPageState extends State<TableManagerPage> {
DialogUtil.showCalendarDialog(context, dateTime)
.then((day) async {
if (day != null) {
isRealAddOver = _getAddOrder(day, currTimeIndex);
if (tableManagerModel.selectTablesOrReserve.length >
0) {
if (!isRealAddOver) {
Utils.showToast('不允许新建过去餐段的订单!');
tableManagerModel.selectTablesOrReserve = [];
isRealAddOver =
_getAddOrder(dateTimeSelect, currTimeIndex);
setState(() {});
return;
}
}
createDateText1(context, day);
getMealSectionByDay(needInit: false);
bool success =
... ...