update pages for carton
This commit is contained in:
@@ -37,7 +37,7 @@ class CartonSubmit extends StatelessWidget {
|
||||
final OnPrevious? onPrevious;
|
||||
final bool isNew;
|
||||
const CartonSubmit(
|
||||
{Key? key,
|
||||
{super.key,
|
||||
required this.sender,
|
||||
required this.consingee,
|
||||
required this.billToValue,
|
||||
@@ -53,8 +53,7 @@ class CartonSubmit extends StatelessWidget {
|
||||
this.height = 0,
|
||||
this.cargoTypes = const [],
|
||||
this.surchareItems = const [],
|
||||
this.isNew = true})
|
||||
: super(key: key);
|
||||
this.isNew = true});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
@@ -89,7 +88,7 @@ class CartonSubmit extends StatelessWidget {
|
||||
child: Row(
|
||||
children: [
|
||||
Expanded(
|
||||
child: LocalText(context, 'box.sender.title',
|
||||
child: LocalText(context, 'box.consignee.title',
|
||||
color: primaryColor,
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.normal),
|
||||
@@ -97,7 +96,7 @@ class CartonSubmit extends StatelessWidget {
|
||||
Expanded(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.only(left: 13),
|
||||
child: LocalText(context, 'box.consignee.title',
|
||||
child: LocalText(context, 'box.sender.title',
|
||||
color: primaryColor,
|
||||
fontSize: 16,
|
||||
fontWeight: FontWeight.normal),
|
||||
@@ -115,57 +114,58 @@ class CartonSubmit extends StatelessWidget {
|
||||
padding: const EdgeInsets.all(8.0),
|
||||
child: Row(crossAxisAlignment: CrossAxisAlignment.start, children: [
|
||||
Expanded(
|
||||
child: Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(sender.name ?? "",
|
||||
style: const TextStyle(
|
||||
fontSize: 16.0, fontWeight: FontWeight.w500)),
|
||||
sender.fcsID == null
|
||||
? const SizedBox()
|
||||
: Text(sender.fcsID!,
|
||||
style: const TextStyle(
|
||||
fontSize: 14.0, color: Colors.grey)),
|
||||
],
|
||||
),
|
||||
child: Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(consingee.name ?? "",
|
||||
style: const TextStyle(
|
||||
fontSize: 16.0, fontWeight: FontWeight.w500)),
|
||||
consingee.fcsID == null
|
||||
? const SizedBox()
|
||||
: Text(consingee.fcsID!,
|
||||
style: const TextStyle(
|
||||
fontSize: 14.0, color: Colors.grey)),
|
||||
],
|
||||
),
|
||||
// billToValue == billToSender
|
||||
// ? billWidget(context)
|
||||
// : const SizedBox()
|
||||
],
|
||||
),
|
||||
// billToValue == billToConsignee
|
||||
// ? billWidget(context)
|
||||
// : const SizedBox()
|
||||
],
|
||||
)),
|
||||
Expanded(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.only(left: 15),
|
||||
child: Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(sender.name ?? "",
|
||||
style: const TextStyle(
|
||||
fontSize: 16.0,
|
||||
fontWeight: FontWeight.w500)),
|
||||
sender.fcsID == null
|
||||
? const SizedBox()
|
||||
: Text(sender.fcsID!,
|
||||
style: const TextStyle(
|
||||
fontSize: 14.0, color: Colors.grey)),
|
||||
],
|
||||
),
|
||||
),
|
||||
// billToValue == billToSender
|
||||
// ? billWidget(context)
|
||||
// : const SizedBox()
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
Expanded(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.only(left: 15),
|
||||
child: Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text(consingee.name ?? "",
|
||||
style: const TextStyle(
|
||||
fontSize: 16.0, fontWeight: FontWeight.w500)),
|
||||
consingee.fcsID == null
|
||||
? const SizedBox()
|
||||
: Text(consingee.fcsID!,
|
||||
style: const TextStyle(
|
||||
fontSize: 14.0, color: Colors.grey)),
|
||||
],
|
||||
),
|
||||
),
|
||||
// billToValue == billToConsignee
|
||||
// ? billWidget(context)
|
||||
// : const SizedBox()
|
||||
],
|
||||
),
|
||||
))
|
||||
]),
|
||||
),
|
||||
),
|
||||
|
||||
Reference in New Issue
Block a user