xt / Flutter-ReserveApp · Commits

Go to a project

Commit 8fa65fb60b54a00839fa2ea0561c927f62abc699

Authored by wdn127929
1 parent cc76ea7b
build: skipped

单日期选择更改

Inline Side-by-side
Showing 7 changed files with 202 additions and 88 deletions
import 'dart:convert';
import 'dart:io';
import 'dart:ui';
import 'package:calendar_date_picker2/calendar_date_picker2.dart';
import 'package:call_log/call_log.dart';
import 'package:common_utils/common_utils.dart';
... ... @@ -49,7 +48,6 @@ import '../../utils/screen_util.dart';
import '../../widgets/special_text/my_extended_text_selection_controls.dart';
import 'package:flutter_picker/flutter_picker.dart' as Picker;
typedef clickCallback = void Function(String value);
class NoteBookChangeFPage extends StatefulWidget {
... ... @@ -542,8 +540,6 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> {
}
}
_addNameSuffix(String name, String suffix) {
if (name == _notebookDetailChangeModel.nameController.text &&
_notebookDetailChangeModel.nameController.text.endsWith(suffix)) {
... ... @@ -1376,14 +1372,32 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> {
Expanded(
child: GestureDetector(
onTap: () {
DialogUtil.showCalendarDialog(context,
_notebookDetailChangeModel.dateTime)
.then((day) {
if (day != null) {
// DialogUtil.showCalendarDialog(context,
// _notebookDetailChangeModel.dateTime)
// .then((day) {
// if (day != null) {
// _notebookDetailChangeModel.createDateText(
// context, day);
// int dateTimeMill = day.millisecondsSinceEpoch;
// dateTime = day;
// _notebookDetailChangeModel.getNewTableList(
// context,
// '${dateTimeMill}',
// _notebookDetailChangeModel.currTimeIndex
// .toString(),
// widget.detailEntity.pnum,
// _notebookDetailChangeModel.tableList);
// }
// });
DialogUtil.showCalendarDialogMultiple(
context, [_notebookDetailChangeModel.dateTime],
(day) async {
if (day != null && day.length == 1) {
_notebookDetailChangeModel.createDateText(
context, day);
int dateTimeMill = day.millisecondsSinceEpoch;
dateTime = day;
context, day[0]);
int dateTimeMill = day[0].millisecondsSinceEpoch;
dateTime = day[0];
_notebookDetailChangeModel.getNewTableList(
context,
'${dateTimeMill}',
... ... @@ -1392,7 +1406,7 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> {
widget.detailEntity.pnum,
_notebookDetailChangeModel.tableList);
}
});
}, calendarType: CalendarDatePicker2Type.single);
},
child: Container(
// height: ScreenUtil().setWidth(80),
... ... @@ -2911,4 +2925,3 @@ Widget remarkButton({GestureTapCallback onPress, content, isSelect = false}) {
),
);
}
... ...
... ... @@ -2,6 +2,7 @@ import 'dart:convert';
import 'dart:io';
import 'dart:ui';
import 'package:calendar_date_picker2/calendar_date_picker2.dart';
import 'package:call_log/call_log.dart';
import 'package:common_utils/common_utils.dart';
... ... @@ -151,13 +152,13 @@ class _NoteBookChangeFPageOnlyState extends State<NoteBookChangeFPageOnly> {
},
showCircle: showCicle,
isShowLoading: isShowLoading);
if (detailEntity.type == "0") {
if (detailEntity.type == "0") {
//内部预订
detailEntity.is_set_ddate = "1";
}
_notebookDetailChangeModel.detailEntity = detailEntity;
_notebookDetailChangeModel.detailEntity = detailEntity;
print(detailEntity);
print(detailEntity);
if (detailEntity.phone != '0') {
_notebookDetailChangeModel.phoneController.text = detailEntity.phone;
}
... ... @@ -171,7 +172,6 @@ _notebookDetailChangeModel.detailEntity = detailEntity;
_notebookDetailChangeModel.initSexList();
_initDateList(detailEntity);
currTimeIndex = int.parse(detailEntity.ddate_solt);
... ... @@ -640,8 +640,7 @@ _notebookDetailChangeModel.detailEntity = detailEntity;
},
child: Scaffold(
backgroundColor: Colors.white,
appBar: SystemAppBar( "变更预订",
onTap: () {
appBar: SystemAppBar("变更预订", onTap: () {
Navigator.pop(context);
}),
body: Consumer<NotebookDetailModel>(builder: (context1, model, _) {
... ... @@ -667,14 +666,32 @@ _notebookDetailChangeModel.detailEntity = detailEntity;
Expanded(
child: GestureDetector(
onTap: () {
DialogUtil.showCalendarDialog(
context, dateTime)
.then((day) {
if (day != null) {
createDateText(context, day);
// DialogUtil.showCalendarDialog(
// context, dateTime)
// .then((day) {
// if (day != null) {
// createDateText(context, day);
// int dateTimeMill =
// day.millisecondsSinceEpoch;
// dateTime = day;
// _notebookDetailChangeModel
// .getNewTableList(
// context,
// '${dateTimeMill}',
// currTimeIndex.toString(),
// detailEntity.pnum,
// _notebookDetailChangeModel
// .tableListOrReserve);
// }
// });
DialogUtil.showCalendarDialogMultiple(
context, [dateTime], (day) async {
if (day != null && day.length == 1) {
createDateText(context, day[0]);
int dateTimeMill =
day.millisecondsSinceEpoch;
dateTime = day;
day[0].millisecondsSinceEpoch;
dateTime = day[0];
_notebookDetailChangeModel
.getNewTableList(
context,
... ... @@ -684,7 +701,9 @@ _notebookDetailChangeModel.detailEntity = detailEntity;
_notebookDetailChangeModel
.tableListOrReserve);
}
});
},
calendarType:
CalendarDatePicker2Type.single);
},
child: Container(
// height: ScreenUtil().setWidth(80),
... ...
import 'dart:convert';
import 'package:cached_network_image/cached_network_image.dart';
import 'package:calendar_date_picker2/calendar_date_picker2.dart';
import 'package:common_utils/common_utils.dart';
import 'package:dotted_border/dotted_border.dart';
import 'package:flutter/gestures.dart';
... ... @@ -116,8 +117,8 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
List<String> imgAllYx = [];
List<String> imgAllDj = [];
List<String> imgAllHt = [];
List<String> imgAllFp = [];
List<String> imgAllHt = [];
List<String> imgAllFp = [];
@override
void initState() {
// TODO: implement initState
... ... @@ -465,7 +466,7 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
_uploadImageProvider.feastRemarkContractImageList.add(uploadImgModel);
imgAllHt.add(element.url);
});
_uploadImageProvider.feastRemarkInvoiceImageList = [];
feastModel.banquetDetail.invoice?.images?.forEach((element) {
UploadImgModel uploadImgModel = UploadImgModel();
... ... @@ -1077,10 +1078,25 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
VEmptyView(26),
_selectWidget('宴会日期', dateTimeShow, onTap: () {
FocusScope.of(context).requestFocus(FocusNode()); //隐藏键盘
DialogUtil.showCalendarDialog(context, dateTime).then((day) async {
if (day != null) {
dateTime = day;
dateTimeShow = createDateText(context, day);
// DialogUtil.showCalendarDialog(context, dateTime).then((day) async {
// if (day != null) {
// dateTime = day;
// dateTimeShow = createDateText(context, day);
// if (xuantaiData.length > 0 &&
// xuantaiData[0].dateTimext == null) {
// xuantaiData[0].dateTimext = dateTime;
// xuantaiData[0].dateTimeShowxt = dateTimeShow;
// }
// setState(() {});
// }
// });
DialogUtil.showCalendarDialogMultiple(context, [dateTime],
(day) async {
if (day != null && day.length == 1) {
dateTime = day[0];
dateTimeShow = createDateText(context, day[0]);
if (xuantaiData.length > 0 &&
xuantaiData[0].dateTimext == null) {
xuantaiData[0].dateTimext = dateTime;
... ... @@ -1089,7 +1105,7 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
setState(() {});
}
});
}, calendarType: CalendarDatePicker2Type.single);
}),
_selectWidget('接单人', jdShow, onTap: () {
FocusScope.of(context).requestFocus(FocusNode()); //隐藏键盘
... ... @@ -2102,17 +2118,37 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
'宴会日期', xuantaiData[xuantaiSelIndex].dateTimeShowxt,
onTap: () {
FocusScope.of(context).requestFocus(FocusNode()); //隐藏键盘
DialogUtil.showCalendarDialog(context,
xuantaiData[xuantaiSelIndex].dateTimext)
.then((day) async {
if (day != null) {
// DialogUtil.showCalendarDialog(context,
// xuantaiData[xuantaiSelIndex].dateTimext)
// .then((day) async {
// if (day != null) {
// setState(() {
// // xuantaiData[xuantaiSelIndex].tids = [];
// // xuantaiData[xuantaiSelIndex].tableList = [];
// // xuantaiData[xuantaiSelIndex].tableSum = 0;
// xuantaiData[xuantaiSelIndex].dateTimext = day;
// xuantaiData[xuantaiSelIndex].dateTimeShowxt =
// createDateText(context, day);
// });
// if (xuantaiData[xuantaiSelIndex].startDate != '' &&
// xuantaiData[xuantaiSelIndex].endDate != '' &&
// xuantaiData[xuantaiSelIndex].tableList !=
// null) {
// _getTableList();
// }
// }
// });
DialogUtil.showCalendarDialogMultiple(
context, [xuantaiData[xuantaiSelIndex].dateTimext],
(day) async {
if (day != null && day.length == 1) {
setState(() {
// xuantaiData[xuantaiSelIndex].tids = [];
// xuantaiData[xuantaiSelIndex].tableList = [];
// xuantaiData[xuantaiSelIndex].tableSum = 0;
xuantaiData[xuantaiSelIndex].dateTimext = day;
xuantaiData[xuantaiSelIndex].dateTimext = day[0];
xuantaiData[xuantaiSelIndex].dateTimeShowxt =
createDateText(context, day);
createDateText(context, day[0]);
});
if (xuantaiData[xuantaiSelIndex].startDate != '' &&
xuantaiData[xuantaiSelIndex].endDate != '' &&
... ... @@ -2121,7 +2157,7 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
_getTableList();
}
}
});
}, calendarType: CalendarDatePicker2Type.single);
}),
_selectWidget('餐段选择', xuantaiData[xuantaiSelIndex].cdShow,
onTap: () {
... ... @@ -4497,9 +4533,9 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
maxImageNumber: 8,
mainAxisSpacing: 72,
crossAxisSpacing: 56,
callback: (){
imgAllHt.add( _uploadImageProvider.feastRemarkContractImageList.last.qiniuUrl);
callback: () {
imgAllHt.add(_uploadImageProvider
.feastRemarkContractImageList.last.qiniuUrl);
},
);
}),
... ... @@ -4765,10 +4801,9 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
maxImageNumber: 8,
mainAxisSpacing: 72,
crossAxisSpacing: 56,
callback: (){
imgAllFp.add( _uploadImageProvider.feastRemarkInvoiceImageList.last.qiniuUrl);
callback: () {
imgAllFp.add(_uploadImageProvider
.feastRemarkInvoiceImageList.last.qiniuUrl);
},
);
}),
... ... @@ -5050,14 +5085,13 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
///设置合同信息
Future<bool> _setBanquetContract() async {
List imageQiniuUrlList = []; //接口图片数据list
List<String> delImgs = []; //接口图片数据list
List<String> delImgs = []; //接口图片数据list
for (int i = 0;
i < _uploadImageProvider.feastRemarkContractImageList.length;
i++) {
String url = _uploadImageProvider.feastRemarkContractImageList[i].qiniuUrl;
imageQiniuUrlList.add({
"url": url
});
String url =
_uploadImageProvider.feastRemarkContractImageList[i].qiniuUrl;
imageQiniuUrlList.add({"url": url});
delImgs.add(url);
}
Map<String, String> params = {
... ... @@ -5074,7 +5108,7 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
bool success = await feastModel.setBanquetContract(context, params);
if (success) {
Set<String> difference = Set.from(imgAllHt)..removeAll(delImgs);
Set<String> difference = Set.from(imgAllHt)..removeAll(delImgs);
List<String> differenceList = difference.toList(); //需要删除的图片
if (differenceList.length > 0) {
String delImgs = Utils.listToStringEnglish(differenceList);
... ... @@ -5093,14 +5127,12 @@ class _FeastCreatePageState extends State<FeastCreatePage> {
}
List imageQiniuUrlListInvoice = []; //接口图片数据list
List<String> delImgs = []; //接口图片数据list
List<String> delImgs = []; //接口图片数据list
for (int i = 0;
i < _uploadImageProvider.feastRemarkInvoiceImageList.length;
i++) {
String url = _uploadImageProvider.feastRemarkInvoiceImageList[i].qiniuUrl;
imageQiniuUrlListInvoice.add({
"url":url
});
String url = _uploadImageProvider.feastRemarkInvoiceImageList[i].qiniuUrl;
imageQiniuUrlListInvoice.add({"url": url});
delImgs.add(url);
}
if (imageQiniuUrlListInvoice.length > 0) {
... ...
import 'package:calendar_date_picker2/calendar_date_picker2.dart';
import 'package:common_utils/common_utils.dart';
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
... ... @@ -248,14 +249,23 @@ class _FeastFollowUpPageState extends State<FeastFollowUpPage> {
InkWell(
onTap: () {
// FocusScope.of(context).requestFocus(FocusNode()); //隐藏键盘
DialogUtil.showCalendarDialog(context, dateTimeStart)
.then((day) async {
if (day != null) {
dateTimeStart = day;
start = createDateText(context, day);
// DialogUtil.showCalendarDialog(context, dateTimeStart)
// .then((day) async {
// if (day != null) {
// dateTimeStart = day;
// start = createDateText(context, day);
// setState(() {});
// }
// });
DialogUtil.showCalendarDialogMultiple(
context, [dateTimeStart], (day) async {
if (day != null && day.length == 1) {
dateTimeStart = day[0];
start = createDateText(context, day[0]);
setState(() {});
}
});
}, calendarType: CalendarDatePicker2Type.single);
},
child: Row(
children: [
... ... @@ -282,14 +292,23 @@ class _FeastFollowUpPageState extends State<FeastFollowUpPage> {
InkWell(
onTap: () {
// FocusScope.of(context).requestFocus(FocusNode()); //隐藏键盘
DialogUtil.showCalendarDialog(context, dateTimeEnd)
.then((day) async {
if (day != null) {
dateTimeEnd = day;
end = createDateText(context, day);
// DialogUtil.showCalendarDialog(context, dateTimeEnd)
// .then((day) async {
// if (day != null) {
// dateTimeEnd = day;
// end = createDateText(context, day);
// setState(() {});
// }
// });
DialogUtil.showCalendarDialogMultiple(
context, [dateTimeEnd], (day) async {
if (day != null && day.length == 1) {
dateTimeEnd = day[0];
end = createDateText(context, day[0]);
setState(() {});
}
});
}, calendarType: CalendarDatePicker2Type.single);
},
child: Row(
children: [
... ...
import 'package:calendar_date_picker2/calendar_date_picker2.dart';
import 'package:common_utils/common_utils.dart';
import 'package:dio/dio.dart';
import 'package:flutter/material.dart';
... ... @@ -392,7 +393,8 @@ class NoteBookPageState extends State<NoteBookPage> {
clearSel = false;
} else {
clearSel = true;
dateText = '${day.month}月\n${day.day}日';
// dateText = '${day.year}年\n${day.month}月\n${day.day}日';
dateText = '${day.month}月\n${day.day}日';
}
});
}
... ... @@ -561,7 +563,8 @@ class NoteBookPageState extends State<NoteBookPage> {
userModel = Provider.of<UserModel>(context, listen: false);
noteBookModel = Provider.of<NoteBookModel>(context, listen: true);
collectStoreProvider = Provider.of<CollectStoreProvider>(context, listen: true);
collectStoreProvider =
Provider.of<CollectStoreProvider>(context, listen: true);
int sum = 3;
int hide = 0;
int btnNum = 0;
... ... @@ -870,12 +873,19 @@ class NoteBookPageState extends State<NoteBookPage> {
))),
InkWell(
onTap: () {
DialogUtil.showCalendarDialog(context, dateTimeNow)
.then((day) {
if (day != null) {
_createDateText(day);
// DialogUtil.showCalendarDialog(context, dateTimeNow)
// .then((day) {
// if (day != null) {
// _createDateText(day);
// }
// });
DialogUtil.showCalendarDialogMultiple(
context, [dateTimeNow], (day) async {
if (day != null && day.length == 1) {
_createDateText(day[0]);
}
});
}, calendarType: CalendarDatePicker2Type.single);
},
child: Container(
alignment: Alignment.center,
... ... @@ -1122,7 +1132,8 @@ class NoteBookPageState extends State<NoteBookPage> {
model.notebooksSort[index]);
})
: NoteBookItemF(
model.notebooksSort[index], index,
model.notebooksSort[index],
index,
collectStoreProvider.sellerPreserve,
() {
_itemChangeSimple(
... ...
... ... @@ -2,6 +2,7 @@ import 'dart:async';
import 'dart:convert';
import 'dart:io';
import 'package:calendar_date_picker2/calendar_date_picker2.dart';
import 'package:call_log/call_log.dart';
import 'package:common_utils/common_utils.dart';
import 'package:dotted_border/dotted_border.dart';
... ... @@ -3688,10 +3689,25 @@ class TableManagerPageState extends State<TableManagerPage> {
Expanded(
child: GestureDetector(
onTap: () {
DialogUtil.showCalendarDialog(context, dateTime)
.then((day) async {
if (day != null) {
createDateText1(context, day);
// DialogUtil.showCalendarDialog(context, dateTime)
// .then((day) async {
// if (day != null) {
// createDateText1(context, day);
// bool success =
// await tableManagerModel.getTableListOrReserve(
// context,
// currTimeIndex,
// dateTime,
// selectNumber,
// showLoading: true,
// );
// }
// });
DialogUtil.showCalendarDialogMultiple(
context, [dateTime], (day) async {
if (day != null && day.length == 1) {
createDateText1(context, day[0]);
bool success =
await tableManagerModel.getTableListOrReserve(
context,
... ... @@ -3701,7 +3717,7 @@ class TableManagerPageState extends State<TableManagerPage> {
showLoading: true,
);
}
});
}, calendarType: CalendarDatePicker2Type.single);
},
child: Container(
// height: ScreenUtil().setWidth(80),
... ...
... ... @@ -7286,10 +7286,11 @@ class DialogUtil {
static Widget _buildMultiDatePickerWithValue(
List<DateTime> _multiDatePickerValueWithDefaultValue,
CalendarDatePicker2Type calendarType,
ValueChanged valueChanged) {
final config = CalendarDatePicker2Config(
disableMonthPicker: true,
calendarType: CalendarDatePicker2Type.multi,
calendarType: calendarType,
currentDate: DateTime.now(),
dynamicCalendarRows: true,
centerAlignModePicker: true,
... ... @@ -7383,6 +7384,9 @@ class DialogUtil {
BuildContext context,
List<DateTime> selectDates,
ValueChanged valueChanged,
{
CalendarDatePicker2Type calendarType = CalendarDatePicker2Type.multi,
}
) {
List<DateTime> _multiDatePickerValueWithDefaultValue = selectDates; //日历使用
return showModalBottomSheet<DateTime>(
... ... @@ -7397,7 +7401,7 @@ class DialogUtil {
mainAxisSize: MainAxisSize.min,
children: <Widget>[
_buildMultiDatePickerWithValue(
_multiDatePickerValueWithDefaultValue, (value) {
_multiDatePickerValueWithDefaultValue, calendarType,(value) {
_multiDatePickerValueWithDefaultValue = value;
}),
VEmptyView(120),
... ...