update carton list and editor

This commit is contained in:
tzw
2024-02-01 18:07:40 +06:30
parent eff1ae4688
commit 24f2dc110c
20 changed files with 1951 additions and 954 deletions

View File

@@ -1,6 +1,5 @@
import 'package:fcs/domain/entities/carton.dart';
import 'package:fcs/helpers/theme.dart';
import 'package:fcs/pages/main/util.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_vector_icons/flutter_vector_icons.dart';
@@ -29,11 +28,11 @@ class CartonListRow extends StatelessWidget {
children: <Widget>[
Expanded(
child: new Padding(
padding: const EdgeInsets.symmetric(vertical: 13.0),
padding: const EdgeInsets.symmetric(vertical: 8.0),
child: new Row(
children: <Widget>[
Container(
padding: EdgeInsets.only(left: 5, right: 10),
padding: EdgeInsets.only(left: 5),
child: Icon(
MaterialCommunityIcons.package,
color: primaryColor,
@@ -41,26 +40,33 @@ class CartonListRow extends StatelessWidget {
),
),
new Expanded(
child: new Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Padding(
padding: const EdgeInsets.only(left: 8.0),
child: new Text(
box.cartonNumber ?? "",
style: new TextStyle(
fontSize: 15.0, color: Colors.black),
child: Padding(
padding: const EdgeInsets.only(left: 18.0),
child: Row(
children: [
new Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
new Text(
box.cartonNumber ?? "",
style: new TextStyle(
fontSize: 15.0, color: Colors.black),
),
Padding(
padding: const EdgeInsets.only(top: 5),
child: new Text(
box.userName ?? "",
style: new TextStyle(
fontSize: 15.0, color: Colors.grey),
),
),
],
),
),
Padding(
padding: const EdgeInsets.only(left: 10.0, top: 10),
child: new Text(
box.userName ?? "",
style: new TextStyle(
fontSize: 15.0, color: Colors.grey),
),
)
],
const SizedBox(width: 15),
IconButton(
onPressed: () {}, icon: Icon(AntDesign.qrcode))
],
),
),
),
],
@@ -68,17 +74,19 @@ class CartonListRow extends StatelessWidget {
),
),
Column(
crossAxisAlignment: CrossAxisAlignment.end,
children: <Widget>[
Text(box.status ?? "",
style: TextStyle(
color: primaryColor,
fontSize: 15,
fontWeight: FontWeight.bold)),
Padding(
padding: const EdgeInsets.all(0),
child: getStatus(box.status ?? ""),
),
Padding(
padding: const EdgeInsets.only(left: 8.0, top: 5, bottom: 5),
padding: const EdgeInsets.only(top: 5),
child: Row(
children: <Widget>[
new Text(
"${box.cartonWeight?.toStringAsFixed(2)} lb",
"${box.cartonWeight.toStringAsFixed(2)} lb",
style:
new TextStyle(fontSize: 15.0, color: Colors.grey),
),