diff --git a/lib/screens/inventory_inout/components/inventory_inout_card.dart b/lib/screens/inventory_inout/components/inventory_inout_card.dart index 496f66b..c532a15 100644 --- a/lib/screens/inventory_inout/components/inventory_inout_card.dart +++ b/lib/screens/inventory_inout/components/inventory_inout_card.dart @@ -160,7 +160,7 @@ class InventoryInoutCard extends StatelessWidget { Widget buildContent() { return Column( - mainAxisAlignment: MainAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.start, children: [ Row( @@ -178,6 +178,7 @@ class InventoryInoutCard extends StatelessWidget { buildInOrOut() ], ), + Spacer(), Text( controller.list[ind][index].product?.company?.name ?? '-', style: TextStyle( @@ -192,7 +193,7 @@ class InventoryInoutCard extends StatelessWidget { children: [ Expanded( child: Text( - '项目: ${controller.list[ind][index].project?.name}', + '${controller.list[ind][index].project?.name}', style: TextStyle( fontWeight: FontWeight.w600, fontSize: ScreenAdaper.height(20)), @@ -207,17 +208,17 @@ class InventoryInoutCard extends StatelessWidget { children: [ Expanded( child: Text( - '数量: ${controller.list[ind][index].quantity} ${controller.list[ind][index].product?.unit?.label ?? '-'}', + '${controller.list[ind][index].quantity} ${controller.list[ind][index].product?.unit?.label ?? '-'}', style: TextStyle( fontWeight: FontWeight.w600, - fontSize: ScreenAdaper.height(25)), + fontSize: ScreenAdaper.height(20)), ), ), Text( controller.list[ind][index].agent ?? '-', style: TextStyle( fontWeight: FontWeight.w600, - fontSize: ScreenAdaper.height(25)), + fontSize: ScreenAdaper.height(20)), ), ], ) diff --git a/lib/screens/login/login.dart b/lib/screens/login/login.dart index 39456d0..d9023eb 100644 --- a/lib/screens/login/login.dart +++ b/lib/screens/login/login.dart @@ -174,16 +174,17 @@ class LoginScreen extends StatelessWidget { Widget buildUserNameInput() { return TextFormField( // 英文数字键盘 - keyboardType: TextInputType.text, + // keyboardType: TextInputType.url, decoration: InputDecoration( prefixIcon: Icon( Icons.person_2_outlined, size: ScreenAdaper.height(40), ), errorStyle: TextStyle(fontSize: ScreenAdaper.height(20)), - // contentPadding: EdgeInsets.symmetric( - // horizontal: ScreenAdaper.width(30), - // vertical: ScreenAdaper.height(10)), + contentPadding: EdgeInsets.symmetric( + vertical: ScreenAdaper.height(10), + horizontal: ScreenAdaper.width(30), + ), hintText: '用户名', hintStyle: TextStyle(fontSize: ScreenAdaper.height(25)), border: InputBorder.none, diff --git a/lib/screens/new_inventory_inout/components/inventory_search.dart b/lib/screens/new_inventory_inout/components/inventory_search.dart index 5921b43..57053ca 100644 --- a/lib/screens/new_inventory_inout/components/inventory_search.dart +++ b/lib/screens/new_inventory_inout/components/inventory_search.dart @@ -138,14 +138,14 @@ class InventorySearch extends StatelessWidget { 2: FlexColumnWidth(ScreenAdaper.screenShortDistance() / 4), 3: MinColumnWidth( FixedColumnWidth( - ScreenAdaper.screenShortDistance() / 8), + ScreenAdaper.screenShortDistance() / 5), FixedColumnWidth( - ScreenAdaper.screenShortDistance() / 8)), + ScreenAdaper.screenShortDistance() / 5)), 4: MinColumnWidth( FixedColumnWidth( - ScreenAdaper.screenShortDistance() / 8), + ScreenAdaper.screenShortDistance() / 6), FixedColumnWidth( - ScreenAdaper.screenShortDistance() / 8)), + ScreenAdaper.screenShortDistance() / 6)), }, children: [ // table header TableRow( @@ -270,10 +270,11 @@ class InventorySearch extends StatelessWidget { } if (onInventorySelected != null) onInventorySelected!(itemData); }, - child: Container( - constraints: BoxConstraints(minHeight: ScreenAdaper.height(80)), - alignment: alignment ?? Alignment.centerLeft, - child: child), + child: AbsorbPointer( + child: Container( + constraints: BoxConstraints(minHeight: ScreenAdaper.height(80)), + alignment: alignment ?? Alignment.centerLeft, + child: child)), ), ); } diff --git a/lib/widgets/core/zt_search_select.dart b/lib/widgets/core/zt_search_select.dart index e372aa8..3ab8025 100644 --- a/lib/widgets/core/zt_search_select.dart +++ b/lib/widgets/core/zt_search_select.dart @@ -43,9 +43,6 @@ class ZtSearchSelect extends StatelessWidget { return TextFormField( focusNode: focusNode, controller: _, - onTapOutside: (event) { - FocusScope.of(context).unfocus(); - }, decoration: InputDecoration( focusedBorder: OutlineInputBorder( borderSide: const BorderSide(