xt / Flutter-ReserveApp · Commits

Go to a project

Commit 94a0e8a79e0c2ab62ea5b2d9f6c78f5035baf547

Authored by wdn127929
1 parent 8eede887
build: skipped

客户存酒ok

Inline Side-by-side
Showing 10 changed files with 195 additions and 81 deletions
... ... @@ -157,25 +157,32 @@ class WineManageSunModel {
TextEditingController wineNumC = TextEditingController(); //存酒数量
TextEditingController wineUnitC = TextEditingController(); //计量单位
TextEditingController wineSerialC = TextEditingController(); //存酒编号
String wineStock;
String cdate;
// List<String> imageData = [
// 'https://www.ssfiction.com/wp-content/uploads/2020/08/20200805_5f2b1669e9a24.jpg',
// 'https://www.ssfiction.com/wp-content/uploads/2020/08/20200805_5f2b1669e9a24.jpg'
// ];
WineManageSunModel({
this.wineName,
this.wineAmount,
this.unit,
this.wineNumber,
this.img,
});
WineManageSunModel(
{this.wineName,
this.wineAmount,
this.unit,
this.wineNumber,
this.img,
this.wineStock,
this.cdate});
WineManageSunModel.fromJson(Map<String, dynamic> json) {
wineName = json['wine_name'];
wineAmount = json['wine_amount'];
unit = json['unit'];
wineNumber = json['wine_number'] ?? "";
wineStock = json['wine_stock'] ?? "";
cdate = json['cdate'] ?? "";
img = <UploadImgModel>[];
if (json['img'] != null) {
img = <UploadImgModel>[];
... ... @@ -204,6 +211,8 @@ class WineManageSunModel {
data['unit'] = this.unit;
data['wine_number'] = this.wineNumber;
data['img'] = this.img;
data['wine_stock'] = this.wineStock;
data['cdate'] = this.cdate;
return data;
}
... ... @@ -216,6 +225,8 @@ class WineManageSunMoveModel {
String wineNumber;
List<String> img;
String checkAmount;
String wineStock;
String cdate;
// TextEditingController wineNameC = TextEditingController(); //酒品名称
TextEditingController wineNumC = TextEditingController(); //存酒数量
// TextEditingController wineUnitC = TextEditingController(); //计量单位
... ... @@ -226,14 +237,15 @@ class WineManageSunMoveModel {
// 'https://www.ssfiction.com/wp-content/uploads/2020/08/20200805_5f2b1669e9a24.jpg'
// ];
WineManageSunMoveModel({
this.wineName,
this.wineAmount,
this.unit,
this.wineNumber,
this.checkAmount,
this.img,
});
WineManageSunMoveModel(
{this.wineName,
this.wineAmount,
this.unit,
this.wineNumber,
this.checkAmount,
this.img,
this.wineStock,
this.cdate});
WineManageSunMoveModel.fromJson(Map<String, dynamic> json) {
wineName = json['wine_name'];
... ... @@ -242,6 +254,8 @@ class WineManageSunMoveModel {
unit = json['unit'];
wineNumber = json['wine_number'] ?? "";
checkAmount = json['check_amount'] ?? '';
wineStock = json['wine_stock'] ?? "";
cdate = json['cdate'] ?? "";
// wineNumC.text = wineNumber;
... ... @@ -267,6 +281,9 @@ class WineManageSunMoveModel {
data['wine_number'] = this.wineNumber;
data['check_amount'] = this.checkAmount;
data['img'] = this.img;
data['wine_stock'] = this.wineStock;
data['cdate'] = this.cdate;
return data;
}
}
... ...
... ... @@ -775,10 +775,12 @@ class _MarkingInteractionPageState extends State<MarkingInteractionPage> {
//接口
Map marketingData = {
'is_transpond': is_transpond ? '1' : '0',
'is_arrival': is_arrival ? '1' : '0',
'is_online_book': is_online_book ? '1' : '0',
'is_order': is_order ? '1' : '0',
'is_transpond': is_transpond ? '1' : '0', //转发同行客人
'is_arrival': is_arrival ? '1' : '0', //确认到店
'is_online_book': is_online_book ? '1' : '0', //在线预订
'is_order': is_order ? '1' : '0', //去点餐
'is_coupon': '0', //代金券暂时
'is_recharge': '0', //充值券暂时
'is_link': is_link ? '1' : '0',
'wecomle': welcomeTextC.text,
'logo': _uploadImageProvider.firstImage.qiniuUrl,
... ...
... ... @@ -119,8 +119,9 @@ class _ApplyOutStoreItemPageState extends State<ApplyOutStoreItemPage> {
return;
}
widget.wineManageSunModel.checkAmount = value;
controller.text = value;
// controller.text = value;
}
// if (value.trim().isEmpty || value.trim().length > 11) {
// //内容为空，或 超过11位
... ...
... ... @@ -39,8 +39,8 @@ class _ApplyOutStorePageState extends State<ApplyOutStorePage> {
super.initState();
widget.wineManageDetail.wineDataMove.forEach((element) {
element.wineNumC.text = element.wineAmount; //出库数量初始化剩余库存量
element.checkAmount = element.wineAmount; //出库数量初始化剩余库存量
element.wineNumC.text = element.wineStock; //出库数量初始化剩余库存量
element.checkAmount = element.wineStock; //出库数量初始化剩余库存量
});
}
... ...
import 'dart:convert';
import 'package:common_utils/common_utils.dart';
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:one_key/pages/my/store_wine_manage/create_wine_item_page.dart';
... ... @@ -469,6 +470,8 @@ class _CreateStoreWinePageState extends State<CreateStoreWinePage> {
}
}
if (can) {
String cdate = DateUtil.formatDate(DateTime.now(),
format: DateFormats.full);
List<Map<String, String>> data = [];
dataWine.forEach((element) {
List<String> images = [];
... ... @@ -480,6 +483,8 @@ class _CreateStoreWinePageState extends State<CreateStoreWinePage> {
'wine_amount': element.wineNumC.text,
'unit': element.wineUnitC.text,
'wine_number': element.wineSerialC.text,
'wine_stock': element.wineNumC.text,
'cdate': cdate,
'img':
images.length == 0 ? null : json.encode(images),
};
... ... @@ -495,7 +500,7 @@ class _CreateStoreWinePageState extends State<CreateStoreWinePage> {
.openid,
'rname': nameC.text,
'sex': '${sexSelectIndex + 1}', //性别 1 男 2 女 3 公司
'is_member': '1', //会员状态
'is_member': null, //会员状态
'phone': phoneC.text,
'wine': json.encode(data)
};
... ...
... ... @@ -254,20 +254,61 @@ class _SmsCodeInputPageState extends State<SmsCodeInputPage> {
bool success = await storeWineProvider
.setStoreWineBySellerCheck(context, pramas,
showLoading: true);
if (success) {
//
Navigator.pop(context);
Navigator.pop(context);
Navigator.pop(context);
//刷新首页数据
bus.emit('refresh_wine_home_list',{
'index':1
List<Map<String, String>> data = [];
widget.wineManageDetail.wineDataMove.forEach((element) {
int wineStock = int.parse(element.wineAmount) -
int.parse(element.checkAmount);
Map<String, String> map = {
'wine_name': element.wineName, //酒名称
'wine_amount': element.wineAmount, //初始存酒量
'unit': element.unit, //单位
'wine_number': element.wineNumber, //存酒编号
'wine_stock': wineStock.toString(), //剩余库存,
'cdate': element.cdate,
'img': element.img == null || element.img.length == 0
? null
: json.encode(element.img),
};
data.add(map);
});
DialogUtil.cupertinoAlertDialogOnly(context,
content:
'客户${widget.wineManageDetail.rname + widget.wineManageDetail.sexStr}的酒品已经出库。\n您可以在存酒管理-出库记录中查看详细信息。',
rTitle: '我知道了');
Map<String, String> pramasreresh = {
'id': widget.wineManageDetail.id,
'sid': Provider.of<UserModel>(context, listen: false)
.user
.sellerid,
'uid': Provider.of<UserModel>(context, listen: false)
.user
.openid,
'rname': widget.wineManageDetail.rname,
'sex': widget.wineManageDetail.sex, //性别 1 男 2 女 3 公司
'is_member': widget.wineManageDetail.isMember, //会员状态
'phone': widget.wineManageDetail.phone,
'wine': json.encode(data)
};
// if (widget.id != null) {
//修改存酒信息
// pramas['id'] = widget.id;
// }
bool succesReresh = await storeWineProvider
.setStoreWineBySeller(context, pramasreresh,
showLoading: true);
if (succesReresh) {
//刷新库存数量成功
//
Navigator.pop(context);
Navigator.pop(context);
Navigator.pop(context);
//刷新首页数据
bus.emit('refresh_wine_home_list', {'index': 1});
DialogUtil.cupertinoAlertDialogOnly(context,
content:
'客户${widget.wineManageDetail.rname + widget.wineManageDetail.sexStr}的酒品已经出库。\n您可以在存酒管理-出库记录中查看详细信息。',
rTitle: '我知道了');
}
}
},
))
... ...
... ... @@ -156,12 +156,14 @@ class _WineDetailItemPageState extends State<WineDetailItemPage> {
widget.wineManageSunModel.wineName,
),
VEmptyView(16),
_textWidget('存酒数量', widget.wineManageSunModel.wineAmount),
_textWidget('剩余数量', widget.wineManageSunModel.wineStock),
VEmptyView(16),
_textWidget('计量单位', widget.wineManageSunModel.unit),
VEmptyView(16),
_textWidget('存酒编号', widget.wineManageSunModel.wineNumber),
VEmptyView(16),
_textWidget('存酒日期', widget.wineManageSunModel.cdate),
VEmptyView(16),
images.length > 0 ? _getGridImg(context, images) : SizedBox(),
images.length > 0 ? VEmptyView(16) : SizedBox(),
],
... ...
... ... @@ -278,49 +278,78 @@ class _WineDetailPageState extends State<WineDetailPage> {
return false;
}
// UserModel userModel =
// Provider.of<UserModel>(context, listen: false);
// if (userModel.user.role_name == '管理员' ||
// userModel.user.role_name == '店长') {
bool can = false;
WineManageModel modelTemp =
WineManageModel.fromJson2(storeWineProvider
.wineManageDetail
.toJson());
modelTemp.wineData = [];
outerloop:
for (int i = 0;
i <
storeWineProvider
.wineManageDetail.wineDataMove.length;
i++) {
WineManageSunMoveModel element = storeWineProvider
.wineManageDetail.wineDataMove[i];
if (int.parse(element.wineStock) > 0) {
can = true;
break outerloop;
}
// modelTemp.cdate =
// storeWineProvider.wineManageDetail.cdate;
// modelTemp.id =
// storeWineProvider.wineManageDetail.id;
// modelTemp.isMember =
// storeWineProvider.wineManageDetail.isMember;
// modelTemp.nickName =
// storeWineProvider.wineManageDetail.nickName;
// modelTemp.phone =
// storeWineProvider.wineManageDetail.phone;
// modelTemp.rname =
// storeWineProvider.wineManageDetail.rname;
// modelTemp.sex =
// storeWineProvider.wineManageDetail.sex;
// modelTemp.sexStr =
// storeWineProvider.wineManageDetail.sexStr;
// innerloop:
// for (UploadImgModel item in element.img) {
// if (item.process < 1) {
// Utils.showToast('正在上传图片，请稍等');
// // return false;
// can = false;
// break outerloop;
// }
// }
}
if (can) {
// UserModel userModel =
// Provider.of<UserModel>(context, listen: false);
// if (userModel.user.role_name == '管理员' ||
// userModel.user.role_name == '店长') {
NavigatorUtil.goApplyOutStorePage(
context,
modelTemp,
);
// } else {
// bool needRefresh =
// await NavigatorUtil.goCouponEditPage(context);
// print(needRefresh);
// if (needRefresh != null && needRefresh) {
// bus.emit('refresh_coupon_list_f');
// //刷新页面数据
// // _controller.callRefresh();
// // _couponNetworkData(tabController.index);
// }
// }
WineManageModel modelTemp =
WineManageModel.fromJson2(storeWineProvider
.wineManageDetail
.toJson());
modelTemp.wineData = [];
// modelTemp.cdate =
// storeWineProvider.wineManageDetail.cdate;
// modelTemp.id =
// storeWineProvider.wineManageDetail.id;
// modelTemp.isMember =
// storeWineProvider.wineManageDetail.isMember;
// modelTemp.nickName =
// storeWineProvider.wineManageDetail.nickName;
// modelTemp.phone =
// storeWineProvider.wineManageDetail.phone;
// modelTemp.rname =
// storeWineProvider.wineManageDetail.rname;
// modelTemp.sex =
// storeWineProvider.wineManageDetail.sex;
// modelTemp.sexStr =
// storeWineProvider.wineManageDetail.sexStr;
NavigatorUtil.goApplyOutStorePage(
context,
modelTemp,
);
// } else {
// bool needRefresh =
// await NavigatorUtil.goCouponEditPage(context);
// print(needRefresh);
// if (needRefresh != null && needRefresh) {
// bus.emit('refresh_coupon_list_f');
// //刷新页面数据
// // _controller.callRefresh();
// // _couponNetworkData(tabController.index);
// }
} else {
Utils.showToast('已全部取出!');
return false;
}
},
)),
],
... ...
... ... @@ -123,7 +123,7 @@ class _WineInStoreItemState extends State<WineInStoreItem> {
Container(
// width: ScreenUtil().setWidth(60 * 2),
child: Text(
'${wineManageSunModel.wineAmount}${wineManageSunModel.unit}',
'${wineManageSunModel.wineStock}${wineManageSunModel.unit}',
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
... ...
... ... @@ -88,17 +88,34 @@ class StoreWineProvider with ChangeNotifier {
data: params, showLoading: showLoading)
.catchError((error) {
print(error.toString());
Utils.showToast('新建存酒失败,请重试');
if (params['id'] != null) {
Utils.showToast('修改存酒失败,请重试');
} else {
Utils.showToast('新建存酒失败,请重试');
}
return false;
});
if (baseResp.code == Constant.status_success) {
if (baseResp.data is Map && baseResp.data['id'] is String) {
return true;
if (params['id'] != null) {
//修改存酒信息
if (baseResp.data == 1 || baseResp.data == 0) {
return true;
} else {
Utils.showToast('修改存酒失败,请重试');
}
} else {
Utils.showToast('新建存酒失败,请重试');
if (baseResp.data is Map && baseResp.data['id'] is String) {
return true;
} else {
Utils.showToast('新建存酒失败,请重试');
}
}
} else {
Utils.showToast(baseResp.msg ?? '新建存酒失败,请重试');
if (params['id'] != null) {
Utils.showToast(baseResp.msg ?? '修改存酒失败,请重试');
} else {
Utils.showToast(baseResp.msg ?? '新建存酒失败,请重试');
}
}
return false;
}
... ...