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 { @@ -286,8 +286,11 @@ class Store extends Object {
286 @JsonKey(name: 'store_day') 286 @JsonKey(name: 'store_day')
287 dynamic storeDay; 287 dynamic storeDay;
288 288
  289 + @JsonKey(name: 'id')
  290 + dynamic id;
289 Store( 291 Store(
290 this.storeDay, 292 this.storeDay,
  293 + this.id
291 ); 294 );
292 295
293 factory Store.fromJson(Map<String, dynamic> srcJson) => 296 factory Store.fromJson(Map<String, dynamic> srcJson) =>
@@ -160,11 +160,13 @@ Map<String, dynamic> _$CountToJson(Count instance) => <String, dynamic>{ @@ -160,11 +160,13 @@ Map<String, dynamic> _$CountToJson(Count instance) => <String, dynamic>{
160 Store _$StoreFromJson(Map<String, dynamic> json) { 160 Store _$StoreFromJson(Map<String, dynamic> json) {
161 return Store( 161 return Store(
162 json['store_day'] as dynamic, 162 json['store_day'] as dynamic,
  163 + json['id'] as dynamic,
163 ); 164 );
164 } 165 }
165 166
166 Map<String, dynamic> _$StoreToJson(Store instance) => <String, dynamic>{ 167 Map<String, dynamic> _$StoreToJson(Store instance) => <String, dynamic>{
167 'store_day': instance.storeDay, 168 'store_day': instance.storeDay,
  169 + 'id': instance.id,
168 }; 170 };
169 171
170 Marketing _$MarketingFromJson(Map<String, dynamic> json) { 172 Marketing _$MarketingFromJson(Map<String, dynamic> json) {
@@ -618,10 +618,9 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> { @@ -618,10 +618,9 @@ class _MyCustomerDetailPageState extends State<MyCustomerDetailPage> {
618 isBold: true, 618 isBold: true,
619 height: w(22), 619 height: w(22),
620 onPressed: () { 620 onPressed: () {
621 - // NavigatorUtil.goMyCustomerOrderPage(  
622 - // context,  
623 - // customerProvider.guestInfoSunModel.guest.id,  
624 - // customerProvider.guestInfoSunModel.guest.phone); 621 + NavigatorUtil.goWineDetailPage(context,
  622 + customerProvider.guestInfoSunModel.store.id, true,
  623 + onlyShow: true);
625 }, 624 },
626 ) 625 )
627 ], 626 ],
@@ -403,7 +403,9 @@ class _CustomerDetailPageState extends State<CustomerDetailPage> { @@ -403,7 +403,9 @@ class _CustomerDetailPageState extends State<CustomerDetailPage> {
403 MyColours.color_438E93), 403 MyColours.color_438E93),
404 if ('${customerProvider.guestInfoSunModel.store.storeDay}' != 404 if ('${customerProvider.guestInfoSunModel.store.storeDay}' !=
405 '0') 405 '0')
406 - flatBtn('存酒14天', MyColours.color_438E93) 406 + flatBtn(
  407 + '存酒${customerProvider.guestInfoSunModel.store.storeDay}天',
  408 + MyColours.color_438E93)
407 ], 409 ],
408 ), 410 ),
409 VEmptyView(20), 411 VEmptyView(20),
@@ -629,10 +631,9 @@ class _CustomerDetailPageState extends State<CustomerDetailPage> { @@ -629,10 +631,9 @@ class _CustomerDetailPageState extends State<CustomerDetailPage> {
629 isBold: true, 631 isBold: true,
630 height: w(22), 632 height: w(22),
631 onPressed: () { 633 onPressed: () {
632 - // NavigatorUtil.goMyCustomerOrderPage(  
633 - // context,  
634 - // customerProvider.guestInfoSunModel.guest.id,  
635 - // customerProvider.guestInfoSunModel.guest.phone); 634 + NavigatorUtil.goWineDetailPage(context,
  635 + customerProvider.guestInfoSunModel.store.id, true,
  636 + onlyShow: true);
636 }, 637 },
637 ) 638 )
638 ], 639 ],
@@ -113,16 +113,35 @@ class _CreateStoreWinePageState extends State<CreateStoreWinePage> { @@ -113,16 +113,35 @@ class _CreateStoreWinePageState extends State<CreateStoreWinePage> {
113 isMember = '会员状态未知'; 113 isMember = '会员状态未知';
114 memberIndex = null; 114 memberIndex = null;
115 memberid = null; 115 memberid = null;
  116 + nameC.text = '';
  117 + sexSelectIndex = 0;
  118 + sexStr = '先生';
116 } else if (temp['is_member'] == '1') { 119 } else if (temp['is_member'] == '1') {
117 //会员 120 //会员
118 isMember = '会员'; 121 isMember = '会员';
119 memberIndex = 0; 122 memberIndex = 0;
120 memberid = temp['id']; 123 memberid = temp['id'];
  124 + nameC.text = temp['rname'] ?? '';
  125 + if (temp['sex'] != '' &&
  126 + temp['sex'] != null &&
  127 + temp['sex'] != '0' &&
  128 + temp['sex'] != ' ') {
  129 + sexSelectIndex = int.parse(temp['sex']) - 1;
  130 + sexStr = sexList[sexSelectIndex];
  131 + }
121 } else { 132 } else {
122 //非会员 133 //非会员
123 isMember = '非会员'; 134 isMember = '非会员';
124 memberIndex = 1; 135 memberIndex = 1;
125 memberid = temp['id']; 136 memberid = temp['id'];
  137 + nameC.text = temp['rname'] ?? '';
  138 + if (temp['sex'] != '' &&
  139 + temp['sex'] != null &&
  140 + temp['sex'] != '0' &&
  141 + temp['sex'] != ' ') {
  142 + sexSelectIndex = int.parse(temp['sex']) - 1;
  143 + sexStr = sexList[sexSelectIndex];
  144 + }
126 } 145 }
127 setState(() {}); 146 setState(() {});
128 } 147 }
@@ -28,7 +28,9 @@ import '../../../widgets/v_empty_view.dart'; @@ -28,7 +28,9 @@ import '../../../widgets/v_empty_view.dart';
28 class WineDetailPage extends StatefulWidget { 28 class WineDetailPage extends StatefulWidget {
29 final String idstr; 29 final String idstr;
30 final bool isStoreWine; 30 final bool isStoreWine;
31 - WineDetailPage({Key key, this.idstr, this.isStoreWine}) : super(key: key); 31 + final bool onlyShow;
  32 + WineDetailPage({Key key, this.idstr, this.isStoreWine, this.onlyShow = false})
  33 + : super(key: key);
32 34
33 @override 35 @override
34 _WineDetailPageState createState() => _WineDetailPageState(); 36 _WineDetailPageState createState() => _WineDetailPageState();
@@ -229,15 +231,16 @@ class _WineDetailPageState extends State<WineDetailPage> { @@ -229,15 +231,16 @@ class _WineDetailPageState extends State<WineDetailPage> {
229 ], 231 ],
230 ), 232 ),
231 )), 233 )),
232 - Container(  
233 - alignment: Alignment.centerLeft,  
234 - margin: EdgeInsets.only(  
235 - left: w(20), right: w(20), top: w(10), bottom: w(16)),  
236 - child: Text(  
237 - '注：为保障酒品安排，只有存酒管理员才可以进行存酒操作！',  
238 - style: TextStyle(  
239 - color: MyColours.color_999999, fontSize: font(10)),  
240 - )), 234 + if (!widget.onlyShow)
  235 + Container(
  236 + alignment: Alignment.centerLeft,
  237 + margin: EdgeInsets.only(
  238 + left: w(20), right: w(20), top: w(10), bottom: w(16)),
  239 + child: Text(
  240 + '注：为保障酒品安排，只有存酒管理员才可以进行存酒操作！',
  241 + style: TextStyle(
  242 + color: MyColours.color_999999, fontSize: font(10)),
  243 + )),
