搜索框bug修复

lib/internal/maintenance/page/maintenance_submit_page.dart

@@ -328,6 +328,7 @@ class MaintenanceSubmitPageState extends State<MaintenanceSubmitPage>
           dismissLoading(context);
           deleteJSON("${widget.item.recordId}");
           showAlert(context, "提示", "保存成功", "确定", () {
+            // NavigatorUtils.goBack(context);
             NavigatorUtils.goBack(context);
             NavigatorUtils.goBackWithParams(context, true);
 //            NavigatorUtils.goBack(context);

lib/internal/project/model/project_list_entity.dart

@@ -1,108 +1,107 @@
 import 'package:liftmanager/common/common.dart';
 
 class ProjectListEntity {
+  int pageNum;
+  int pageCount;
+  int total;
+  int pageSize;
+  bool hasNext;
+  bool hasPrev;
+  List<ProjectListItem> rows;
 
-	int pageNum;
-	int pageCount;
-	int total;
-	int pageSize;
-	bool hasNext;
-	bool hasPrev;
-	List<ProjectListItem> rows;
+  ProjectListEntity.fromJsonMap(Map<String, dynamic> map)
+      : pageNum = map["pageNum"],
+        pageCount = map["pageCount"],
+        total = map["total"],
+        pageSize = map["pageSize"],
+        hasNext = map["hasNext"],
+        hasPrev = map["hasPrev"],
+        rows = List<ProjectListItem>.from(
+            map["rows"].map((it) => ProjectListItem.fromJsonMap(it ?? {})));
 
-	ProjectListEntity.fromJsonMap(Map<String, dynamic> map):
-				pageNum = map["pageNum"],
-				pageCount = map["pageCount"],
-				total = map["total"],
-				pageSize = map["pageSize"],
-				hasNext = map["hasNext"],
-				hasPrev = map["hasPrev"],
-				rows = List<ProjectListItem>.from(map["rows"].map((it) => ProjectListItem.fromJsonMap(it??{})));
-
-	Map<String, dynamic> toJson() {
-		final Map<String, dynamic> data = new Map<String, dynamic>();
-		data['pageNum'] = pageNum;
-		data['pageCount'] = pageCount;
-		data['total'] = total;
-		data['pageSize'] = pageSize;
-		data['hasNext'] = hasNext;
-		data['hasPrev'] = hasPrev;
-		data['rows'] = rows != null ?
-		this.rows.map((v) => v.toJson()).toList()
-				: null;
-		return data;
-	}
+  Map<String, dynamic> toJson() {
+    final Map<String, dynamic> data = new Map<String, dynamic>();
+    data['pageNum'] = pageNum;
+    data['pageCount'] = pageCount;
+    data['total'] = total;
+    data['pageSize'] = pageSize;
+    data['hasNext'] = hasNext;
+    data['hasPrev'] = hasPrev;
+    data['rows'] =
+        rows != null ? this.rows.map((v) => v.toJson()).toList() : null;
+    return data;
+  }
 }
 
-
 class ProjectListItem {
-	String projectId;
-	String projectName;
-	String projectCode;
-	int projectUsage;
-	String address;
-	String actualNum;
-	String province;
-	String city;
-	String district;
-	String startDate;
-	String endDate;
-	String companyName;
-	String companyContact;
-	String telephone;
-	String areaDirector;
-	String areaName;
-	String regionId;
-	String clerkName;
-
-	getProjectUsageName(){
-		try{
-			return Constant.projectUsageText[projectUsage];
-		}catch(e){
-			return "";
-		}
-
-	}
-	ProjectListItem.fromJsonMap(Map<String, dynamic> map):
-				projectId = map["projectId"]??"",
-				projectName = map["projectName"]??"",
-				projectCode = map["projectCode"]??"",
-				projectUsage = map["projectUsage"]??0,
-				address = map["address"]??"",
-				actualNum = map["actualNum"].toString()??"",
-				province = map["province"]??"",
-				city = map["city"]??"",
-				district = map["district"]??"",
-				startDate = map["startDate"]??"",
-				endDate = map["endDate"]??"",
-				companyName = map["companyName"]??"",
-				companyContact = map["companyContact"]??"",
-				telephone = map["telephone"]??"",
-				areaDirector = map["areaDirector"]??"",
-				areaName = map["areaName"]??"",
-				regionId = map["regionId"]??"",
-				clerkName = map["clerkName"]??"";
+  String projectId;
+  String projectName;
+  String projectCode;
+  int projectUsage;
+  String address;
+  String actualNum;
+  String province;
+  String city;
+  String district;
+  String startDate;
+  String endDate;
+  String companyName;
+  String companyContact;
+  String telephone;
+  String areaDirector;
+  String areaName;
+  String regionId;
+  String clerkName;
+  String directorName;
 
-	Map<String, dynamic> toJson() {
-		final Map<String, dynamic> data = new Map<String, dynamic>();
-		data['projectName'] = projectName;
-		data['projectUsage'] = projectUsage;
-		data['address'] = address;
-		data['actualNum'] = actualNum;
-		data['province'] = province;
-		data['city'] = city;
-		data['district'] = district;
-		data['startDate'] = startDate;
-		data['endDate'] = endDate;
-		data['companyName'] = companyName;
-		data['companyContact'] = companyContact;
-		data['telephone'] = telephone;
-		data['areaDirector'] = areaDirector;
-		data['areaName'] = areaName;
-		data['regionId'] = regionId;
-		data['clerkName'] = clerkName;
-		return data;
-	}
+  getProjectUsageName() {
+    try {
+      return Constant.projectUsageText[projectUsage];
+    } catch (e) {
+      return "";
+    }
+  }
 
+  ProjectListItem.fromJsonMap(Map<String, dynamic> map)
+      : projectId = map["projectId"] ?? "",
+        projectName = map["projectName"] ?? "",
+        projectCode = map["projectCode"] ?? "",
+        projectUsage = map["projectUsage"] ?? 0,
+        address = map["address"] ?? "",
+        actualNum = map["actualNum"].toString() ?? "",
+        province = map["province"] ?? "",
+        city = map["city"] ?? "",
+        district = map["district"] ?? "",
+        startDate = map["startDate"] ?? "",
+        endDate = map["endDate"] ?? "",
+        companyName = map["companyName"] ?? "",
+        companyContact = map["companyContact"] ?? "",
+        telephone = map["telephone"] ?? "",
+        areaDirector = map["areaDirector"] ?? "",
+        areaName = map["areaName"] ?? "",
+        regionId = map["regionId"] ?? "",
+        clerkName = map["clerkName"] ?? "",
+        directorName = map['directorName'] ?? '';
 
+  Map<String, dynamic> toJson() {
+    final Map<String, dynamic> data = new Map<String, dynamic>();
+    data['projectName'] = projectName;
+    data['projectUsage'] = projectUsage;
+    data['address'] = address;
+    data['actualNum'] = actualNum;
+    data['province'] = province;
+    data['city'] = city;
+    data['district'] = district;
+    data['startDate'] = startDate;
+    data['endDate'] = endDate;
+    data['companyName'] = companyName;
+    data['companyContact'] = companyContact;
+    data['telephone'] = telephone;
+    data['areaDirector'] = areaDirector;
+    data['areaName'] = areaName;
+    data['regionId'] = regionId;
+    data['clerkName'] = clerkName;
+    data['directorName'] = directorName;
+    return data;
+  }
 }

lib/internal/project/page/project_list_page.dart

@@ -160,7 +160,8 @@ class ProjectListPageState
                                           color: Colours.dark_line_bg,
                                           child: Column(
                                             children: [
-                                              lineTxt("区域主管", "???"),
+                                              lineTxt("区域主管",
+                                                  "${provider.list[index].directorName}"),
                                               lineTxt(
                                                 "项目用途",
                                                 "${provider.list[index].getProjectUsageName()}",

lib/internal/repair/page/repair_select_project_page.dart

@@ -163,7 +163,7 @@ class RepairSelectProjectPageState extends BasePageState<
                                       color: Colours.dark_line_bg,
                                       child: Column(
                                         children: [
-                                          lineTxt("区域主管", "???"),
+                                          lineTxt("区域主管","${provider.list[index].directorName}"),
                                           lineTxt(
                                             "项目用途",
                                             "${provider.list[index].getProjectUsageName()}",

lib/widgets/app_search_bar.dart

@@ -200,6 +200,7 @@ class _SearchAppBar2State extends State<SearchAppBar2> {
                 searchText: searchText,
                 onPressed: (text) {
                   searchText = text;
+                  setState(() {});
                   widget.onPressed(text);
                 },
               ),

lib/widgets/search_app_bar.dart

@@ -91,6 +91,11 @@ class _SearchAppBarState extends State<SearchAppBar> {
                         controller: _controller,
                         maxLines: 1,
                         style: TextStyle(fontSize: 14),
+                        // textInputAction:'',
+                        onSubmitted: (value) {
+                          widget.onPressed(_controller.text);
+                          FocusScope.of(context).requestFocus(FocusNode());
+                        },
                         decoration: InputDecoration(
                           contentPadding: const EdgeInsets.only(
                               top: -3.0,