xt / Flutter-ReserveApp · Commits

Go to a project

Commit 1f5fcf556094b66afef62ed70ab207297fb7d532

Authored by wdn127929
1 parent 8db668e9
build: skipped

搜索历史记录人展示客情经理信息

Inline Side-by-side
Showing 7 changed files with 124 additions and 66 deletions
@@ -23,6 +23,12 @@ class UserHistoryEntity extends Object with ISuspensionBean { @@ -23,6 +23,12 @@ class UserHistoryEntity extends Object with ISuspensionBean {
23 @JsonKey(name: 'cusdem') 23 @JsonKey(name: 'cusdem')
24 String cusdem; 24 String cusdem;
25 25
  26 + @JsonKey(name: 'nick_name')
  27 + String nickName;
  28 +
  29 + @JsonKey(name: 'uid')
  30 + String uid;
  31 +
26 List<String> pinyinList; //全拼数组 32 List<String> pinyinList; //全拼数组
27 String pinyin; //全拼字母 33 String pinyin; //全拼字母
28 String pinyinFirst; //首字母 34 String pinyinFirst; //首字母
@@ -57,6 +63,8 @@ class UserHistoryEntity extends Object with ISuspensionBean { @@ -57,6 +63,8 @@ class UserHistoryEntity extends Object with ISuspensionBean {
57 this.sex, 63 this.sex,
58 this.phone, 64 this.phone,
59 this.cusdem, 65 this.cusdem,
  66 + this.nickName,
  67 + this.uid
60 ); 68 );
61 69
62 factory UserHistoryEntity.fromJson(Map<String, dynamic> srcJson) => 70 factory UserHistoryEntity.fromJson(Map<String, dynamic> srcJson) =>
@@ -8,12 +8,15 @@ part of 'user_history_entity.dart'; @@ -8,12 +8,15 @@ part of 'user_history_entity.dart';
8 8
9 UserHistoryEntity _$UserHistoryEntityFromJson(Map<String, dynamic> json) { 9 UserHistoryEntity _$UserHistoryEntityFromJson(Map<String, dynamic> json) {
10 return UserHistoryEntity( 10 return UserHistoryEntity(
11 - json['id'] as String,  
12 - json['sid'] as String,  
13 - json['rname'] as String,  
14 - json['sex'] as String,  
15 - json['phone'] as String ?? '0',  
16 - json['cusdem'] as String); 11 + json['id'] as String,
  12 + json['sid'] as String,
  13 + json['rname'] as String,
  14 + json['sex'] as String,
  15 + json['phone'] as String ?? '0',
  16 + json['cusdem'] as String,
  17 + json['nick_name'] as String ?? '',
  18 + json['uid'] as String,
  19 + );
17 } 20 }
18 21
19 Map<String, dynamic> _$UserHistoryEntityToJson(UserHistoryEntity instance) => 22 Map<String, dynamic> _$UserHistoryEntityToJson(UserHistoryEntity instance) =>
@@ -23,5 +26,7 @@ Map<String, dynamic> _$UserHistoryEntityToJson(UserHistoryEntity instance) => @@ -23,5 +26,7 @@ Map<String, dynamic> _$UserHistoryEntityToJson(UserHistoryEntity instance) =>
23 'rname': instance.rname, 26 'rname': instance.rname,
24 'sex': instance.sex, 27 'sex': instance.sex,
25 'phone': instance.phone, 28 'phone': instance.phone,
26 - 'cusdem': instance.cusdem 29 + 'cusdem': instance.cusdem,
  30 + 'nick_name': instance.nickName,
  31 + 'uid': instance.uid
27 }; 32 };
@@ -48,7 +48,6 @@ class _EditReserverPageState extends State<EditReserverPage> { @@ -48,7 +48,6 @@ class _EditReserverPageState extends State<EditReserverPage> {
48 48
49 ScrollController _scrollCrl = ScrollController(); 49 ScrollController _scrollCrl = ScrollController();
50 50
51 -  
52 @override 51 @override
53 void initState() { 52 void initState() {
54 super.initState(); 53 super.initState();
@@ -696,31 +695,34 @@ class _EditReserverPageState extends State<EditReserverPage> { @@ -696,31 +695,34 @@ class _EditReserverPageState extends State<EditReserverPage> {
696 2)) 695 2))
697 : BorderSide 696 : BorderSide
698 .none)), 697 .none)),
699 - child: Row(  
700 - mainAxisAlignment:  
701 - MainAxisAlignment  
702 - .spaceBetween, 698 + child: Wrap(
  699 + // mainAxisAlignment:
  700 + // MainAxisAlignment
  701 + // .spaceBetween,
  702 + runAlignment: WrapAlignment.center,
703 children: [ 703 children: [
704 Text( 704 Text(
705 - _nameNode.hasFocus ? ( detailModel 705 + _nameNode.hasFocus
  706 + ? (detailModel
  707 + .userHistorys[
  708 + index]
  709 + .rnameStr ==
  710 + null
  711 + ? ''
  712 + : detailModel
706 .userHistorys[ 713 .userHistorys[
707 index] 714 index]
708 - .rnameStr ==  
709 - null  
710 - ? ''  
711 - : detailModel  
712 - .userHistorys[  
713 - index]  
714 - .rnameStr): ( detailModel 715 + .rnameStr)
  716 + : (detailModel
  717 + .userHistorys[
  718 + index]
  719 + .phone ==
  720 + null
  721 + ? ''
  722 + : detailModel
715 .userHistorys[ 723 .userHistorys[
716 index] 724 index]
717 - .phone ==  
718 - null  
719 - ? ''  
720 - : detailModel  
721 - .userHistorys[  
722 - index]  
723 - .phone), 725 + .phone),
724 style: TextStyle( 726 style: TextStyle(
725 color: MyColours 727 color: MyColours
726 .color_333333, 728 .color_333333,
@@ -729,34 +731,47 @@ class _EditReserverPageState extends State<EditReserverPage> { @@ -729,34 +731,47 @@ class _EditReserverPageState extends State<EditReserverPage> {
729 .setSp(32)), 731 .setSp(32)),
730 ), 732 ),
731 HEmptyView(20), 733 HEmptyView(20),
732 - Expanded(  
733 - child: Text(  
734 - _nameNode.hasFocus ?(detailModel 734 + Text(
  735 + _nameNode.hasFocus
  736 + ? (detailModel
  737 + .userHistorys[
  738 + index]
  739 + .phone ==
  740 + null
  741 + ? ''
  742 + : detailModel
735 .userHistorys[ 743 .userHistorys[
736 index] 744 index]
737 - .phone ==  
738 - null  
739 - ? ''  
740 - : detailModel  
741 - .userHistorys[  
742 - index]  
743 - .phone):( detailModel 745 + .phone)
  746 + : (detailModel
  747 + .userHistorys[
  748 + index]
  749 + .rnameStr ==
  750 + null
  751 + ? ''
  752 + : detailModel
744 .userHistorys[ 753 .userHistorys[
745 index] 754 index]
746 - .rnameStr ==  
747 - null  
748 - ? ''  
749 - : detailModel  
750 - .userHistorys[  
751 - index]  
752 - .rnameStr) , 755 + .rnameStr),
  756 + style: TextStyle(
  757 + color: MyColours
  758 + .color_333333,
  759 + fontSize:
  760 + ScreenUtil()
  761 + .setSp(32)),
  762 + ),
  763 + HEmptyView(20),
  764 + Text(
  765 + detailModel
  766 + .userHistorys[index]
  767 + .nickName,
753 style: TextStyle( 768 style: TextStyle(
754 color: MyColours 769 color: MyColours
755 .color_333333, 770 .color_333333,
756 fontSize: 771 fontSize:
757 ScreenUtil() 772 ScreenUtil()
758 .setSp(32)), 773 .setSp(32)),
759 - )) 774 + ),
760 ], 775 ],
761 ), 776 ),
762 ), 777 ),
@@ -1970,10 +1970,12 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> { @@ -1970,10 +1970,12 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> {
1970 .setWidth( 1970 .setWidth(
1971 2)) 1971 2))
1972 : BorderSide.none)), 1972 : BorderSide.none)),
1973 - child: Row(  
1974 - mainAxisAlignment:  
1975 - MainAxisAlignment  
1976 - .spaceBetween, 1973 + child: Wrap(
  1974 + // mainAxisAlignment:
  1975 + // MainAxisAlignment
  1976 + // .spaceBetween,
  1977 + runAlignment:
  1978 + WrapAlignment.center,
1977 children: [ 1979 children: [
1978 Text( 1980 Text(
1979 _nameNode.hasFocus 1981 _nameNode.hasFocus
@@ -1990,8 +1992,7 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> { @@ -1990,8 +1992,7 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> {
1990 .setSp(32)), 1992 .setSp(32)),
1991 ), 1993 ),
1992 HEmptyView(20), 1994 HEmptyView(20),
1993 - Expanded(  
1994 - child: Text( 1995 + Text(
1995 _nameNode.hasFocus 1996 _nameNode.hasFocus
1996 ? _notebookDetailChangeModel 1997 ? _notebookDetailChangeModel
1997 .userHistorys[index] 1998 .userHistorys[index]
@@ -2004,7 +2005,18 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> { @@ -2004,7 +2005,18 @@ class _NoteBookChangeFPageState extends State<NoteBookChangeFPage> {
2004 .color_333333, 2005 .color_333333,
2005 fontSize: ScreenUtil() 2006 fontSize: ScreenUtil()
2006 .setSp(32)), 2007 .setSp(32)),
2007 - )) 2008 + ),
  2009 + HEmptyView(20),
  2010 + Text(
  2011 + _notebookDetailChangeModel
  2012 + .userHistorys[index]
  2013 + .nickName,
  2014 + style: TextStyle(
  2015 + color: MyColours
  2016 + .color_333333,
  2017 + fontSize: ScreenUtil()
  2018 + .setSp(32)),
  2019 + ),
2008 ], 2020 ],
2009 ), 2021 ),
2010 ), 2022 ),
@@ -2514,9 +2514,8 @@ class InvicationPageState extends State<InvicationPage> @@ -2514,9 +2514,8 @@ class InvicationPageState extends State<InvicationPage>
2514 width: ScreenUtil() 2514 width: ScreenUtil()
2515 .setWidth(2)) 2515 .setWidth(2))
2516 : BorderSide.none)), 2516 : BorderSide.none)),
2517 - child: Row(  
2518 - mainAxisAlignment:  
2519 - MainAxisAlignment.spaceBetween, 2517 + child: Wrap(
  2518 + runAlignment: WrapAlignment.center,
2520 children: [ 2519 children: [
2521 Text( 2520 Text(
2522 _nameNode.hasFocus 2521 _nameNode.hasFocus
@@ -2545,8 +2544,7 @@ class InvicationPageState extends State<InvicationPage> @@ -2545,8 +2544,7 @@ class InvicationPageState extends State<InvicationPage>
2545 ScreenUtil().setSp(32)), 2544 ScreenUtil().setSp(32)),
2546 ), 2545 ),
2547 HEmptyView(20), 2546 HEmptyView(20),
2548 - Expanded(  
2549 - child: Text( 2547 + Text(
2550 _nameNode.hasFocus 2548 _nameNode.hasFocus
2551 ? (_baseIndoProvider 2549 ? (_baseIndoProvider
2552 .userHistorys[ 2550 .userHistorys[
@@ -2571,7 +2569,18 @@ class InvicationPageState extends State<InvicationPage> @@ -2571,7 +2569,18 @@ class InvicationPageState extends State<InvicationPage>
2571 MyColours.color_333333, 2569 MyColours.color_333333,
2572 fontSize: 2570 fontSize:
2573 ScreenUtil().setSp(32)), 2571 ScreenUtil().setSp(32)),
2574 - )) 2572 + ),
  2573 + HEmptyView(20),
  2574 + Text(
  2575 + _baseIndoProvider
  2576 + .userHistorys[index]
  2577 + .nickName,
  2578 + style: TextStyle(
  2579 + color:
  2580 + MyColours.color_333333,
  2581 + fontSize:
  2582 + ScreenUtil().setSp(32)),
  2583 + ),
2575 ], 2584 ],
2576 ), 2585 ),
2577 ), 2586 ),
@@ -95,7 +95,7 @@ class _ContantRightPageState extends State<ContantRightPage> { @@ -95,7 +95,7 @@ class _ContantRightPageState extends State<ContantRightPage> {
95 _contacts[i].phones == null 95 _contacts[i].phones == null
96 ? '' 96 ? ''
97 : _contacts[i].phones.first.value.replaceAll(' ', ''), 97 : _contacts[i].phones.first.value.replaceAll(' ', ''),
98 - ''); 98 + '','','');
99 item.pinyin = _contacts[i].displayName == null 99 item.pinyin = _contacts[i].displayName == null
100 ? '' 100 ? ''
101 : PinyinHelper.getPinyin(_contacts[i].displayName) 101 : PinyinHelper.getPinyin(_contacts[i].displayName)
@@ -1334,10 +1334,9 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -1334,10 +1334,9 @@ class TableManagerPageState extends State<TableManagerPage> {
1334 width: ScreenUtil() 1334 width: ScreenUtil()
1335 .setWidth(2)) 1335 .setWidth(2))
1336 : BorderSide.none)), 1336 : BorderSide.none)),
1337 - child: Row(  
1338 - mainAxisAlignment:  
1339 - MainAxisAlignment  
1340 - .spaceBetween, 1337 + child: Wrap(
  1338 + runAlignment:
  1339 + WrapAlignment.center,
1341 children: [ 1340 children: [
1342 Text( 1341 Text(
1343 _nameNode.hasFocus 1342 _nameNode.hasFocus
@@ -1368,8 +1367,7 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -1368,8 +1367,7 @@ class TableManagerPageState extends State<TableManagerPage> {
1368 .setSp(32)), 1367 .setSp(32)),
1369 ), 1368 ),
1370 HEmptyView(20), 1369 HEmptyView(20),
1371 - Expanded(  
1372 - child: Text( 1370 + Text(
1373 _nameNode.hasFocus 1371 _nameNode.hasFocus
1374 ? (_baseIndoProvider 1372 ? (_baseIndoProvider
1375 .userHistorys[ 1373 .userHistorys[
@@ -1396,7 +1394,18 @@ class TableManagerPageState extends State<TableManagerPage> { @@ -1396,7 +1394,18 @@ class TableManagerPageState extends State<TableManagerPage> {
1396 .color_333333, 1394 .color_333333,
1397 fontSize: ScreenUtil() 1395 fontSize: ScreenUtil()
1398 .setSp(32)), 1396 .setSp(32)),
1399 - )) 1397 + ),
  1398 + HEmptyView(20),
  1399 + Text(
  1400 + _baseIndoProvider
  1401 + .userHistorys[index]
  1402 + .nickName,
  1403 + style: TextStyle(
  1404 + color: MyColours
  1405 + .color_333333,
  1406 + fontSize: ScreenUtil()
  1407 + .setSp(32)),
  1408 + ),
1400 ], 1409 ],
1401 ), 1410 ),
1402 ), 1411 ),