1281228557
/
aku_new_community_manager
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改装修管理详情

Browse Source
hmxc
张萌 4 years ago
parent f3b56566c9
commit 45baef9cb5
6 changed files with 65 additions and 73 deletions
Show Stats Download Patch File Download Diff File

2
lib/mock_models/all_model.dart
Unescape View File

@ -9,7 +9,7 @@ import 'package:aku_community_manager/mock_models/decoration/decoration_data.dar
import 'package:aku_community_manager/mock_models/decoration/decoration_model.dart';
import 'package:aku_community_manager/mock_models/fix/fix_model.dart';
import 'package:aku_community_manager/provider/fix_provider.dart';
@Deprecated('this mock model should be removed')
class AllModel {
BuildContext context;
AllModel(this.context);

2
lib/mock_models/decoration/decoration_data.dart
Unescape View File

@ -1,7 +1,7 @@
// Project imports:
import 'package:aku_community_manager/mock_models/decoration/decoration_model.dart';
import 'package:aku_community_manager/mock_models/fix/fixer_model.dart';
@Deprecated('this should be removed')
class DecorationData {
static List<DecorationModel> allModels = [
DecorationModel(

14
lib/mock_models/decoration/decoration_model.dart
Unescape View File

@ -52,7 +52,7 @@ Map<CHECK_TYPE, String> checkAssetMap = {
CHECK_TYPE.DOOR_AND_WINDOWS: R.ASSETS_MANAGE_WINDOW_PNG,
CHECK_TYPE.SECURITY: R.ASSETS_MANAGE_SECURITY_PNG,
};
@Deprecated('under should be removed')
class DecorationModel {
DecorationType type;
DecorationStatusType statusType;
@ -81,7 +81,7 @@ class DecorationModel {
this.checkInfomations,
});
}
@Deprecated('under should be removed')
///用户家庭信息
class UserHomeModel {
String plot;
@ -95,7 +95,7 @@ class UserHomeModel {
this.phone,
});
}
@Deprecated('under should be removed')
///装修队伍信息
class DecorationTeamModel {
String name;
@ -107,7 +107,7 @@ class DecorationTeamModel {
this.phone,
});
}
@Deprecated('under should be removed')
///周期检查
class CycleCheck {
FixerModel authPerson;
@ -129,7 +129,7 @@ class CycleCheck {
this.checkDetails,
});
}
@Deprecated('under should be removed')
class WorkFinishCheck {
FixerModel authPerson;
DateTime startDate;
@ -140,7 +140,7 @@ class WorkFinishCheck {
this.checkDetails,
});
}
@Deprecated('under should be removed')
///周期检查细节
class CheckInfomation {
DateTime checkDate;
@ -162,7 +162,7 @@ class CheckInfomation {
return true;
}
}
@Deprecated('under should be removed')
class CheckDetail {
CHECK_TYPE type;
bool status;

4
lib/ui/sub_pages/decoration_manager/decoration_manager_card.dart
Unescape View File

@ -1,4 +1,5 @@
// Flutter imports:
import 'package:aku_community_manager/ui/sub_pages/decoration_manager/decoration_manager_detail_page.dart';
import 'package:flutter/material.dart';
// Package imports:
@ -13,6 +14,7 @@ import 'package:aku_community_manager/tools/screen_tool.dart';
import 'package:aku_community_manager/tools/widget_tool.dart';
import 'package:aku_community_manager/ui/sub_pages/decoration_manager/decoration_util.dart';
import 'package:aku_community_manager/ui/widgets/inner/aku_chip_box.dart';
import 'package:get/get.dart';
class DecorationManagerCard extends StatefulWidget {
final DecorationListModel model;
@ -82,7 +84,7 @@ class _DecorationManagerCardState extends State<DecorationManagerCard> {
alignment: Alignment.centerRight,
child: AkuMaterialButton(
onPressed: () {
// Get.to(DecorationManagerDetailPage(model: widget.model));
Get.to(DecorationManagerDetailPage(decorationModel: widget.model));
},
height: 64.w,
minWidth: 160.w,

113
lib/ui/sub_pages/decoration_manager/decoration_manager_detail_page.dart
Unescape View File

@ -2,6 +2,7 @@
import 'dart:math';
// Flutter imports:
import 'package:aku_community_manager/models/manager/decoration/decoration_list_model.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
@ -20,8 +21,6 @@ import 'package:aku_community_manager/tools/user_tool.dart';
import 'package:aku_community_manager/tools/widget_tool.dart';
import 'package:aku_community_manager/ui/sub_pages/decoration_manager/decoration_check_row.dart';
import 'package:aku_community_manager/ui/sub_pages/decoration_manager/decoration_checkbox.dart';
import 'package:aku_community_manager/ui/sub_pages/decoration_manager/decoration_department_page.dart';
import 'package:aku_community_manager/ui/sub_pages/decoration_manager/decoration_follow_check.dart';
import 'package:aku_community_manager/ui/sub_pages/decoration_manager/decoration_util.dart';
import 'package:aku_community_manager/ui/widgets/common/aku_back_button.dart';
import 'package:aku_community_manager/ui/widgets/common/aku_scaffold.dart';
@ -30,8 +29,8 @@ import 'package:aku_community_manager/ui/widgets/inner/aku_title_box.dart';
import 'package:aku_community_manager/ui/widgets/inner/show_bottom_sheet.dart';
class DecorationManagerDetailPage extends StatefulWidget {
final DecorationModel model;
DecorationManagerDetailPage({Key key, @required this.model})
final DecorationListModel decorationModel;
DecorationManagerDetailPage({Key key, this.decorationModel})
: super(key: key);
@override
@ -49,45 +48,36 @@ class _DecorationManagerDetailStatePage
padding: EdgeInsets.symmetric(vertical: 16.w),
children: [
_buildInfo(),
widget.model.workFinishCheck == null
widget.decorationModel.status>3
? SizedBox()
: _buildFinishWorkCheck(),
_buildCycleCheck(),
widget.model.checkInfomations == null
UserTool.userProvider.infoModel.manager
? SizedBox()
: _buildCheckDetail(),
],
),
bottom: Builder(builder: (context) {
final CycleCheck cycleCheck = widget.model.cycleCheck;
if (UserTool.userProvider.infoModel.canOperation) {
switch (widget.model.type) {
case DecorationType.WAIT_HAND_OUT:
switch (widget.decorationModel.operationStatus) {
case 1:
return AkuBottomButton(
title: '立即安排',
onTap: cycleCheck.authPerson != null &&
cycleCheck.checkCycle != null &&
cycleCheck.startDate != null
? () {
widget.model.type = DecorationType.HAND_OUT;
setState(() {});
onTap:() {
}
: null,
);
break;
default:
return SizedBox();
break;
}
// else if(widget.model.type)
} else if (UserTool.userProvider.infoModel.canOperation) {
switch (widget.model.type) {
case DecorationType.HAND_OUT:
switch (widget.decorationModel.operationStatus) {
case 2:
return AkuBottomButton(
title: '立即执行',
onTap: () {
Get.to(DecorationFollowCheck(model: widget.model));
// Get.to(DecorationFollowCheck(model: widget.model));
},
);
break;
@ -115,13 +105,13 @@ class _DecorationManagerDetailStatePage
children: [
_buildInfoCard(
tag: '家',
midTop: widget.model.userHomeModel.plot,
midBottom: widget.model.userHomeModel.detailAddr,
name: '业主：' + widget.model.userHomeModel.userName,
phone: widget.model.userHomeModel.phone,
midTop: '人才公寓',
midBottom: widget.decorationModel.roomName,
name: '业主：' + UserTool.userProvider.infoModel.nickName,
phone: UserTool.userProvider.profileModel.tel,
rightTopWidget: Transform.rotate(
angle: pi / 4,
child: widget.model.statusType == DecorationStatusType.DONE
child: widget.decorationModel.operationStatus==3
? Image.asset(R.ASSETS_MANAGE_IC_WANCHENG_PNG)
: Image.asset(R.ASSETS_MANAGE_IC_ZHUANGXIU_PNG),
),
@ -129,9 +119,9 @@ class _DecorationManagerDetailStatePage
AkuBox.h(16),
_buildInfoCard(
tag: '装',
midTop: widget.model.decorationTeamModel.name,
name: '负责人：' + widget.model.decorationTeamModel.userName,
phone: widget.model.decorationTeamModel.phone,
midTop: widget.decorationModel.constructionUnit,
name: '负责人：' + '马泽鹏',
phone: '13831971345',
),
],
);
@ -254,7 +244,7 @@ class _DecorationManagerDetailStatePage
],
);
}
///完工检查
_buildFinishWorkCheck() {
return AkuTitleBox(
title: '完工检查',
@ -262,20 +252,20 @@ class _DecorationManagerDetailStatePage
children: [
_buildRow(
title: '开始装修时间',
subTitle: DateUtil.formatDate(
widget.model.decorationDate,
subTitle: DateUtil.formatDateStr(
'2021-5-20 13:14',
format: 'yyyy-MM-dd',
),
),
_buildRow(
title: '接受人',
subTitle: widget.model.workFinishCheck?.authPerson?.name,
subTitle: '金礼伟',
),
_buildRow(title: '所属项目', subTitle: '装修管理'),
_buildRow(
title: '开始日期',
subTitle: DateUtil.formatDate(
widget.model.workFinishCheck?.startDate,
subTitle: DateUtil.formatDateStr(
'2021-5-20 13:14',
format: 'yyyy-MM-dd',
),
),
@ -292,13 +282,18 @@ class _DecorationManagerDetailStatePage
),
),
DecorationCheckRow(
details: widget.model.workFinishCheck?.checkDetails,
details: [
CHECK_TYPE.ELECTRIC,
CHECK_TYPE.WATER,
CHECK_TYPE.WALL,
CHECK_TYPE.DOOR_AND_WINDOWS,
],
onChange: (details) {},
),
],
);
}
///周期检查
_buildCycleCheck() {
return AkuTitleBox(
title: '周期检查',
@ -306,27 +301,27 @@ class _DecorationManagerDetailStatePage
children: [
_buildRow(
title: '开始装修时间',
subTitle: DateUtil.formatDate(
widget.model.decorationDate,
subTitle: DateUtil.formatDateStr(
'2021-05-20 13:14:00',
format: 'yyyy-MM-dd',
),
),
_buildRow(
title: '接受人',
subTitle: widget.model.cycleCheck?.authPerson?.name,
subTitle: '黄鑫',
onTap: UserTool.userProvider.infoModel.canOperation
? () {
Get.to(DecorationDepartmentPage(
model: widget.model,
)).then((value) => setState(() {}));
// Get.to(DecorationDepartmentPage(
// model: widget.model,
// )).then((value) => setState(() {}));
}
: null,
),
_buildRow(title: '所属项目', subTitle: '装修管理'),
_buildRow(
title: '开始日期',
subTitle: DateUtil.formatDate(
widget.model.cycleCheck?.startDate,
subTitle: DateUtil.formatDateStr(
'2021-05-20 13:14:00',
format: 'yyyy-MM-dd',
),
onTap: UserTool.userProvider.infoModel.canOperation
@ -368,7 +363,7 @@ class _DecorationManagerDetailStatePage
height: 500.w,
child: CupertinoDatePicker(
onDateTimeChanged: (dateTime) {
widget.model.cycleCheck.startDate = dateTime;
},
),
),
@ -382,9 +377,7 @@ class _DecorationManagerDetailStatePage
),
_buildRow(
title: '检查周期',
subTitle: widget.model.cycleCheck.checkCycle == null
? null
: '${widget.model.cycleCheck.checkCycle}天',
subTitle: '${15}天',
onTap: UserTool.userProvider.infoModel.canOperation
? () {
showAkuSheet(
@ -460,7 +453,7 @@ class _DecorationManagerDetailStatePage
realValue = 30;
break;
}
widget.model.cycleCheck.checkCycle = realValue;
},
),
),
@ -493,19 +486,19 @@ class _DecorationManagerDetailStatePage
CHECK_TYPE.SECURITY,
],
onChange: (details) {
widget.model.cycleCheck.checkDetails = details;
},
canTap: UserTool.userProvider.infoModel.canOperation,
)
],
);
}
///执行信息
_buildCheckDetail() {
return AkuTitleBox(
title: '执行信息',
spacing: 24,
children: widget.model.checkInfomations.map((e) {
children: [].map((e) {
return Container(
decoration: BoxDecoration(
border: Border(
@ -527,7 +520,7 @@ class _DecorationManagerDetailStatePage
children: [
AkuBox.h(96),
Text(
'${DateUtil.formatDate(e.checkDate, format: 'yyyy-MM-dd')} ' +
'${DateUtil.formatDateStr('2021-5-20 13:14', format: 'yyyy-MM-dd')} ' +
e.checkType,
style: TextStyle(
color: AppStyle.primaryTextColor,
@ -537,7 +530,7 @@ class _DecorationManagerDetailStatePage
),
Spacer(),
Text(
e.checkAllResult ? '正常' : '异常',
3>2? '正常' : '异常',
style: TextStyle(
color: e.checkAllResult
? Color(0xFF32B814)
@ -550,7 +543,7 @@ class _DecorationManagerDetailStatePage
expanded: Column(
mainAxisSize: MainAxisSize.min,
children: [
...e.details.map((e) {
...[].map((e) {
return Container(
height: 96.w,
decoration: BoxDecoration(
@ -565,11 +558,11 @@ class _DecorationManagerDetailStatePage
children: [
AkuBox.w(48),
Image.asset(
e.assetpath,
R.ASSETS_PLACEHOLDER_WEBP,
height: 40.w,
),
Text(
e.typeValue,
'233',
style: TextStyle(
fontSize: 28.sp,
color: AppStyle.primaryTextColor,
@ -578,7 +571,7 @@ class _DecorationManagerDetailStatePage
),
Spacer(),
DecorationCheckBox(
initValue: e.status,
initValue: true,
),
Spacer(),
],
@ -607,7 +600,7 @@ class _DecorationManagerDetailStatePage
),
),
TextSpan(
text: e.info,
text: 'e.info',
),
],
style: TextStyle(

3
lib/ui/sub_pages/decoration_manager/decoration_manager_page.dart
Unescape View File

@ -7,7 +7,6 @@ import 'package:provider/provider.dart';
// Project imports:
import 'package:aku_community_manager/const/api.dart';
import 'package:aku_community_manager/mock_models/users/user_info_model.dart';
import 'package:aku_community_manager/models/manager/decoration/decoration_list_model.dart';
import 'package:aku_community_manager/provider/user_provider.dart';
import 'package:aku_community_manager/tools/screen_tool.dart';
@ -27,8 +26,6 @@ class _DecorationManagerPageState extends State<DecorationManagerPage>
with TickerProviderStateMixin {
TabController _tabController;
EasyRefreshController _refreshController;
USER_ROLE get role =>
Provider.of<UserProvider>(context, listen: false).userInfoModel.role;
List<String> get tabs {
final userProvider = Provider.of<UserProvider>(context, listen: false);

Write Preview
Loading…
Cancel
Save