xt / Flutter-ReserveApp · Commits

Go to a project

Commit 8ed7735f2678fba6f1d23f7ea560ef188a26f1cf

Authored by wdn127929
1 parent 05ac2f5c
build: skipped

贵宾

Inline Side-by-side
Showing 5 changed files with 39 additions and 12 deletions
@@ -177,10 +177,7 @@ class DetailModelAllSunModel { @@ -177,10 +177,7 @@ class DetailModelAllSunModel {
177 DateTime get ddateFhms { 177 DateTime get ddateFhms {
178 DateTime dateTime = 178 DateTime dateTime =
179 DateTime.fromMillisecondsSinceEpoch(int.parse(ddate) * 1000); 179 DateTime.fromMillisecondsSinceEpoch(int.parse(ddate) * 1000);
180 -  
181 -  
182 180
183 -  
184 return dateTime; 181 return dateTime;
185 } 182 }
186 183
@@ -266,7 +263,14 @@ class DetailModelAllSunModel { @@ -266,7 +263,14 @@ class DetailModelAllSunModel {
266 } 263 }
267 264
268 String get rnameStr { 265 String get rnameStr {
269 - if (rname == null || rname == '' || rname == ' ') return ""; 266 + if (rname == null || rname == '' || rname == ' ') {
  267 + if (sex == '4') {
  268 + return "贵宾";
  269 + } else {
  270 + return "";
  271 + }
  272 + }
  273 +
270 switch (sex) { 274 switch (sex) {
271 case "1": //先生 275 case "1": //先生
272 return rname + "先生"; 276 return rname + "先生";
@@ -72,7 +72,13 @@ class NoteBookOnlySunModel { @@ -72,7 +72,13 @@ class NoteBookOnlySunModel {
72 } 72 }
73 73
74 String get rnameStr { 74 String get rnameStr {
75 - if (rname == null || rname.isEmpty || rname == ' ') return ""; 75 + if (rname == null || rname.isEmpty || rname == ' ') {
  76 + if(sex == '4'){
  77 + return '贵宾';
  78 + }else{
  79 + return '';
  80 + }
  81 + }
76 switch (sex) { 82 switch (sex) {
77 case "1": //先生 83 case "1": //先生
78 return rname + "先生"; 84 return rname + "先生";
@@ -26,6 +26,7 @@ import 'package:permission_handler/permission_handler.dart'; @@ -26,6 +26,7 @@ import 'package:permission_handler/permission_handler.dart';
26 import 'package:provider/provider.dart'; 26 import 'package:provider/provider.dart';
27 27
28 import '../../models/user_history_entity.dart'; 28 import '../../models/user_history_entity.dart';
  29 +import '../../provider/customer_provider.dart';
29 import '../../utils/call_log_utils.dart'; 30 import '../../utils/call_log_utils.dart';
30 import '../../utils/common_utils.dart'; 31 import '../../utils/common_utils.dart';
31 import '../../utils/screen_util.dart'; 32 import '../../utils/screen_util.dart';
@@ -64,6 +65,7 @@ class _EditReserverPageState extends State<EditReserverPage> { @@ -64,6 +65,7 @@ class _EditReserverPageState extends State<EditReserverPage> {
64 ScrollController _scrollCrl = ScrollController(); 65 ScrollController _scrollCrl = ScrollController();
65 66
66 MarketingCenterProvider marketingCenterProvider; 67 MarketingCenterProvider marketingCenterProvider;
  68 + CustomerProvider customerProvider;
67 69
68 @override 70 @override
69 void initState() { 71 void initState() {
@@ -93,6 +95,7 @@ class _EditReserverPageState extends State<EditReserverPage> { @@ -93,6 +95,7 @@ class _EditReserverPageState extends State<EditReserverPage> {
93 setState(() {}); 95 setState(() {});
94 } 96 }
95 getDzSellerConf(); 97 getDzSellerConf();
  98 + _sellerGuestGet();
96 }); 99 });
97 } 100 }
98 101
@@ -100,6 +103,11 @@ class _EditReserverPageState extends State<EditReserverPage> { @@ -100,6 +103,11 @@ class _EditReserverPageState extends State<EditReserverPage> {
100 await marketingCenterProvider.getDzSellerConf(context); 103 await marketingCenterProvider.getDzSellerConf(context);
101 } 104 }
102 105
  106 + ///获取客情配置
  107 + _sellerGuestGet() async {
  108 + await customerProvider.getSellerGuest(context);
  109 + }
  110 +
103 _openAddressBook() async { 111 _openAddressBook() async {
104 if (!(await checkContactPermission())) { 112 if (!(await checkContactPermission())) {
105 PermissionStatus permissionStatus = await contactPermissionStatus(); 113 PermissionStatus permissionStatus = await contactPermissionStatus();
@@ -344,6 +352,7 @@ class _EditReserverPageState extends State<EditReserverPage> { @@ -344,6 +352,7 @@ class _EditReserverPageState extends State<EditReserverPage> {
344 marketingCenterProvider = 352 marketingCenterProvider =
345 Provider.of<MarketingCenterProvider>(context, listen: true); 353 Provider.of<MarketingCenterProvider>(context, listen: true);
346 detailModel = Provider.of<NotebookDetailModel>(context, listen: true); 354 detailModel = Provider.of<NotebookDetailModel>(context, listen: true);
  355 + customerProvider = Provider.of<CustomerProvider>(context, listen: true);
347 return Scaffold( 356 return Scaffold(
348 backgroundColor: MyColours.color_ffffff, 357 backgroundColor: MyColours.color_ffffff,
349 appBar: SystemAppBar( 358 appBar: SystemAppBar(
@@ -414,7 +423,7 @@ class _EditReserverPageState extends State<EditReserverPage> { @@ -414,7 +423,7 @@ class _EditReserverPageState extends State<EditReserverPage> {
414 print('ggg'); 423 print('ggg');
415 if (value.endsWith('先生') || 424 if (value.endsWith('先生') ||
416 value.endsWith('女士') || 425 value.endsWith('女士') ||
417 - value.endsWith('公司')|| 426 + value.endsWith('公司') ||
418 value.endsWith('贵宾')) { 427 value.endsWith('贵宾')) {
419 nameStr = value.substring( 428 nameStr = value.substring(
420 0, value.length - 2); 429 0, value.length - 2);
@@ -778,8 +787,9 @@ class _EditReserverPageState extends State<EditReserverPage> { @@ -778,8 +787,9 @@ class _EditReserverPageState extends State<EditReserverPage> {
778 : MyColours.color_ffffff, 787 : MyColours.color_ffffff,
779 borderColor: MyColours.color_199095, 788 borderColor: MyColours.color_199095,
780 onPressed: () async { 789 onPressed: () async {
781 - if (nameStr == null ||  
782 - nameStr.trim().length == 0) { 790 + if (customerProvider.isrepair &&
  791 + (nameStr == null ||
  792 + nameStr.trim().length == 0)) {
783 Utils.showToast('请填写客人姓名'); 793 Utils.showToast('请填写客人姓名');
784 return; 794 return;
785 } 795 }
@@ -2537,8 +2537,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -2537,8 +2537,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
2537 onTap: () { 2537 onTap: () {
2538 FocusScope.of(context).requestFocus(FocusNode()); //隐藏键盘 2538 FocusScope.of(context).requestFocus(FocusNode()); //隐藏键盘
2539 }, 2539 },
2540 - child: SafeArea(  
2541 - child: WillPopScope( 2540 + child: WillPopScope(
2542 child: Scaffold( 2541 child: Scaffold(
2543 backgroundColor: MyColours.color_ffffff, 2542 backgroundColor: MyColours.color_ffffff,
2544 resizeToAvoidBottomInset: false, 2543 resizeToAvoidBottomInset: false,
@@ -5394,7 +5393,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> { @@ -5394,7 +5393,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
5394 Navigator.of(context).pop(); 5393 Navigator.of(context).pop();
5395 return true; 5394 return true;
5396 }, 5395 },
5397 - ))), 5396 + )),
5398 ); 5397 );
5399 } 5398 }
5400 } 5399 }
@@ -97,6 +97,12 @@ class TableItemOrReserveState extends State<TableItemOrReserve> { @@ -97,6 +97,12 @@ class TableItemOrReserveState extends State<TableItemOrReserve> {
97 table.reserveList.rname != ' ') { 97 table.reserveList.rname != ' ') {
98 table.reserver = 98 table.reserver =
99 rnameStr(table.reserveList.rname) + sexStr(table.reserveList.sex); 99 rnameStr(table.reserveList.rname) + sexStr(table.reserveList.sex);
  100 + } else if (table.reserveList.rname == null ||
  101 + table.reserveList.rname == '' ||
  102 + table.reserveList.rname == ' ') {
  103 + if (table.reserveList.sex == '4') {
  104 + table.reserver = '贵宾';
  105 + }
100 } 106 }
101 107
102 table.pnum = table.reserveList.actualPum; 108 table.pnum = table.reserveList.actualPum;
@@ -211,7 +217,9 @@ class TableItemOrReserveState extends State<TableItemOrReserve> { @@ -211,7 +217,9 @@ class TableItemOrReserveState extends State<TableItemOrReserve> {
211 if (islock && table.signStr != '已预订') { 217 if (islock && table.signStr != '已预订') {
212 return; 218 return;
213 } 219 }
214 - if (widget.fromPage == 'table_manage' && widget.addOrder == false&& table.signStr != '已预订') { 220 + if (widget.fromPage == 'table_manage' &&
  221 + widget.addOrder == false &&
  222 + table.signStr != '已预订') {
215 Utils.showToast('不允许新建过去餐段的订单！'); 223 Utils.showToast('不允许新建过去餐段的订单！');
216 return; 224 return;
217 } 225 }