Merge branch 'master' of http://159.75.73.143:8080/laiiihz/akuCommunity
* 'master' of http://159.75.73.143:8080/laiiihz/akuCommunity: 对接：我的房屋：修改选中的房产审核id 问卷调查/活动投票 未在进行中状态不可提交 添加物品归还页面 对接：借还管理：根据用户主键id查询需要归还物品信息（归还界面） 对接：借还管理：归还物品 添加出借成功及失败页面 对接：借取物品 修复数量显示错误的问题 物品选择后返回总类页获取数量 添加 借还管理-借出-物品总类界面 添加 借还管理-借出-选择物品界面 对接：借还管理：根据物品总类主键id查询未借出的物品明细(出借状态恒为未出借 添加选择借还界面hmxc
commit
647ef778ef
|
After Width: | Height: | Size: 7.0 KiB |
|
After Width: | Height: | Size: 20 KiB |
|
After Width: | Height: | Size: 3.5 KiB |
|
After Width: | Height: | Size: 17 KiB |
|
After Width: | Height: | Size: 20 KiB |
|
After Width: | Height: | Size: 730 B |
|
After Width: | Height: | Size: 768 B |
@ -0,0 +1,50 @@
|
||||
import 'package:akuCommunity/model/common/img_model.dart';
|
||||
|
||||
class ArticleBorrowDetailModel {
|
||||
int id;
|
||||
String name;
|
||||
String code;
|
||||
int status;
|
||||
List<ImgModel> imgList;
|
||||
String get borrowStatus {
|
||||
switch (this.status) {
|
||||
case 1:
|
||||
return '正常';
|
||||
break;
|
||||
case 2:
|
||||
return '破损';
|
||||
case 3:
|
||||
return '丢失';
|
||||
default:
|
||||
return '';
|
||||
}
|
||||
}
|
||||
|
||||
ArticleBorrowDetailModel(
|
||||
{this.id, this.name, this.code, this.status, this.imgList});
|
||||
|
||||
ArticleBorrowDetailModel.fromJson(Map<String, dynamic> json) {
|
||||
id = json['id'];
|
||||
name = json['name'];
|
||||
code = json['code'];
|
||||
status = json['status'];
|
||||
if (json['imgList'] != null) {
|
||||
imgList = new List<ImgModel>();
|
||||
json['imgList'].forEach((v) {
|
||||
imgList.add(new ImgModel.fromJson(v));
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
Map<String, dynamic> toJson() {
|
||||
final Map<String, dynamic> data = new Map<String, dynamic>();
|
||||
data['id'] = this.id;
|
||||
data['name'] = this.name;
|
||||
data['code'] = this.code;
|
||||
data['status'] = this.status;
|
||||
if (this.imgList != null) {
|
||||
data['imgList'] = this.imgList.map((v) => v.toJson()).toList();
|
||||
}
|
||||
return data;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,80 @@
|
||||
import 'package:akuCommunity/model/common/img_model.dart';
|
||||
|
||||
class ArticleReturnListModel {
|
||||
int id;
|
||||
String name;
|
||||
String code;
|
||||
String beginDate;
|
||||
int borrowTime;
|
||||
List<ImgModel> imgList;
|
||||
String get paraseBorrowTime {
|
||||
if (this.borrowTime > 24) {
|
||||
return '${this.borrowTime ~/ 24}天${this.borrowTime % 24}小时';
|
||||
} else {
|
||||
return '${this.borrowTime}小时';
|
||||
}
|
||||
}
|
||||
|
||||
ArticleReturnListModel(
|
||||
{this.id,
|
||||
this.name,
|
||||
this.code,
|
||||
this.beginDate,
|
||||
this.borrowTime,
|
||||
this.imgList});
|
||||
|
||||
ArticleReturnListModel.fromJson(Map<String, dynamic> json) {
|
||||
id = json['id'];
|
||||
name = json['name'];
|
||||
code = json['code'];
|
||||
beginDate = json['beginDate'];
|
||||
borrowTime = json['borrowTime'];
|
||||
if (json['imgList'] != null) {
|
||||
imgList = new List<ImgModel>();
|
||||
json['imgList'].forEach((v) {
|
||||
imgList.add(new ImgModel.fromJson(v));
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
Map<String, dynamic> toJson() {
|
||||
final Map<String, dynamic> data = new Map<String, dynamic>();
|
||||
data['id'] = this.id;
|
||||
data['name'] = this.name;
|
||||
data['code'] = this.code;
|
||||
data['beginDate'] = this.beginDate;
|
||||
data['borrowTime'] = this.borrowTime;
|
||||
if (this.imgList != null) {
|
||||
data['imgList'] = this.imgList.map((v) => v.toJson()).toList();
|
||||
}
|
||||
return data;
|
||||
}
|
||||
}
|
||||
|
||||
class ImgList {
|
||||
String url;
|
||||
String size;
|
||||
int longs;
|
||||
int paragraph;
|
||||
int sort;
|
||||
|
||||
ImgList({this.url, this.size, this.longs, this.paragraph, this.sort});
|
||||
|
||||
ImgList.fromJson(Map<String, dynamic> json) {
|
||||
url = json['url'];
|
||||
size = json['size'];
|
||||
longs = json['longs'];
|
||||
paragraph = json['paragraph'];
|
||||
sort = json['sort'];
|
||||
}
|
||||
|
||||
Map<String, dynamic> toJson() {
|
||||
final Map<String, dynamic> data = new Map<String, dynamic>();
|
||||
data['url'] = this.url;
|
||||
data['size'] = this.size;
|
||||
data['longs'] = this.longs;
|
||||
data['paragraph'] = this.paragraph;
|
||||
data['sort'] = this.sort;
|
||||
return data;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,73 @@
|
||||
import 'package:akuCommunity/model/common/img_model.dart';
|
||||
|
||||
class ArticleReturnModel {
|
||||
int id;
|
||||
String name;
|
||||
String code;
|
||||
String beginDate;
|
||||
int borrowTime;
|
||||
List<ImgModel> imgList;
|
||||
|
||||
ArticleReturnModel(
|
||||
{this.id,
|
||||
this.name,
|
||||
this.code,
|
||||
this.beginDate,
|
||||
this.borrowTime,
|
||||
this.imgList});
|
||||
|
||||
ArticleReturnModel.fromJson(Map<String, dynamic> json) {
|
||||
id = json['id'];
|
||||
name = json['name'];
|
||||
code = json['code'];
|
||||
beginDate = json['beginDate'];
|
||||
borrowTime = json['borrowTime'];
|
||||
if (json['imgList'] != null) {
|
||||
imgList = new List<ImgModel>();
|
||||
json['imgList'].forEach((v) {
|
||||
imgList.add(new ImgModel.fromJson(v));
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
Map<String, dynamic> toJson() {
|
||||
final Map<String, dynamic> data = new Map<String, dynamic>();
|
||||
data['id'] = this.id;
|
||||
data['name'] = this.name;
|
||||
data['code'] = this.code;
|
||||
data['beginDate'] = this.beginDate;
|
||||
data['borrowTime'] = this.borrowTime;
|
||||
if (this.imgList != null) {
|
||||
data['imgList'] = this.imgList.map((v) => v.toJson()).toList();
|
||||
}
|
||||
return data;
|
||||
}
|
||||
}
|
||||
|
||||
class ImgList {
|
||||
String url;
|
||||
String size;
|
||||
int longs;
|
||||
int paragraph;
|
||||
int sort;
|
||||
|
||||
ImgList({this.url, this.size, this.longs, this.paragraph, this.sort});
|
||||
|
||||
ImgList.fromJson(Map<String, dynamic> json) {
|
||||
url = json['url'];
|
||||
size = json['size'];
|
||||
longs = json['longs'];
|
||||
paragraph = json['paragraph'];
|
||||
sort = json['sort'];
|
||||
}
|
||||
|
||||
Map<String, dynamic> toJson() {
|
||||
final Map<String, dynamic> data = new Map<String, dynamic>();
|
||||
data['url'] = this.url;
|
||||
data['size'] = this.size;
|
||||
data['longs'] = this.longs;
|
||||
data['paragraph'] = this.paragraph;
|
||||
data['sort'] = this.sort;
|
||||
return data;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,81 @@
|
||||
import 'package:akuCommunity/base/base_style.dart';
|
||||
import 'package:akuCommunity/pages/home/home_page.dart';
|
||||
import 'package:akuCommunity/pages/tab_navigator.dart';
|
||||
import 'package:akuCommunity/widget/bee_scaffold.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_screenutil/flutter_screenutil.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:velocity_x/velocity_x.dart';
|
||||
import 'package:akuCommunity/const/resource.dart';
|
||||
|
||||
class BorrowFinshPage extends StatefulWidget {
|
||||
final bool isSuccess;
|
||||
final String failText;
|
||||
BorrowFinshPage({Key key, this.isSuccess, this.failText}) : super(key: key);
|
||||
|
||||
@override
|
||||
_BorrowFinshPageState createState() => _BorrowFinshPageState();
|
||||
}
|
||||
|
||||
class _BorrowFinshPageState extends State<BorrowFinshPage> {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return BeeScaffold(
|
||||
title: '出借结果',
|
||||
body: Center(
|
||||
child: Column(
|
||||
children: [
|
||||
75.w.heightBox,
|
||||
SizedBox(
|
||||
width: 110.w,
|
||||
height: 110.w,
|
||||
child: Image.asset(widget.isSuccess
|
||||
? R.ASSETS_ICONS_BORROW_SUCCESS_PNG
|
||||
: R.ASSETS_ICONS_BORROW_FAILURE_PNG),
|
||||
),
|
||||
48.w.heightBox,
|
||||
'${widget.isSuccess ? '出借成功' : '出借失败'}'
|
||||
.text
|
||||
.color(ktextPrimary)
|
||||
.size(36.sp)
|
||||
.bold
|
||||
.make(),
|
||||
16.w.heightBox,
|
||||
'${widget.isSuccess ? '使用后请记得归还' : widget.failText}'
|
||||
.text
|
||||
.color(ktextSubColor)
|
||||
.size(26.sp)
|
||||
.make(),
|
||||
95.w.heightBox,
|
||||
MaterialButton(
|
||||
color: kPrimaryColor,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(8.w)),
|
||||
elevation: 0,
|
||||
hoverElevation: 0,
|
||||
highlightElevation: 0,
|
||||
focusElevation: 0,
|
||||
disabledElevation: 0,
|
||||
padding: EdgeInsets.symmetric(vertical: 24.w),
|
||||
minWidth: double.infinity,
|
||||
onPressed: widget.isSuccess
|
||||
? () {
|
||||
Get.offAll(TabNavigator());
|
||||
}
|
||||
: () {
|
||||
Get.back();
|
||||
},
|
||||
child: '${widget.isSuccess ? '返回首页' : '重新提交'}'
|
||||
.text
|
||||
.color(widget.isSuccess ? ktextPrimary : Colors.white)
|
||||
.size(36.sp)
|
||||
.make(),
|
||||
)
|
||||
],
|
||||
),
|
||||
).pSymmetric(
|
||||
h: 24.w,
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,256 @@
|
||||
import 'package:akuCommunity/base/base_style.dart';
|
||||
import 'package:akuCommunity/constants/api.dart';
|
||||
import 'package:akuCommunity/model/common/img_model.dart';
|
||||
import 'package:akuCommunity/model/manager/article_borrow_detail_model.dart';
|
||||
import 'package:akuCommunity/utils/network/base_model.dart';
|
||||
import 'package:akuCommunity/utils/network/net_util.dart';
|
||||
import 'package:akuCommunity/widget/animated/animated_scale.dart';
|
||||
import 'package:akuCommunity/widget/bee_scaffold.dart';
|
||||
import 'package:akuCommunity/widget/buttons/radio_button.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_easyrefresh/easy_refresh.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:velocity_x/velocity_x.dart';
|
||||
import 'package:flutter_screenutil/flutter_screenutil.dart';
|
||||
import 'package:akuCommunity/const/resource.dart';
|
||||
|
||||
class BorrowGoodsDetailPage extends StatefulWidget {
|
||||
final int articleId;
|
||||
final List<int> receiveIds;
|
||||
BorrowGoodsDetailPage({Key key, this.articleId, this.receiveIds})
|
||||
: super(key: key);
|
||||
|
||||
@override
|
||||
_BorrowGoodsDetailPageState createState() => _BorrowGoodsDetailPageState();
|
||||
}
|
||||
|
||||
class _BorrowGoodsDetailPageState extends State<BorrowGoodsDetailPage> {
|
||||
EasyRefreshController _easyRefreshController;
|
||||
List<ArticleBorrowDetailModel> _models;
|
||||
bool _onload = true;
|
||||
List<int> _selectItems = [];
|
||||
bool get allSelect => _selectItems.length == _models.length;
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
_easyRefreshController = EasyRefreshController();
|
||||
if (widget.receiveIds != null && widget.receiveIds.isNotEmpty) {
|
||||
_selectItems = widget.receiveIds;
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_easyRefreshController?.dispose();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return BeeScaffold(
|
||||
title: '选择物品',
|
||||
body: EasyRefresh(
|
||||
firstRefresh: true,
|
||||
header: MaterialHeader(),
|
||||
onRefresh: () async {
|
||||
List models = await getModels();
|
||||
_models =
|
||||
models.map((e) => ArticleBorrowDetailModel.fromJson(e)).toList();
|
||||
_onload = false;
|
||||
setState(() {});
|
||||
},
|
||||
child: _onload
|
||||
? _empty()
|
||||
: ListView(
|
||||
children: [..._models.map((e) => _goodsCard(e)).toList()],
|
||||
),
|
||||
),
|
||||
bottomNavi: _onload ? _empty() : _bottomButton(),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _allSelectButton() {
|
||||
return GestureDetector(
|
||||
onTap: () {
|
||||
if (allSelect) {
|
||||
_selectItems.clear();
|
||||
} else {
|
||||
_selectItems.clear();
|
||||
_models.forEach((element) {
|
||||
_selectItems.add(element.id);
|
||||
});
|
||||
}
|
||||
setState(() {});
|
||||
},
|
||||
child: AnimatedContainer(
|
||||
height: 40.w,
|
||||
width: 40.w,
|
||||
decoration: BoxDecoration(
|
||||
border: Border.all(
|
||||
color: allSelect ? kPrimaryColor : Color(0xFF979797),
|
||||
width: 3.w,
|
||||
),
|
||||
borderRadius: BorderRadius.circular(20.w),
|
||||
),
|
||||
duration: Duration(milliseconds: 300),
|
||||
curve: Curves.easeInOutCubic,
|
||||
alignment: Alignment.center,
|
||||
child: AnimatedOpacity(
|
||||
duration: Duration(milliseconds: 300),
|
||||
curve: Curves.easeInOutCubic,
|
||||
opacity: allSelect ? 1 : 0,
|
||||
child: AnimatedScale(
|
||||
scale: allSelect ? 1 : 0,
|
||||
child: Container(
|
||||
height: 24.w,
|
||||
width: 24.w,
|
||||
decoration: BoxDecoration(
|
||||
color: kPrimaryColor,
|
||||
borderRadius: BorderRadius.circular(12.w),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _bottomButton() {
|
||||
return Row(
|
||||
children: [
|
||||
_allSelectButton(),
|
||||
16.w.widthBox,
|
||||
'全选'.text.color(ktextSubColor).size(24.sp).make(),
|
||||
Spacer(),
|
||||
'已选择 '.richText.color(ktextPrimary).size(24.sp).withTextSpanChildren([
|
||||
'${_selectItems.length}'
|
||||
.textSpan
|
||||
.size(32.sp)
|
||||
.color(ktextPrimary)
|
||||
.make(),
|
||||
' 项'.textSpan.size(24.sp).color(ktextPrimary).make(),
|
||||
]).make(),
|
||||
32.w.widthBox,
|
||||
MaterialButton(
|
||||
elevation: 0,
|
||||
shape:
|
||||
RoundedRectangleBorder(borderRadius: BorderRadius.circular(37.w)),
|
||||
color: kPrimaryColor,
|
||||
padding: EdgeInsets.symmetric(horizontal: 50.w, vertical: 15.w),
|
||||
onPressed: () {
|
||||
Get.back(result: _selectItems);
|
||||
},
|
||||
child: '确定'.text.black.size(32.sp).bold.make(),
|
||||
),
|
||||
],
|
||||
)
|
||||
.pSymmetric(v: 22.w, h: 32.w)
|
||||
.box
|
||||
.color(Colors.white)
|
||||
.width(double.infinity)
|
||||
.padding(EdgeInsets.only(bottom: MediaQuery.of(context).padding.bottom))
|
||||
.make();
|
||||
}
|
||||
|
||||
Widget _empty() {
|
||||
return Container();
|
||||
}
|
||||
|
||||
Future getModels() async {
|
||||
BaseModel baseModel =
|
||||
await NetUtil().get(API.manager.articleBorrowFindDetail, params: {
|
||||
"articleId": widget.articleId,
|
||||
});
|
||||
return baseModel.data as List;
|
||||
}
|
||||
|
||||
Widget _goodsCard(ArticleBorrowDetailModel model) {
|
||||
return Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
GestureDetector(
|
||||
onTap: () {
|
||||
if (_selectItems.contains(model.id)) {
|
||||
_selectItems.remove(model.id);
|
||||
} else {
|
||||
_selectItems.add(model.id);
|
||||
}
|
||||
setState(() {});
|
||||
},
|
||||
child: Container(
|
||||
height: 232.w - 48.w,
|
||||
alignment: Alignment.center,
|
||||
child: BeeRadio(
|
||||
value: model.id,
|
||||
groupValues: _selectItems,
|
||||
),
|
||||
),
|
||||
).material(color: Colors.transparent),
|
||||
24.w.widthBox,
|
||||
SizedBox(
|
||||
width: 184.w,
|
||||
height: 184.w,
|
||||
child: ClipRRect(
|
||||
child: FadeInImage.assetNetwork(
|
||||
placeholder: R.ASSETS_IMAGES_PLACEHOLDER_WEBP,
|
||||
image: API.image(ImgModel.first(model.imgList)),
|
||||
),
|
||||
),
|
||||
),
|
||||
24.w.widthBox,
|
||||
Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Row(
|
||||
children: [
|
||||
Image.asset(
|
||||
R.ASSETS_ICONS_ARTICLE_NAME_PNG,
|
||||
width: 40.w,
|
||||
height: 40.w,
|
||||
),
|
||||
4.w.widthBox,
|
||||
'物品名称：'.text.color(ktextSubColor).size(28.sp).make(),
|
||||
'${model.name}'.text.color(ktextPrimary).size(28.sp).make(),
|
||||
],
|
||||
),
|
||||
12.w.heightBox,
|
||||
Row(
|
||||
children: [
|
||||
Image.asset(
|
||||
R.ASSETS_ICONS_ARTICLE_COUNT_PNG,
|
||||
width: 40.w,
|
||||
height: 40.w,
|
||||
),
|
||||
4.w.widthBox,
|
||||
'物品单号：'.text.color(ktextSubColor).size(28.sp).make(),
|
||||
'${model.code}'.text.color(ktextPrimary).size(28.sp).make(),
|
||||
],
|
||||
),
|
||||
12.w.heightBox,
|
||||
Row(
|
||||
children: [
|
||||
Image.asset(
|
||||
R.ASSETS_ICONS_BORROW_STATUS_PNG,
|
||||
width: 40.w,
|
||||
height: 40.w,
|
||||
),
|
||||
4.w.widthBox,
|
||||
'出借状态：'.text.color(ktextSubColor).size(28.sp).make(),
|
||||
'${model.borrowStatus}'
|
||||
.text
|
||||
.color(ktextPrimary)
|
||||
.size(28.sp)
|
||||
.make(),
|
||||
],
|
||||
),
|
||||
],
|
||||
)
|
||||
],
|
||||
)
|
||||
.box
|
||||
.color(Colors.white)
|
||||
.padding(EdgeInsets.symmetric(vertical: 24.w, horizontal: 24.w))
|
||||
.withRounded(value: 6.w)
|
||||
.make();
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,209 @@
|
||||
import 'package:akuCommunity/base/base_style.dart';
|
||||
import 'package:akuCommunity/constants/api.dart';
|
||||
import 'package:akuCommunity/model/common/img_model.dart';
|
||||
import 'package:akuCommunity/model/manager/article_borrow_model.dart';
|
||||
import 'package:akuCommunity/pages/goods_manage_page/borrow/borrow_finsh_page.dart';
|
||||
import 'package:akuCommunity/pages/goods_manage_page/borrow/borrow_goods_detail_page.dart';
|
||||
import 'package:akuCommunity/pages/things_page/widget/bee_list_view.dart';
|
||||
import 'package:akuCommunity/utils/network/base_model.dart';
|
||||
import 'package:akuCommunity/utils/network/net_util.dart';
|
||||
import 'package:akuCommunity/widget/bee_scaffold.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_easyrefresh/easy_refresh.dart';
|
||||
import 'package:flutter_screenutil/flutter_screenutil.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:velocity_x/velocity_x.dart';
|
||||
import 'package:akuCommunity/const/resource.dart';
|
||||
|
||||
class BorrowGoodsPage extends StatefulWidget {
|
||||
BorrowGoodsPage({Key key}) : super(key: key);
|
||||
|
||||
@override
|
||||
_BorrowGoodsPageState createState() => _BorrowGoodsPageState();
|
||||
}
|
||||
|
||||
class _BorrowGoodsPageState extends State<BorrowGoodsPage> {
|
||||
EasyRefreshController _easyRefreshController;
|
||||
List<int> _receiveIds = [];
|
||||
List<int> _submitIds = [];
|
||||
List<int> _counts = [];
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
_easyRefreshController = EasyRefreshController();
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_easyRefreshController?.dispose();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return BeeScaffold(
|
||||
title: '全部物品',
|
||||
actions: [
|
||||
MaterialButton(
|
||||
onPressed: () {
|
||||
// Get.to(() => MineGoodsPage());
|
||||
},
|
||||
child: '我的借还物品'.text.black.size(28.sp).make(),
|
||||
padding: EdgeInsets.symmetric(horizontal: 32.w),
|
||||
),
|
||||
],
|
||||
body: BeeListView(
|
||||
path: API.manager.articleBorrow,
|
||||
controller: _easyRefreshController,
|
||||
convert: (models) {
|
||||
return models.tableList
|
||||
.map((e) => ArticleBorrowModel.fromJson(e))
|
||||
.toList();
|
||||
},
|
||||
builder: (items) {
|
||||
if (_counts.isEmpty) {
|
||||
_counts = List.filled(items.length, 0);
|
||||
}
|
||||
return ListView.separated(
|
||||
padding: EdgeInsets.symmetric(vertical: 16.w, horizontal: 32.w),
|
||||
itemBuilder: (context, index) {
|
||||
return _goodsCard(items[index], index);
|
||||
},
|
||||
separatorBuilder: (_, __) {
|
||||
return 16.w.heightBox;
|
||||
},
|
||||
itemCount: items.length);
|
||||
}),
|
||||
bottomNavi: Row(
|
||||
children: [
|
||||
'已选择 '.richText.color(ktextPrimary).size(24.sp).withTextSpanChildren([
|
||||
'${_submitIds.length}'
|
||||
.textSpan
|
||||
.size(32.sp)
|
||||
.color(ktextPrimary)
|
||||
.make(),
|
||||
' 项'.textSpan.size(24.sp).color(ktextPrimary).make(),
|
||||
]).make(),
|
||||
Spacer(),
|
||||
MaterialButton(
|
||||
elevation: 0,
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(37.w)),
|
||||
color: kPrimaryColor,
|
||||
padding: EdgeInsets.symmetric(horizontal: 50.w, vertical: 15.w),
|
||||
onPressed: () async {
|
||||
BaseModel baseModel = await NetUtil().post(
|
||||
API.manager.articleBorrowGoods,
|
||||
params: {"ids": _submitIds},
|
||||
showMessage: false);
|
||||
Get.to(BorrowFinshPage(
|
||||
isSuccess: baseModel.status,
|
||||
failText: baseModel.message,
|
||||
));
|
||||
},
|
||||
child: '借出'.text.black.size(32.sp).bold.make(),
|
||||
),
|
||||
],
|
||||
)
|
||||
.pSymmetric(v: 22.w, h: 32.w)
|
||||
.box
|
||||
.color(Colors.white)
|
||||
.width(double.infinity)
|
||||
.padding(
|
||||
EdgeInsets.only(bottom: MediaQuery.of(context).padding.bottom))
|
||||
.make(),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _goodsCard(ArticleBorrowModel model, int index) {
|
||||
return Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
SizedBox(
|
||||
width: 184.w,
|
||||
height: 184.w,
|
||||
child: ClipRRect(
|
||||
child: FadeInImage.assetNetwork(
|
||||
placeholder: R.ASSETS_IMAGES_PLACEHOLDER_WEBP,
|
||||
image: API.image(ImgModel.first(model.imgUrls)),
|
||||
),
|
||||
),
|
||||
),
|
||||
24.w.widthBox,
|
||||
Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Row(
|
||||
children: [
|
||||
Image.asset(
|
||||
R.ASSETS_ICONS_ARTICLE_NAME_PNG,
|
||||
width: 40.w,
|
||||
height: 40.w,
|
||||
),
|
||||
4.w.widthBox,
|
||||
'物品名称:'.text.color(ktextSubColor).size(28.sp).make(),
|
||||
'${model.name}'.text.color(ktextPrimary).size(28.sp).make(),
|
||||
],
|
||||
),
|
||||
12.w.heightBox,
|
||||
Row(
|
||||
children: [
|
||||
Image.asset(
|
||||
R.ASSETS_ICONS_ARTICLE_COUNT_PNG,
|
||||
width: 40.w,
|
||||
height: 40.w,
|
||||
),
|
||||
4.w.widthBox,
|
||||
'剩余数量:'.text.color(ktextSubColor).size(28.sp).make(),
|
||||
'${model.quantity}'.text.color(ktextPrimary).size(28.sp).make(),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
_counts[index] == 0
|
||||
? SizedBox()
|
||||
: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.end,
|
||||
children: [
|
||||
Container(
|
||||
alignment: Alignment.center,
|
||||
width: 40.w,
|
||||
height: 40.w,
|
||||
decoration: BoxDecoration(
|
||||
borderRadius: BorderRadius.circular(20.w),
|
||||
color: kPrimaryColor,
|
||||
),
|
||||
child: '${_counts[index]}'
|
||||
.text
|
||||
.color(ktextPrimary)
|
||||
.size(24.sp)
|
||||
.bold
|
||||
.make(),
|
||||
),
|
||||
],
|
||||
).expand()
|
||||
],
|
||||
)
|
||||
.box
|
||||
.color(Colors.white)
|
||||
.height(232.w)
|
||||
.width(686.w)
|
||||
.padding(EdgeInsets.symmetric(vertical: 24.w, horizontal: 24.w))
|
||||
.withRounded(value: 6.w)
|
||||
.make()
|
||||
.onInkTap(() async {
|
||||
_receiveIds.forEach((element) {
|
||||
_submitIds.remove(element);
|
||||
});
|
||||
await Get.to(() => BorrowGoodsDetailPage(
|
||||
articleId: model.id,
|
||||
receiveIds: _receiveIds,
|
||||
)).then((value) {
|
||||
_receiveIds = value;
|
||||
});
|
||||
_counts[index] = _receiveIds.length;
|
||||
_submitIds.addAll(_receiveIds);
|
||||
setState(() {});
|
||||
});
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,255 @@
|
||||
import 'package:akuCommunity/base/base_style.dart';
|
||||
import 'package:akuCommunity/constants/api.dart';
|
||||
import 'package:akuCommunity/model/common/img_model.dart';
|
||||
import 'package:akuCommunity/model/manager/article_return_list_model.dart';
|
||||
import 'package:akuCommunity/utils/network/base_model.dart';
|
||||
import 'package:akuCommunity/utils/network/net_util.dart';
|
||||
import 'package:akuCommunity/widget/animated/animated_scale.dart';
|
||||
import 'package:akuCommunity/widget/bee_scaffold.dart';
|
||||
import 'package:akuCommunity/widget/buttons/radio_button.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_easyrefresh/easy_refresh.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:velocity_x/velocity_x.dart';
|
||||
import 'package:flutter_screenutil/flutter_screenutil.dart';
|
||||
import 'package:akuCommunity/const/resource.dart';
|
||||
|
||||
class ReturnGoodsDetailPage extends StatefulWidget {
|
||||
ReturnGoodsDetailPage({Key key}) : super(key: key);
|
||||
|
||||
@override
|
||||
_ReturnGoodsDetailPageState createState() => _ReturnGoodsDetailPageState();
|
||||
}
|
||||
|
||||
class _ReturnGoodsDetailPageState extends State<ReturnGoodsDetailPage> {
|
||||
EasyRefreshController _easyRefreshController;
|
||||
List<ArticleReturnListModel> _models;
|
||||
bool _onload = true;
|
||||
List<int> _selectItems = [];
|
||||
bool get allSelect => _selectItems.length == _models.length;
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
_easyRefreshController = EasyRefreshController();
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_easyRefreshController?.dispose();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return BeeScaffold(
|
||||
title: '选择物品',
|
||||
body: EasyRefresh(
|
||||
firstRefresh: true,
|
||||
header: MaterialHeader(),
|
||||
onRefresh: () async {
|
||||
List models = await getModels();
|
||||
_models =
|
||||
models.map((e) => ArticleReturnListModel.fromJson(e)).toList();
|
||||
_onload = false;
|
||||
setState(() {});
|
||||
},
|
||||
child: _onload
|
||||
? _empty()
|
||||
: ListView(
|
||||
children: [..._models.map((e) => _goodsCard(e)).toList()],
|
||||
),
|
||||
),
|
||||
bottomNavi: _onload ? _empty() : _bottomButton(),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _allSelectButton() {
|
||||
return GestureDetector(
|
||||
onTap: () {
|
||||
if (allSelect) {
|
||||
_selectItems.clear();
|
||||
} else {
|
||||
_selectItems.clear();
|
||||
_models.forEach((element) {
|
||||
_selectItems.add(element.id);
|
||||
});
|
||||
}
|
||||
setState(() {});
|
||||
},
|
||||
child: AnimatedContainer(
|
||||
height: 40.w,
|
||||
width: 40.w,
|
||||
decoration: BoxDecoration(
|
||||
border: Border.all(
|
||||
color: allSelect ? kPrimaryColor : Color(0xFF979797),
|
||||
width: 3.w,
|
||||
),
|
||||
borderRadius: BorderRadius.circular(20.w),
|
||||
),
|
||||
duration: Duration(milliseconds: 300),
|
||||
curve: Curves.easeInOutCubic,
|
||||
alignment: Alignment.center,
|
||||
child: AnimatedOpacity(
|
||||
duration: Duration(milliseconds: 300),
|
||||
curve: Curves.easeInOutCubic,
|
||||
opacity: allSelect ? 1 : 0,
|
||||
child: AnimatedScale(
|
||||
scale: allSelect ? 1 : 0,
|
||||
child: Container(
|
||||
height: 24.w,
|
||||
width: 24.w,
|
||||
decoration: BoxDecoration(
|
||||
color: kPrimaryColor,
|
||||
borderRadius: BorderRadius.circular(12.w),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _bottomButton() {
|
||||
return Row(
|
||||
children: [
|
||||
_allSelectButton(),
|
||||
16.w.widthBox,
|
||||
'全选'.text.color(ktextSubColor).size(24.sp).make(),
|
||||
Spacer(),
|
||||
'已选择 '.richText.color(ktextPrimary).size(24.sp).withTextSpanChildren([
|
||||
'${_selectItems.length}'
|
||||
.textSpan
|
||||
.size(32.sp)
|
||||
.color(ktextPrimary)
|
||||
.make(),
|
||||
' 项'.textSpan.size(24.sp).color(ktextPrimary).make(),
|
||||
]).make(),
|
||||
32.w.widthBox,
|
||||
MaterialButton(
|
||||
elevation: 0,
|
||||
shape:
|
||||
RoundedRectangleBorder(borderRadius: BorderRadius.circular(37.w)),
|
||||
color: kPrimaryColor,
|
||||
padding: EdgeInsets.symmetric(horizontal: 50.w, vertical: 15.w),
|
||||
onPressed: () async {
|
||||
BaseModel baseModel =
|
||||
await NetUtil().post(API.manager.articleReturnGoods,
|
||||
params: {
|
||||
'ids': _selectItems,
|
||||
},
|
||||
showMessage: true);
|
||||
if (baseModel.status) {
|
||||
Get.back();
|
||||
}
|
||||
},
|
||||
child: '归还'.text.black.size(32.sp).bold.make(),
|
||||
),
|
||||
],
|
||||
)
|
||||
.pSymmetric(v: 22.w, h: 32.w)
|
||||
.box
|
||||
.color(Colors.white)
|
||||
.width(double.infinity)
|
||||
.padding(EdgeInsets.only(bottom: MediaQuery.of(context).padding.bottom))
|
||||
.make();
|
||||
}
|
||||
|
||||
Widget _empty() {
|
||||
return Container();
|
||||
}
|
||||
|
||||
Future getModels() async {
|
||||
BaseModel baseModel = await NetUtil().get(API.manager.articleReturnList);
|
||||
return baseModel.data as List;
|
||||
}
|
||||
|
||||
Widget _goodsCard(ArticleReturnListModel model) {
|
||||
return Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
GestureDetector(
|
||||
onTap: () {
|
||||
if (_selectItems.contains(model.id)) {
|
||||
_selectItems.remove(model.id);
|
||||
} else {
|
||||
_selectItems.add(model.id);
|
||||
}
|
||||
setState(() {});
|
||||
},
|
||||
child: Container(
|
||||
height: 232.w - 48.w,
|
||||
alignment: Alignment.center,
|
||||
child: BeeRadio(
|
||||
value: model.id,
|
||||
groupValues: _selectItems,
|
||||
),
|
||||
),
|
||||
).material(color: Colors.transparent),
|
||||
24.w.widthBox,
|
||||
SizedBox(
|
||||
width: 184.w,
|
||||
height: 184.w,
|
||||
child: ClipRRect(
|
||||
child: FadeInImage.assetNetwork(
|
||||
placeholder: R.ASSETS_IMAGES_PLACEHOLDER_WEBP,
|
||||
image: API.image(ImgModel.first(model.imgList)),
|
||||
),
|
||||
),
|
||||
),
|
||||
24.w.widthBox,
|
||||
Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Row(
|
||||
children: [
|
||||
Image.asset(
|
||||
R.ASSETS_ICONS_ARTICLE_NAME_PNG,
|
||||
width: 40.w,
|
||||
height: 40.w,
|
||||
),
|
||||
4.w.widthBox,
|
||||
'物品名称：'.text.color(ktextSubColor).size(28.sp).make(),
|
||||
'${model.name}'.text.color(ktextPrimary).size(28.sp).make(),
|
||||
],
|
||||
),
|
||||
12.w.heightBox,
|
||||
Row(
|
||||
children: [
|
||||
Image.asset(
|
||||
R.ASSETS_ICONS_ARTICLE_COUNT_PNG,
|
||||
width: 40.w,
|
||||
height: 40.w,
|
||||
),
|
||||
4.w.widthBox,
|
||||
'物品单号：'.text.color(ktextSubColor).size(28.sp).make(),
|
||||
'${model.code}'.text.color(ktextPrimary).size(28.sp).make(),
|
||||
],
|
||||
),
|
||||
12.w.heightBox,
|
||||
Row(
|
||||
children: [
|
||||
Image.asset(
|
||||
R.ASSETS_ICONS_BORROW_STATUS_PNG,
|
||||
width: 40.w,
|
||||
height: 40.w,
|
||||
),
|
||||
4.w.widthBox,
|
||||
'出借时间'.text.color(ktextSubColor).size(28.sp).make(),
|
||||
'${model.paraseBorrowTime}'
|
||||
.text
|
||||
.color(ktextPrimary)
|
||||
.size(28.sp)
|
||||
.make(),
|
||||
],
|
||||
),
|
||||
],
|
||||
)
|
||||
],
|
||||
)
|
||||
.box
|
||||
.color(Colors.white)
|
||||
.padding(EdgeInsets.symmetric(vertical: 24.w, horizontal: 24.w))
|
||||
.withRounded(value: 6.w)
|
||||
.make();
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,63 @@
|
||||
import 'package:akuCommunity/pages/goods_manage_page/goods_manage_page.dart';
|
||||
import 'package:akuCommunity/widget/bee_scaffold.dart';
|
||||
import 'package:flutter/cupertino.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_screenutil/flutter_screenutil.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:velocity_x/velocity_x.dart';
|
||||
import 'package:akuCommunity/const/resource.dart';
|
||||
import 'package:akuCommunity/extensions/widget_list_ext.dart';
|
||||
|
||||
class SelectBorrowReturnPage extends StatefulWidget {
|
||||
SelectBorrowReturnPage({Key key}) : super(key: key);
|
||||
|
||||
@override
|
||||
_SelectBorrowReturnPageState createState() => _SelectBorrowReturnPageState();
|
||||
}
|
||||
|
||||
class _SelectBorrowReturnPageState extends State<SelectBorrowReturnPage> {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return BeeScaffold(
|
||||
title: '借还管理',
|
||||
body: ListView(
|
||||
padding: EdgeInsets.symmetric(vertical: 40.w, horizontal: 36.w),
|
||||
children: [
|
||||
_buidTile(R.ASSETS_ICONS_GOODS_BORROW_PNG, '物品出借', true),
|
||||
_buidTile(R.ASSETS_ICONS_GOODS_RETURN_PNG, '物品归还', false),
|
||||
].sepWidget(separate: 20.w.heightBox),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _buidTile(String iconPath, String text, bool isBorrow) {
|
||||
return Row(
|
||||
children: [
|
||||
SizedBox(
|
||||
width: 32.w,
|
||||
height: 32.w,
|
||||
child: Image.asset(iconPath),
|
||||
),
|
||||
28.w.widthBox,
|
||||
text.text.black.size(30.sp).make(),
|
||||
Spacer(),
|
||||
Icon(
|
||||
CupertinoIcons.chevron_forward,
|
||||
size: 32.w,
|
||||
),
|
||||
],
|
||||
)
|
||||
.box
|
||||
.color(Colors.white)
|
||||
.padding(EdgeInsets.symmetric(vertical: 40.w, horizontal: 32.w))
|
||||
.withRounded(value: 8.w)
|
||||
.make()
|
||||
.onInkTap(() {
|
||||
Get.to(
|
||||
() => GoodsManagePage(
|
||||
isBorrow: isBorrow,
|
||||
),
|
||||
);
|
||||
});
|
||||
}
|
||||
}
|
||||
Loading…
Reference in new issue