sainw/fcs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
tzw
2024-02-07 17:32:39 +06:30
parent d1f0eff0b0
commit 324981bd6c
2 changed files with 32 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
lib/pages/carton/carton_image_upload.dart
View File

@@ -1,21 +1,11 @@
import 'package:fcs/domain/entities/carton.dart'; import 'package:fcs/domain/entities/carton.dart';
import 'package:fcs/domain/entities/package.dart';
import 'package:fcs/domain/entities/user.dart';
import 'package:fcs/helpers/theme.dart'; import 'package:fcs/helpers/theme.dart';
import 'package:fcs/pages/main/util.dart';
import 'package:fcs/pages/package/model/package_model.dart';
import 'package:fcs/pages/user_search/user_serach.dart';
import 'package:fcs/pages/widgets/barcode_scanner.dart';
import 'package:fcs/pages/widgets/display_text.dart';
import 'package:fcs/pages/widgets/fcs_id_icon.dart';
import 'package:fcs/pages/widgets/input_text.dart';
import 'package:fcs/pages/widgets/local_app_bar.dart'; import 'package:fcs/pages/widgets/local_app_bar.dart';
import 'package:fcs/pages/widgets/multi_img_controller.dart'; import 'package:fcs/pages/widgets/multi_img_controller.dart';
import 'package:fcs/pages/widgets/multi_img_file.dart';
import 'package:fcs/pages/widgets/progress.dart'; import 'package:fcs/pages/widgets/progress.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
typedef void FindCallBack(); typedef void FindCallBack();
class CartonImageUpload extends StatefulWidget { class CartonImageUpload extends StatefulWidget {
@@ -26,9 +16,9 @@ class CartonImageUpload extends StatefulWidget {
} }
class _CartonImageUploaState extends State<CartonImageUpload> { class _CartonImageUploaState extends State<CartonImageUpload> {
bool _isLoading = false; bool _isLoading = false;
Carton? _box; Carton? _box;
late bool _isNew;
MultiImgController multiImgController = MultiImgController(); MultiImgController multiImgController = MultiImgController();
@override @override
@@ -42,35 +32,30 @@ class _CartonImageUploaState extends State<CartonImageUpload> {
return LocalProgress( return LocalProgress(
inAsyncCall: _isLoading, inAsyncCall: _isLoading,
child: Scaffold( child: Scaffold(
appBar: LocalAppBar( appBar: LocalAppBar(
labelKey: "box.imageupload.title", labelKey: "box.imageupload.title",
backgroundColor: Colors.white, backgroundColor: Colors.white,
labelColor: primaryColor, labelColor: primaryColor,
arrowColor: primaryColor, arrowColor: primaryColor,
actions: [] actions: []
// isEdiable // isEdiable
// ? <Widget>[ // ? <Widget>[
// IconButton( // IconButton(
// icon: Icon(Icons.edit, color: primaryColor), // icon: Icon(Icons.edit, color: primaryColor),
// onPressed: _gotoEditor, // onPressed: _gotoEditor,
// ), // ),
// IconButton( // IconButton(
// icon: Icon(Icons.delete, color: primaryColor), // icon: Icon(Icons.delete, color: primaryColor),
// onPressed: _delete, // onPressed: _delete,
// ), // ),
// ] // ]
// : [], // : [],
), ),
body: ListView( body: ListView(
children: [ children: [
//img
//img ],
], )));
)
)
);
} }
// final img = MultiImageFile( // final img = MultiImageFile(
// enabled: true, // enabled: true,

17
lib/pages/carton/carton_info.dart
View File

@@ -2,39 +2,28 @@ import 'package:fcs/domain/constants.dart';
import 'package:fcs/domain/entities/cargo_type.dart'; import 'package:fcs/domain/entities/cargo_type.dart';
import 'package:fcs/domain/entities/carton.dart'; import 'package:fcs/domain/entities/carton.dart';
import 'package:fcs/domain/entities/package.dart'; import 'package:fcs/domain/entities/package.dart';
import 'package:fcs/domain/entities/pickup.dart';
import 'package:fcs/domain/vo/delivery_address.dart';
import 'package:fcs/helpers/theme.dart'; import 'package:fcs/helpers/theme.dart';
import 'package:fcs/pages/carton/carton_image_upload.dart'; import 'package:fcs/pages/carton/carton_image_upload.dart';
import 'package:fcs/pages/carton_size/model/carton_size_model.dart'; import 'package:fcs/pages/carton_size/model/carton_size_model.dart';
import 'package:fcs/pages/main/util.dart'; import 'package:fcs/pages/main/util.dart';
import 'package:fcs/pages/package/model/package_model.dart'; import 'package:fcs/pages/package/model/package_model.dart';
import 'package:fcs/pages/rates/model/shipment_rate_model.dart'; import 'package:fcs/pages/rates/model/shipment_rate_model.dart';
import 'package:fcs/pages/widgets/defalut_delivery_address.dart';
import 'package:fcs/pages/widgets/display_text.dart'; import 'package:fcs/pages/widgets/display_text.dart';
import 'package:fcs/pages/widgets/fcs_id_icon.dart';
import 'package:fcs/pages/widgets/length_picker.dart'; import 'package:fcs/pages/widgets/length_picker.dart';
import 'package:fcs/pages/widgets/local_app_bar.dart'; import 'package:fcs/pages/widgets/local_app_bar.dart';
import 'package:fcs/pages/widgets/local_radio_buttons.dart';
import 'package:fcs/pages/widgets/local_text.dart'; import 'package:fcs/pages/widgets/local_text.dart';
import 'package:fcs/pages/widgets/local_title.dart';
import 'package:fcs/pages/widgets/multi_img_controller.dart'; import 'package:fcs/pages/widgets/multi_img_controller.dart';
import 'package:fcs/pages/widgets/multi_img_file.dart'; import 'package:fcs/pages/widgets/multi_img_file.dart';
import 'package:fcs/pages/widgets/progress.dart'; import 'package:fcs/pages/widgets/progress.dart';
import 'package:fcs/pages/widgets/status_tree.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_vector_icons/flutter_vector_icons.dart'; import 'package:flutter_vector_icons/flutter_vector_icons.dart';
import 'package:image_picker/image_picker.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'cargo_table.dart';
import 'carton_editor.dart'; import 'carton_editor.dart';
import 'carton_package_table.dart';
import 'carton_row.dart'; import 'carton_row.dart';
import 'model/carton_model.dart'; import 'model/carton_model.dart';
import 'widgets.dart';
final DateFormat dateFormat = DateFormat("d MMM yyyy"); final DateFormat dateFormat = DateFormat("d MMM yyyy");
final NumberFormat numberFormatter = NumberFormat("#,###"); final NumberFormat numberFormatter = NumberFormat("#,###");
@@ -55,7 +44,7 @@ class _CartonInfoState extends State<CartonInfo> {
DeliveryAddress? _deliveryAddress = new DeliveryAddress(); // DeliveryAddress? _deliveryAddress = new DeliveryAddress();
MultiImgController multiImgController = MultiImgController(); MultiImgController multiImgController = MultiImgController();
TextEditingController _widthController = new TextEditingController(); TextEditingController _widthController = new TextEditingController();
TextEditingController _heightController = new TextEditingController(); TextEditingController _heightController = new TextEditingController();
@@ -97,7 +86,7 @@ final List<CargoType> surchareItems=[];
_heightController.text = _box!.height.toString(); _heightController.text = _box!.height.toString();
_lengthController.text = _box!.length.toString(); _lengthController.text = _box!.length.toString();
_cartonSizeController.text = _box!.cartonSizeName ?? ""; _cartonSizeController.text = _box!.cartonSizeName ?? "";
_deliveryAddress = _box!.deliveryAddress; // _deliveryAddress = _box!.deliveryAddress;
isMixBox = _box!.cartonType == carton_mix_box; isMixBox = _box!.cartonType == carton_mix_box;
isFromShipments = _box!.cartonType == carton_from_shipments; isFromShipments = _box!.cartonType == carton_from_shipments;
isFromPackages = _box!.cartonType == carton_from_packages; isFromPackages = _box!.cartonType == carton_from_packages;
@@ -179,7 +168,7 @@ final List<CargoType> surchareItems=[];
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
var cartonModel = Provider.of<CartonModel>(context);
double totalWeight = _box!.cargoTypes.fold(0, (sum, value) => sum + value.weight); double totalWeight = _box!.cargoTypes.fold(0, (sum, value) => sum + value.weight);
double totalPieces = surchareItems.fold(0, (sum, value) => sum + value.qty); double totalPieces = surchareItems.fold(0, (sum, value) => sum + value.qty);
// final cartonTypeBox = LocalRadioButtons( // final cartonTypeBox = LocalRadioButtons(