修复了一些问题

hmxc
张萌 4 years ago
parent 9303023524
commit 255a7af306

@ -74,4 +74,6 @@ class AkuMap {
8: '作废', 8: '作废',
9: '取消' 9: '取消'
}; };
static Map<int, String> dispatchType = {1: '无偿服务', 2: '有偿服务'};
} }

@ -123,7 +123,7 @@ class _BusinessAndFixDetailPageState extends State<BusinessAndFixDetailPage> {
builder: (context) { builder: (context) {
final userProvider = final userProvider =
Provider.of<UserProvider>(context, listen: false); Provider.of<UserProvider>(context, listen: false);
if (userProvider.infoModel.canOperation) { if (userProvider.infoModel.canOperation&&widget.model.status<2) {
return AkuMaterialButton( return AkuMaterialButton(
color: AppStyle.primaryColor, color: AppStyle.primaryColor,
nullColor: AppStyle.minorColor, nullColor: AppStyle.minorColor,
@ -141,7 +141,7 @@ class _BusinessAndFixDetailPageState extends State<BusinessAndFixDetailPage> {
), ),
), ),
); );
} else if (widget.model.status == 3) { } else if (widget.model.status == 2) {
if (userProvider.infoModel.canOperation) { if (userProvider.infoModel.canOperation) {
return AkuMaterialButton( return AkuMaterialButton(
color: AppStyle.primaryColor, color: AppStyle.primaryColor,
@ -180,7 +180,7 @@ class _BusinessAndFixDetailPageState extends State<BusinessAndFixDetailPage> {
), ),
); );
} }
} else if ((widget.model.status >= 4 && widget.model.status <= 4) && } else if ((widget.model.status==3) &&
userProvider.infoModel.canPickUpTicket) userProvider.infoModel.canPickUpTicket)
return Container( return Container(
height: 96.w, height: 96.w,
@ -227,7 +227,7 @@ class _BusinessAndFixDetailPageState extends State<BusinessAndFixDetailPage> {
color: AppStyle.primaryColor, color: AppStyle.primaryColor,
onPressed: () { onPressed: () {
Get.to(FixWorkFinishPage( Get.to(FixWorkFinishPage(
fixModel :widget.model, fixModel: widget.model,
model: _detailModel, model: _detailModel,
dispatchType: dispatchType:
_detailModel.dispatchType.dispatchType == 1)); _detailModel.dispatchType.dispatchType == 1));
@ -307,11 +307,13 @@ class _BusinessAndFixDetailPageState extends State<BusinessAndFixDetailPage> {
children: [ children: [
_buildTypeTile( _buildTypeTile(
'派单类型', '派单类型',
_dispatchModels == null canTap
? null ? _dispatchModels == null
: _dispatchModels[_dispatchModels.indexWhere( ? null
(element) => element.showValue == _reportModel.type)] : _dispatchModels[_dispatchModels.indexWhere(
.showName, (element) => element.showValue == _reportModel.type)]
.showName
: AkuMap.dispatchType[_detailModel.dispatchType.dispatchType],
canTap, canTap,
helpContent: '请选择服务类型', helpContent: '请选择服务类型',
onTap: () async { onTap: () async {
@ -336,11 +338,13 @@ class _BusinessAndFixDetailPageState extends State<BusinessAndFixDetailPage> {
), ),
_buildTypeTile( _buildTypeTile(
'工单时限', '工单时限',
_timeLimitModels == null canTap
? null ? _timeLimitModels == null
: _timeLimitModels[_timeLimitModels.indexWhere((element) => ? null
element.id == _reportModel.workOrderTimeLimit)] : _timeLimitModels[_timeLimitModels.indexWhere((element) =>
?.name, element.id == _reportModel.workOrderTimeLimit)]
?.name
: _detailModel.dispatchType.workOrderLimitName,
canTap, canTap,
helpContent: '请选择工单时限', helpContent: '请选择工单时限',
onTap: () async { onTap: () async {
@ -365,11 +369,13 @@ class _BusinessAndFixDetailPageState extends State<BusinessAndFixDetailPage> {
), ),
_buildTypeTile( _buildTypeTile(
'工单子类', '工单子类',
_workTypeModels == null canTap
? null ? _workTypeModels == null
: _workTypeModels[_workTypeModels.indexWhere((element) => ? null
element.id == _reportModel.workOrderTypeDetail)] : _workTypeModels[_workTypeModels.indexWhere((element) =>
.name, element.id == _reportModel.workOrderTypeDetail)]
.name
: _detailModel.dispatchType.workOrderSubclassName,
canTap, canTap,
helpContent: '请选择工单子类', helpContent: '请选择工单子类',
onTap: () async { onTap: () async {

@ -36,6 +36,22 @@ class _FixerDepartmentPageState extends State<FixerDepartmentPage> {
List<RepairmanVos> _pickedFixers = []; List<RepairmanVos> _pickedFixers = [];
List<FixerItemModel> _fixerItems = []; List<FixerItemModel> _fixerItems = [];
bool get canDispatch {
if (_reportModel?.operato==null) {
return false;
} else if (_reportModel.type == -1) {
return false;
} else if (_reportModel.workOrderTimeLimit == -1) {
return false;
} else if (_reportModel.workOrderTyoe == -1) {
return false;
} else if (_reportModel.workOrderTypeDetail == -1) {
return false;
}
return true;
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return AkuScaffold( return AkuScaffold(
@ -61,25 +77,28 @@ class _FixerDepartmentPageState extends State<FixerDepartmentPage> {
), ),
bottom: AkuMaterialButton( bottom: AkuMaterialButton(
height: 96.w, height: 96.w,
onPressed: () async { onPressed: canDispatch
if (widget.changeType) { ? () async {
BaseModel baseModel = await ManageFunc.repairReassignment( if (widget.changeType) {
_reportModel.dispatchListId, _reportModel.operato); BaseModel baseModel = await ManageFunc.repairReassignment(
if (baseModel.status) { _reportModel.dispatchListId, _reportModel.operato);
Get.back(); if (baseModel.status) {
} else { Get.back();
BotToast.showText(text: baseModel.message); } else {
} BotToast.showText(text: baseModel.message);
} else { }
BaseModel baseModel = await ManageFunc.repairDispatch(_reportModel); } else {
if (baseModel.status) { BaseModel baseModel =
Get.back(); await ManageFunc.repairDispatch(_reportModel);
Get.back(); if (baseModel.status) {
} else { Get.back();
BotToast.showText(text: baseModel.message); Get.back();
} } else {
} BotToast.showText(text: baseModel.message);
}, }
}
}
: null,
// onPressed: _pickedFixers.isEmpty // onPressed: _pickedFixers.isEmpty
// ? null // ? null
// : () { // : () {

Loading…
Cancel
Save