xt / Flutter-ReserveApp · Commits

Go to a project

Commit 44366af3f0bc50c6f9628e0129995eccf0cc378d

Authored by wdn127929
1 parent ef43b4a8

预订安排页人数变更修改

Inline Side-by-side
Showing 2 changed files with 26 additions and 17 deletions
@@ -137,6 +137,7 @@ class InvicationPageState extends State<InvicationPage> @@ -137,6 +137,7 @@ class InvicationPageState extends State<InvicationPage>
137 String oldPhone; //联系人保存之前的值 137 String oldPhone; //联系人保存之前的值
138 String oldSex; 138 String oldSex;
139 String oldRemark; 139 String oldRemark;
  140 + String oldPum;
140 bool needBack = false; 141 bool needBack = false;
141 bool needBlack = false; 142 bool needBlack = false;
142 bool needHistory = false; 143 bool needHistory = false;
@@ -212,6 +213,8 @@ class InvicationPageState extends State<InvicationPage> @@ -212,6 +213,8 @@ class InvicationPageState extends State<InvicationPage>
212 showOverlay(context); 213 showOverlay(context);
213 setState(() {}); 214 setState(() {});
214 } else { 215 } else {
  216 +
  217 + _addNameSuffix(nameStr, sexStr);
215 if (!needBack && 218 if (!needBack &&
216 !needBlack && 219 !needBlack &&
217 !needHistory && 220 !needHistory &&
@@ -497,6 +500,7 @@ class InvicationPageState extends State<InvicationPage> @@ -497,6 +500,7 @@ class InvicationPageState extends State<InvicationPage>
497 currentRemark = oldRemark ?? ""; 500 currentRemark = oldRemark ?? "";
498 customController.text = oldRemark ?? ""; 501 customController.text = oldRemark ?? "";
499 oldSex = sex; 502 oldSex = sex;
  503 + oldPum = detailModel.detailModelAllSunModel.actualPum;
500 504
501 if (sex != '' && sex != null) { 505 if (sex != '' && sex != null) {
502 if (sex == '1') { 506 if (sex == '1') {
@@ -908,7 +912,7 @@ class InvicationPageState extends State<InvicationPage> @@ -908,7 +912,7 @@ class InvicationPageState extends State<InvicationPage>
908 needSex || 912 needSex ||
909 needHistory || 913 needHistory ||
910 needRemark || 914 needRemark ||
911 - oldRemark != remark) { 915 + oldRemark != remark || oldPum != detailModel.selectNum) {
912 showPhoneHistory = false; 916 showPhoneHistory = false;
913 if (needWechat) { 917 if (needWechat) {
914 needWechat = false; 918 needWechat = false;
@@ -1410,7 +1414,7 @@ class InvicationPageState extends State<InvicationPage> @@ -1410,7 +1414,7 @@ class InvicationPageState extends State<InvicationPage>
1410 if ((nameStr == null || nameStr.trim().length == 0) && 1414 if ((nameStr == null || nameStr.trim().length == 0) &&
1411 _baseIndoProvider.phoneController.text.replaceAll(' ', '').length == 1415 _baseIndoProvider.phoneController.text.replaceAll(' ', '').length ==
1412 0 && 1416 0 &&
1413 - customController.text.trim().length == 0) { 1417 + customController.text.trim().length == 0&&detailModel.selectNum == null) {
1414 return; 1418 return;
1415 } 1419 }
1416 } 1420 }
@@ -1434,6 +1438,7 @@ class InvicationPageState extends State<InvicationPage> @@ -1434,6 +1438,7 @@ class InvicationPageState extends State<InvicationPage>
1434 String name; 1438 String name;
1435 String sex; 1439 String sex;
1436 String remark; 1440 String remark;
  1441 + String actualPum;
1437 if (_baseIndoProvider.phoneController.text.replaceAll(' ', '').length > 0) { 1442 if (_baseIndoProvider.phoneController.text.replaceAll(' ', '').length > 0) {
1438 phone = _baseIndoProvider.phoneController.text.replaceAll(' ', ''); 1443 phone = _baseIndoProvider.phoneController.text.replaceAll(' ', '');
1439 } 1444 }
@@ -1443,9 +1448,12 @@ class InvicationPageState extends State<InvicationPage> @@ -1443,9 +1448,12 @@ class InvicationPageState extends State<InvicationPage>
1443 if (customController.text.trim().length > 0) { 1448 if (customController.text.trim().length > 0) {
1444 remark = customController.text; 1449 remark = customController.text;
1445 } 1450 }
  1451 + if( detailModel.selectNum != null && detailModel.selectNum != ''){
  1452 + actualPum = detailModel.selectNum;
  1453 + }
1446 1454
1447 sex = '${sexList.indexOf(sexStr) + 1}'; 1455 sex = '${sexList.indexOf(sexStr) + 1}';
1448 - bool sucess = await detailModel.upReserveInfo(context, widget.rid, 1456 + bool sucess = await detailModel.upReserveInfo(context, widget.rid,actualPum: actualPum,
1449 name: name, sex: sex, phone: phone, cusdem: remark, needToast: false); 1457 name: name, sex: sex, phone: phone, cusdem: remark, needToast: false);
1450 if (sucess) { 1458 if (sucess) {
1451 reserverPhone = phone; 1459 reserverPhone = phone;
@@ -1453,6 +1461,7 @@ class InvicationPageState extends State<InvicationPage> @@ -1453,6 +1461,7 @@ class InvicationPageState extends State<InvicationPage>
1453 oldName = name; 1461 oldName = name;
1454 oldSex = sex; 1462 oldSex = sex;
1455 oldRemark = remark; 1463 oldRemark = remark;
  1464 + oldPum = actualPum;
1456 1465
1457 EventBus().emit("refresh_tablemanager"); //刷新桌位 1466 EventBus().emit("refresh_tablemanager"); //刷新桌位
1458 bus.emit("refresh_book_list"); //刷新已预订列表 1467 bus.emit("refresh_book_list"); //刷新已预订列表
@@ -2264,19 +2273,19 @@ class InvicationPageState extends State<InvicationPage> @@ -2264,19 +2273,19 @@ class InvicationPageState extends State<InvicationPage>
2264 // selectPnum = value.first; 2273 // selectPnum = value.first;
2265 // pnum = pnumlist[value.first]; 2274 // pnum = pnumlist[value.first];
2266 // }); 2275 // });
2267 - bool sucess = await detailModel  
2268 - .upReserveInfo(context, widget.rid,  
2269 - actualPum: detailModel.selectNum,  
2270 - needToast: false);  
2271 -  
2272 - if (sucess) {  
2273 - EventBus()  
2274 - .emit("refresh_tablemanager"); //刷新桌位  
2275 - bus.emit("refresh_book_list"); //刷新已预订列表  
2276 - bus.emit("refresh_detail");  
2277 - // await _getReserveDetail(  
2278 - // showCicle: false);  
2279 - } 2276 + // bool sucess = await detailModel
  2277 + // .upReserveInfo(context, widget.rid,
  2278 + // actualPum: detailModel.selectNum,
  2279 + // needToast: false);
  2280 +
  2281 + // if (sucess) {
  2282 + // EventBus()
  2283 + // .emit("refresh_tablemanager"); //刷新桌位
  2284 + // bus.emit("refresh_book_list"); //刷新已预订列表
  2285 + // bus.emit("refresh_detail");
  2286 + // // await _getReserveDetail(
  2287 + // // showCicle: false);
  2288 + // }
2280 } 2289 }
2281 }, 2290 },
2282 onEditingComplete: () { 2291 onEditingComplete: () {
@@ -37,7 +37,7 @@ class NotebookDetailModel extends ChangeNotifier { @@ -37,7 +37,7 @@ class NotebookDetailModel extends ChangeNotifier {
37 PageState pageState = PageState.Loading; 37 PageState pageState = PageState.Loading;
38 PageState pageStateChange = PageState.Loading; 38 PageState pageStateChange = PageState.Loading;
39 PageState pageStateSim = PageState.Loading; 39 PageState pageStateSim = PageState.Loading;
40 - 40 +
41 41
42 String selectNum; 42 String selectNum;
43 int selectIndex; 43 int selectIndex;