Commit dc220a6831e8b60c382491e6f3c3f2d896cd293c

Authored by wdn127929
1 parent db8ac2c7

修复客情创建预订guest信息可变更

... ... @@ -14,41 +14,41 @@ if (flutterRoot == null) {
def flutterVersionCode = "100"
if (flutterVersionCode == null) {
flutterVersionCode = '100'
// def flutterVersionCode = "100"
// if (flutterVersionCode == null) {
// flutterVersionCode = '100'
}
// }
def flutterVersionName = "1.0.1"
if (flutterVersionName == null) {
flutterVersionName = '1.0.1'
// def flutterVersionName = "1.0.0"
// if (flutterVersionName == null) {
// flutterVersionName = '1.0.0'
}
// }
// def flutterVersionCode = "501"
// if (flutterVersionCode == null) {
// flutterVersionCode = '501'
def flutterVersionCode = "501"
if (flutterVersionCode == null) {
flutterVersionCode = '501'
// }
}
// def flutterVersionName = "5.0.1"
// if (flutterVersionName == null) {
// flutterVersionName = '5.0.1'
def flutterVersionName = "5.0.1"
if (flutterVersionName == null) {
flutterVersionName = '5.0.1'
// }
}
... ...
... ... @@ -109,7 +109,7 @@ class Guest extends Object {
}
String get sexStr {
if (sex == null || sex == '') return "";
if (sex == null || sex == '' ||sex == '0') return "先生";
switch (sex.toString()) {
case "1": //先生
case "男":
... ...
... ... @@ -1410,7 +1410,7 @@ class MyPageState extends State<MyPage> with WidgetsBindingObserver {
Provider.of<UserModel>(context,
listen: false);
if (usermodel.downLoading) {
Utils.showToast("正在后台下载,请您耐心等待...");
Utils.showToast("正在后台下载新版本…");
return;
}
if (newVersion) {
... ...
... ... @@ -180,6 +180,20 @@ class TableManagerPageState extends State<TableManagerPage> {
///刷新优惠券
_couponNetworkData();
});
if (widget.guest != null) {
for (var item in _baseIndoProvider.sexList) {
item['select'] = false;
if (item['title'] == widget.guest.sexStr) {
item['select'] = true;
sexSelectIndex = int.parse(item['code']) - 1;
sexStr = widget.guest.sexStr;
}
}
_baseIndoProvider.phoneController.text = widget.guest.phone; //预订人电话
nameStr = widget.guest.rname;
// _homeEnterModel.nameController.text = fullName + _nameSuffix();
_addNameSuffix(nameStr, sexStr);
}
});
}
... ... @@ -2407,24 +2421,25 @@ class TableManagerPageState extends State<TableManagerPage> {
null,
null,
null);
if (widget.guest == null) {
guest.phone = _baseIndoProvider
.phoneController.text
.replaceAll(' ', ''); //预订人电话
if (nameStr != null &&
nameStr.trim().length > 0) {
String sex = '1';
if (sexStr == '女士') {
sex = '2';
} else if (sexStr == '公司') {
sex = '3';
}
guest.rname = nameStr; //预订人姓名
guest.sex = sex; //预订人性别:1:男 2:女
// if (widget.guest == null) {
guest.phone = _baseIndoProvider
.phoneController.text
.replaceAll(' ', ''); //预订人电话
if (nameStr != null &&
nameStr.trim().length > 0) {
String sex = '1';
if (sexStr == '女士') {
sex = '2';
} else if (sexStr == '公司') {
sex = '3';
}
guest.rname = nameStr; //预订人姓名
guest.sex = sex; //预订人性别:1:男 2:女
}
// }
String pnum;
if (pnumController.text != '') {
pnum = pnumController.text;
... ... @@ -2441,9 +2456,7 @@ class TableManagerPageState extends State<TableManagerPage> {
cusdem: cusdem,
tempTime:
ddateHm == '选填' ? null : ddateHm,
guest: widget.guest == null
? guest
: widget.guest);
guest: guest);
if (_model != null &&
ObjectUtil.isNotEmpty(_model.row) &&
ObjectUtil.isNotEmpty(_model.row.id)) {
... ...