241 Container( 244 Container(
242 color: MyColours.color_ffffff, 245 color: MyColours.color_ffffff,
243 padding: EdgeInsets.only( 246 padding: EdgeInsets.only(
@@ -248,7 +251,8 @@ class _WineDetailPageState extends State<WineDetailPage> { @@ -248,7 +251,8 @@ class _WineDetailPageState extends State<WineDetailPage> {
248 ), 251 ),
249 child: Row( 252 child: Row(
250 children: [ 253 children: [
251 - RoundButton( 254 + Expanded(
  255 + child: RoundButton(
252 text: '出库记录', 256 text: '出库记录',
253 width: w(100), 257 width: w(100),
254 height: ScreenUtil().setWidth(80), 258 height: ScreenUtil().setWidth(80),
@@ -278,102 +282,104 @@ class _WineDetailPageState extends State<WineDetailPage> { @@ -278,102 +282,104 @@ class _WineDetailPageState extends State<WineDetailPage> {
278 // } 282 // }
279 // } 283 // }
280 }, 284 },
281 - ),  
282 - HEmptyView(30),  
283 - Expanded(  
284 - child: RoundButton(  
285 - text: '存酒出库',  
286 - // width: w(218),  
287 - height: ScreenUtil().setWidth(80),  
288 - radius: ScreenUtil().setWidth(10),  
289 - isBold: true,  
290 - gradientStart: !widget.isStoreWine  
291 - ? MyColours.color_BFC4D4  
292 - : MyColours.color_438E93,  
293 - gradientEnd: !widget.isStoreWine  
294 - ? MyColours.color_BFC4D4  
295 - : MyColours.color_438E93,  
296 - fontSize: 32,  
297 - onPressed: () async {  
298 - if (!widget.isStoreWine) {  
299 - Utils.showToast('您不是店铺的存酒管理员，无权进行相关操作。');  
300 - return false;  
301 - } 285 + )),
  286 + if (!widget.onlyShow) HEmptyView(30),
  287 + if (!widget.onlyShow)
  288 + Expanded(
  289 + child: RoundButton(
  290 + text: '存酒出库',
  291 + // width: w(218),
  292 + height: ScreenUtil().setWidth(80),
  293 + radius: ScreenUtil().setWidth(10),
  294 + isBold: true,
  295 + gradientStart: !widget.isStoreWine
  296 + ? MyColours.color_BFC4D4
  297 + : MyColours.color_438E93,
  298 + gradientEnd: !widget.isStoreWine
  299 + ? MyColours.color_BFC4D4
  300 + : MyColours.color_438E93,
  301 + fontSize: 32,
  302 + onPressed: () async {
  303 + if (!widget.isStoreWine) {
  304 + Utils.showToast('您不是店铺的存酒管理员，无权进行相关操作。');
  305 + return false;
  306 + }
302 307
303 - bool can = false; 308 + bool can = false;
304 309
305 - outerloop:  
306 - for (int i = 0;  
307 - i < 310 + outerloop:
  311 + for (int i = 0;
  312 + i <
  313 + storeWineProvider
  314 + .wineManageDetail.wineDataMove.length;
  315 + i++) {
  316 + WineManageSunMoveModel element =
308 storeWineProvider 317 storeWineProvider
309 - .wineManageDetail.wineDataMove.length;  
310 - i++) {  
311 - WineManageSunMoveModel element = storeWineProvider  
312 - .wineManageDetail.wineDataMove[i];  
313 - if (double.parse(element.wineStock) > 0) {  
314 - can = true;  
315 - break outerloop;  
316 - } 318 + .wineManageDetail.wineDataMove[i];
  319 + if (double.parse(element.wineStock) > 0) {
  320 + can = true;
  321 + break outerloop;
  322 + }
317 323
318 - // innerloop:  
319 - // for (UploadImgModel item in element.img) {  
320 - // if (item.process < 1) {  
321 - // Utils.showToast('正在上传图片，请稍等');  
322 - // // return false;  
323 - // can = false;  
324 - // break outerloop;  
325 - // }  
326 - // }  
327 - }  
328 - if (can) {  
329 - // UserModel userModel =  
330 - // Provider.of<UserModel>(context, listen: false);  
331 - // if (userModel.user.role_name == '管理员' ||  
332 - // userModel.user.role_name == '店长') { 324 + // innerloop:
  325 + // for (UploadImgModel item in element.img) {
  326 + // if (item.process < 1) {
  327 + // Utils.showToast('正在上传图片，请稍等');
  328 + // // return false;
  329 + // can = false;
  330 + // break outerloop;
  331 + // }
  332 + // }
  333 + }
  334 + if (can) {
  335 + // UserModel userModel =
  336 + // Provider.of<UserModel>(context, listen: false);
  337 + // if (userModel.user.role_name == '管理员' ||
  338 + // userModel.user.role_name == '店长') {
333 339
334 - WineManageModel modelTemp =  
335 - WineManageModel.fromJson2(storeWineProvider  
336 - .wineManageDetail  
337 - .toJson());  
338 - modelTemp.wineData = []; 340 + WineManageModel modelTemp =
  341 + WineManageModel.fromJson2(storeWineProvider
  342 + .wineManageDetail
  343 + .toJson());
  344 + modelTemp.wineData = [];
339 345
340 - // modelTemp.cdate =  
341 - // storeWineProvider.wineManageDetail.cdate;  
342 - // modelTemp.id =  
343 - // storeWineProvider.wineManageDetail.id;  
344 - // modelTemp.isMember =  
345 - // storeWineProvider.wineManageDetail.isMember;  
346 - // modelTemp.nickName =  
347 - // storeWineProvider.wineManageDetail.nickName;  
348 - // modelTemp.phone =  
349 - // storeWineProvider.wineManageDetail.phone;  
350 - // modelTemp.rname =  
351 - // storeWineProvider.wineManageDetail.rname;  
352 - // modelTemp.sex =  
353 - // storeWineProvider.wineManageDetail.sex;  
354 - // modelTemp.sexStr =  
355 - // storeWineProvider.wineManageDetail.sexStr; 346 + // modelTemp.cdate =
  347 + // storeWineProvider.wineManageDetail.cdate;
  348 + // modelTemp.id =
  349 + // storeWineProvider.wineManageDetail.id;
  350 + // modelTemp.isMember =
  351 + // storeWineProvider.wineManageDetail.isMember;
  352 + // modelTemp.nickName =
  353 + // storeWineProvider.wineManageDetail.nickName;
  354 + // modelTemp.phone =
  355 + // storeWineProvider.wineManageDetail.phone;
  356 + // modelTemp.rname =
  357 + // storeWineProvider.wineManageDetail.rname;
  358 + // modelTemp.sex =
  359 + // storeWineProvider.wineManageDetail.sex;
  360 + // modelTemp.sexStr =
  361 + // storeWineProvider.wineManageDetail.sexStr;
356 362
357 - NavigatorUtil.goApplyOutStorePage(  
358 - context,  
359 - modelTemp,  
360 - );  
361 - // } else {  
362 - // bool needRefresh =  
363 - // await NavigatorUtil.goCouponEditPage(context);  
364 - // print(needRefresh);  
365 - // if (needRefresh != null && needRefresh) {  
366 - // bus.emit('refresh_coupon_list_f');  
367 - // //刷新页面数据  
368 - // // _controller.callRefresh();  
369 - // // _couponNetworkData(tabController.index);  
370 - // }  
371 - } else {  
372 - Utils.showToast('已全部取出!');  
373 - return false;  
374 - }  
375 - },  
376 - )), 363 + NavigatorUtil.goApplyOutStorePage(
  364 + context,
  365 + modelTemp,
  366 + );
  367 + // } else {
  368 + // bool needRefresh =
  369 + // await NavigatorUtil.goCouponEditPage(context);
  370 + // print(needRefresh);
  371 + // if (needRefresh != null && needRefresh) {
  372 + // bus.emit('refresh_coupon_list_f');
  373 + // //刷新页面数据
  374 + // // _controller.callRefresh();
  375 + // // _couponNetworkData(tabController.index);
  376 + // }
  377 + } else {
  378 + Utils.showToast('已全部取出!');
  379 + return false;
  380 + }
  381 + },
  382 + )),
377 ], 383 ],
378 )) 384 ))
379 ], 385 ],
@@ -1501,9 +1501,10 @@ class NavigatorUtil { @@ -1501,9 +1501,10 @@ class NavigatorUtil {
1501 String idstr, 1501 String idstr,
1502 bool isStoreWine, { 1502 bool isStoreWine, {
1503 replace = false, 1503 replace = false,
  1504 + bool onlyShow = false
1504 }) { 1505 }) {
1505 return _navigateTo(context, 1506 return _navigateTo(context,
1506 - "${Routes.wine_detail_page}?idstr=$idstr&isStoreWine=${isStoreWine}", 1507 + "${Routes.wine_detail_page}?idstr=$idstr&isStoreWine=${isStoreWine}&onlyShow=${onlyShow}",
1507 replace: replace); 1508 replace: replace);
1508 } 1509 }
1509 1510
@@ -2550,12 +2550,12 @@ var wineDetailPageHandle = new Handler( @@ -2550,12 +2550,12 @@ var wineDetailPageHandle = new Handler(
2550 String idstr = params["idstr"].first; 2550 String idstr = params["idstr"].first;
2551 2551
2552 bool isStoreWine = FluroConvertUtils.string2bool(params["isStoreWine"].first); 2552 bool isStoreWine = FluroConvertUtils.string2bool(params["isStoreWine"].first);
2553 - 2553 + bool onlyShow = FluroConvertUtils.string2bool(params["onlyShow"].first);
2554 return ChangeNotifierProvider<StoreWineProvider>( 2554 return ChangeNotifierProvider<StoreWineProvider>(
2555 create: (_) => StoreWineProvider(), 2555 create: (_) => StoreWineProvider(),
2556 child: ChangeNotifierProvider<CustomerProvider>( 2556 child: ChangeNotifierProvider<CustomerProvider>(
2557 create: (_) => CustomerProvider(), 2557 create: (_) => CustomerProvider(),
2558 - child: WineDetailPage(idstr: idstr, isStoreWine: isStoreWine))); 2558 + child: WineDetailPage(idstr: idstr, isStoreWine: isStoreWine,onlyShow:onlyShow)));
2559 }); 2559 });
2560 2560
2561 ///我的----存酒记录 2561 ///我的----存酒记录