xt / Flutter-ReserveApp · Commits

Go to a project

Commit 51f3cd83e1764445ac0a1c4b21dde07dead099bb

Authored by wdn127929
1 parent 22eded60
build: skipped

客情详情---跳转---存酒详情

Inline Side-by-side
Showing 8 changed files with 143 additions and 112 deletions
... ... @@ -286,8 +286,11 @@ class Store extends Object {
@JsonKey(name: 'store_day')
dynamic storeDay;
@JsonKey(name: 'id')
dynamic id;
Store(
this.storeDay,
this.id
);
factory Store.fromJson(Map<String, dynamic> srcJson) =>
... ...
... ... @@ -160,11 +160,13 @@ Map<String, dynamic> _$CountToJson(Count instance) => <String, dynamic>{
Store _$StoreFromJson(Map<String, dynamic> json) {
return Store(
json['store_day'] as dynamic,
json['id'] as dynamic,
);
}
Map<String, dynamic> _$StoreToJson(Store instance) => <String, dynamic>{
'store_day': instance.storeDay,
'id': instance.id,
};
Marketing _$MarketingFromJson(Map<String, dynamic> json) {
... ...
... ... @@ -618,10 +618,9 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> {
isBold: true,
height: w(22),
onPressed: () {
// NavigatorUtil.goMyCustomerOrderPage(
// context,
// customerProvider.guestInfoSunModel.guest.id,
// customerProvider.guestInfoSunModel.guest.phone);
NavigatorUtil.goWineDetailPage(context,
customerProvider.guestInfoSunModel.store.id, true,
onlyShow: true);
},
)
],
... ...
... ... @@ -403,7 +403,9 @@ class _CustomerDetailPageState extends State<CustomerDetailPage> {
MyColours.color_438E93),
if ('${customerProvider.guestInfoSunModel.store.storeDay}' !=
'0')
flatBtn('存酒14天', MyColours.color_438E93)
flatBtn(
'存酒${customerProvider.guestInfoSunModel.store.storeDay}天',
MyColours.color_438E93)
],
),
VEmptyView(20),
... ... @@ -629,10 +631,9 @@ class _CustomerDetailPageState extends State<CustomerDetailPage> {
isBold: true,
height: w(22),
onPressed: () {
// NavigatorUtil.goMyCustomerOrderPage(
// context,
// customerProvider.guestInfoSunModel.guest.id,
// customerProvider.guestInfoSunModel.guest.phone);
NavigatorUtil.goWineDetailPage(context,
customerProvider.guestInfoSunModel.store.id, true,
onlyShow: true);
},
)
],
... ...
... ... @@ -113,16 +113,35 @@ class _CreateStoreWinePageState extends State<CreateStoreWinePage> {
isMember = '会员状态未知';
memberIndex = null;
memberid = null;
nameC.text = '';
sexSelectIndex = 0;
sexStr = '先生';
} else if (temp['is_member'] == '1') {
//会员
isMember = '会员';
memberIndex = 0;
memberid = temp['id'];
nameC.text = temp['rname'] ?? '';
if (temp['sex'] != '' &&
temp['sex'] != null &&
temp['sex'] != '0' &&
temp['sex'] != ' ') {
sexSelectIndex = int.parse(temp['sex']) - 1;
sexStr = sexList[sexSelectIndex];
}
} else {
//非会员
isMember = '非会员';
memberIndex = 1;
memberid = temp['id'];
nameC.text = temp['rname'] ?? '';
if (temp['sex'] != '' &&
temp['sex'] != null &&
temp['sex'] != '0' &&
temp['sex'] != ' ') {
sexSelectIndex = int.parse(temp['sex']) - 1;
sexStr = sexList[sexSelectIndex];
}
}
setState(() {});
}
... ...
... ... @@ -28,7 +28,9 @@ import '../../../widgets/v_empty_view.dart';
class WineDetailPage extends StatefulWidget {
final String idstr;
final bool isStoreWine;
WineDetailPage({Key key, this.idstr, this.isStoreWine}) : super(key: key);
final bool onlyShow;
WineDetailPage({Key key, this.idstr, this.isStoreWine, this.onlyShow = false})
: super(key: key);
@override
_WineDetailPageState createState() => _WineDetailPageState();
... ... @@ -229,15 +231,16 @@ class _WineDetailPageState extends State<WineDetailPage> {
],
),
)),
Container(
alignment: Alignment.centerLeft,
margin: EdgeInsets.only(
left: w(20), right: w(20), top: w(10), bottom: w(16)),
child: Text(
'注：为保障酒品安排，只有存酒管理员才可以进行存酒操作！',
style: TextStyle(
color: MyColours.color_999999, fontSize: font(10)),
)),
if (!widget.onlyShow)
Container(
alignment: Alignment.centerLeft,
margin: EdgeInsets.only(
left: w(20), right: w(20), top: w(10), bottom: w(16)),
child: Text(
'注：为保障酒品安排，只有存酒管理员才可以进行存酒操作！',
style: TextStyle(
color: MyColours.color_999999, fontSize: font(10)),
)),
Container(
color: MyColours.color_ffffff,
padding: EdgeInsets.only(
... ... @@ -248,7 +251,8 @@ class _WineDetailPageState extends State<WineDetailPage> {
),
child: Row(
children: [
RoundButton(
Expanded(
child: RoundButton(
text: '出库记录',
width: w(100),
height: ScreenUtil().setWidth(80),
... ... @@ -278,102 +282,104 @@ class _WineDetailPageState extends State<WineDetailPage> {
// }
// }
},
),
HEmptyView(30),
Expanded(
child: RoundButton(
text: '存酒出库',
// width: w(218),
height: ScreenUtil().setWidth(80),
radius: ScreenUtil().setWidth(10),
isBold: true,
gradientStart: !widget.isStoreWine
? MyColours.color_BFC4D4
: MyColours.color_438E93,
gradientEnd: !widget.isStoreWine
? MyColours.color_BFC4D4
: MyColours.color_438E93,
fontSize: 32,
onPressed: () async {
if (!widget.isStoreWine) {
Utils.showToast('您不是店铺的存酒管理员，无权进行相关操作。');
return false;
}
)),
if (!widget.onlyShow) HEmptyView(30),
if (!widget.onlyShow)
Expanded(
child: RoundButton(
text: '存酒出库',
// width: w(218),
height: ScreenUtil().setWidth(80),
radius: ScreenUtil().setWidth(10),
isBold: true,
gradientStart: !widget.isStoreWine
? MyColours.color_BFC4D4
: MyColours.color_438E93,
gradientEnd: !widget.isStoreWine
? MyColours.color_BFC4D4
: MyColours.color_438E93,
fontSize: 32,
onPressed: () async {
if (!widget.isStoreWine) {
Utils.showToast('您不是店铺的存酒管理员，无权进行相关操作。');
return false;
}
bool can = false;
bool can = false;
outerloop:
for (int i = 0;
i <
outerloop:
for (int i = 0;
i <
storeWineProvider
.wineManageDetail.wineDataMove.length;
i++) {
WineManageSunMoveModel element =
storeWineProvider
.wineManageDetail.wineDataMove.length;
i++) {
WineManageSunMoveModel element = storeWineProvider
.wineManageDetail.wineDataMove[i];
if (double.parse(element.wineStock) > 0) {
can = true;
break outerloop;
}
.wineManageDetail.wineDataMove[i];
if (double.parse(element.wineStock) > 0) {
can = true;
break outerloop;
}
// 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 == '店长') {
// 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 == '店长') {
WineManageModel modelTemp =
WineManageModel.fromJson2(storeWineProvider
.wineManageDetail
.toJson());
modelTemp.wineData = [];
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;
// 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;
}
},
)),
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;
}
},
)),
],
))
],
... ...
... ... @@ -1501,9 +1501,10 @@ class NavigatorUtil {
String idstr,
bool isStoreWine, {
replace = false,
bool onlyShow = false
}) {
return _navigateTo(context,
"${Routes.wine_detail_page}?idstr=$idstr&isStoreWine=${isStoreWine}",
"${Routes.wine_detail_page}?idstr=$idstr&isStoreWine=${isStoreWine}&onlyShow=${onlyShow}",
replace: replace);
}
... ...
... ... @@ -2550,12 +2550,12 @@ var wineDetailPageHandle = new Handler(
String idstr = params["idstr"].first;
bool isStoreWine = FluroConvertUtils.string2bool(params["isStoreWine"].first);
bool onlyShow = FluroConvertUtils.string2bool(params["onlyShow"].first);
return ChangeNotifierProvider<StoreWineProvider>(
create: (_) => StoreWineProvider(),
child: ChangeNotifierProvider<CustomerProvider>(
create: (_) => CustomerProvider(),
child: WineDetailPage(idstr: idstr, isStoreWine: isStoreWine)));
child: WineDetailPage(idstr: idstr, isStoreWine: isStoreWine,onlyShow:onlyShow)));
});
///我的----存酒记录
... ...