From 07be710c86030d09d007b0c76c2bba7b809b113e Mon Sep 17 00:00:00 2001 From: zhangmeng <494089941@qq.com> Date: Fri, 30 Apr 2021 10:13:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B4=BE=E5=8D=95=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business_and_fix_detail_page.dart | 4 ++-- .../business_and_fix/business_fix_card.dart | 11 ++++++++--- .../business_and_fix/fix_submit_finish_page.dart | 15 ++++++++++----- .../business_and_fix/fix_work_finish_page.dart | 5 +---- .../business_and_fix/fixer_department_page.dart | 8 +++++--- lib/utils/network/manage_func.dart | 5 ++++- 6 files changed, 30 insertions(+), 18 deletions(-) diff --git a/lib/ui/sub_pages/business_and_fix/business_and_fix_detail_page.dart b/lib/ui/sub_pages/business_and_fix/business_and_fix_detail_page.dart index f112f97..509cb0c 100644 --- a/lib/ui/sub_pages/business_and_fix/business_and_fix_detail_page.dart +++ b/lib/ui/sub_pages/business_and_fix/business_and_fix_detail_page.dart @@ -124,7 +124,7 @@ class _BusinessAndFixDetailPageState extends State { builder: (context) { final userProvider = Provider.of(context, listen: false); - if (userProvider.infoModel.canOperation && widget.model.status < 2) { + if (userProvider.infoModel.canSendTicket && widget.model.status < 2) { return AkuMaterialButton( color: AppStyle.primaryColor, nullColor: AppStyle.minorColor, @@ -143,7 +143,7 @@ class _BusinessAndFixDetailPageState extends State { ), ); } else if (widget.model.status == 2) { - if (userProvider.infoModel.canOperation) { + if (userProvider.infoModel.canSendTicket){ return AkuMaterialButton( color: AppStyle.primaryColor, nullColor: AppStyle.minorColor, diff --git a/lib/ui/sub_pages/business_and_fix/business_fix_card.dart b/lib/ui/sub_pages/business_and_fix/business_fix_card.dart index 0fb2aae..4370c8d 100644 --- a/lib/ui/sub_pages/business_and_fix/business_fix_card.dart +++ b/lib/ui/sub_pages/business_and_fix/business_fix_card.dart @@ -24,7 +24,12 @@ import 'package:aku_community_manager/ui/widgets/inner/aku_chip_box.dart'; class BusinessFixCard extends StatefulWidget { final BussinessAndFixModel model; final bool homeDisplay; - BusinessFixCard({Key key, @required this.model, this.homeDisplay = false}) + final bool canSeeBottomButton; + BusinessFixCard( + {Key key, + @required this.model, + this.homeDisplay = false, + this.canSeeBottomButton = true}) : super(key: key); @override @@ -88,7 +93,7 @@ class _BusinessFixCardState extends State { ), ), Text( - AkuMap.fixStatus(userInfoModel.canOperation, + AkuMap.fixStatus(userInfoModel.canSendTicket, userInfoModel.canPickUpTicket, widget.model.status), style: TextStyle( color: widget.model.status < 4 @@ -113,7 +118,7 @@ class _BusinessFixCardState extends State { ), AkuBox.h(16), _buildImgs(), - _buildBottomCard(), + !widget.canSeeBottomButton ? SizedBox() : _buildBottomCard(), ], ), margin: EdgeInsets.only(top: 16.w), diff --git a/lib/ui/sub_pages/business_and_fix/fix_submit_finish_page.dart b/lib/ui/sub_pages/business_and_fix/fix_submit_finish_page.dart index e5239e0..bd87dc7 100644 --- a/lib/ui/sub_pages/business_and_fix/fix_submit_finish_page.dart +++ b/lib/ui/sub_pages/business_and_fix/fix_submit_finish_page.dart @@ -5,6 +5,7 @@ import 'package:flutter/material.dart'; import 'package:aku_community_manager/const/resource.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:velocity_x/velocity_x.dart'; + class FixSubmitFinishPage extends StatelessWidget { final BussinessAndFixModel model; const FixSubmitFinishPage({Key key, this.model}) : super(key: key); @@ -13,17 +14,21 @@ class FixSubmitFinishPage extends StatelessWidget { Widget build(BuildContext context) { return AkuScaffold( title: '处理完成', - body:Container( - width:double.infinity, + body: Container( + width: double.infinity, child: Column( children: [ - Image.asset(R.ASSETS_MANAGE_SUBMIT_SUCCESS_PNG,width:587.w,height:350.w), + Image.asset(R.ASSETS_MANAGE_SUBMIT_SUCCESS_PNG, + width: 587.w, height: 350.w), '您已处理完成该报修'.text.black.size(40.sp).bold.make(), 120.w.heightBox, - BusinessFixCard(model: this.model), + BusinessFixCard( + model: this.model, + canSeeBottomButton: false, + ), ], ), ), ); } -} \ No newline at end of file +} diff --git a/lib/ui/sub_pages/business_and_fix/fix_work_finish_page.dart b/lib/ui/sub_pages/business_and_fix/fix_work_finish_page.dart index 66322b0..4c707f3 100644 --- a/lib/ui/sub_pages/business_and_fix/fix_work_finish_page.dart +++ b/lib/ui/sub_pages/business_and_fix/fix_work_finish_page.dart @@ -348,15 +348,12 @@ class _FixWorkFinishPageState extends State { TextUtil.isEmpty( _materialPriceController.text)) { return Text('人工费或材料费不能为空'); - } else if (humanPrice == null || - materialPrice == null) - return Text('输入有误'); + } else humanPrice = double.tryParse(_humanController.text); materialPrice = double.tryParse(_materialPriceController.text); - return Text( '¥${(humanPrice + materialPrice).toStringAsFixed(2)}'); }, diff --git a/lib/ui/sub_pages/business_and_fix/fixer_department_page.dart b/lib/ui/sub_pages/business_and_fix/fixer_department_page.dart index 7595a59..6d313d1 100644 --- a/lib/ui/sub_pages/business_and_fix/fixer_department_page.dart +++ b/lib/ui/sub_pages/business_and_fix/fixer_department_page.dart @@ -25,7 +25,8 @@ class FixerDepartmentPage extends StatefulWidget { final DispatchReportModel model; final bool changeType; final int dispatchId; - FixerDepartmentPage({Key key, @required this.model, this.changeType = false, this.dispatchId}) + FixerDepartmentPage( + {Key key, @required this.model, this.changeType = false, this.dispatchId}) : super(key: key); @override @@ -91,8 +92,9 @@ class _FixerDepartmentPageState extends State { BotToast.showText(text: baseModel.message); } } else { - BaseModel baseModel = - await ManageFunc.repairDispatch(_reportModel,widget.dispatchId); + BaseModel baseModel = await ManageFunc.repairDispatch( + _reportModel, + dispatchId: widget.dispatchId); if (baseModel.status) { Get.back(); Get.back(); diff --git a/lib/utils/network/manage_func.dart b/lib/utils/network/manage_func.dart index 8a98f35..58a87c5 100644 --- a/lib/utils/network/manage_func.dart +++ b/lib/utils/network/manage_func.dart @@ -4,6 +4,7 @@ import 'package:aku_community_manager/models/manager/bussiness_and_fix/fixed_det import 'package:aku_community_manager/utils/network/base_model.dart'; import 'package:aku_community_manager/utils/network/net_util.dart'; import 'package:dio/dio.dart'; +import 'package:flutter/material.dart'; class ManageFunc { ///报事报修详情 @@ -39,7 +40,9 @@ class ManageFunc { } ///派单 - static Future repairDispatch(DispatchReportModel model,int dispatchId) async { + static Future repairDispatch(DispatchReportModel model, + {@required int dispatchId}) async { + print(dispatchId); BaseModel baseModel = await NetUtil().post(API.manage.repairDispatch, params: { 'dispatchListId': dispatchId,