The open source simple and complete warehouse management system is derived from our many years of experience in implementing erp projects. We stripped the original commercial system wms function and opened it up for free, hoping to help the majority of small and medium-sized enterprises. At present, the system supports cross-platform。
Merge branch 'release'
liufu8a08b450f1f8
diff --cc frontend/src/api/wms/deliveryManagement.tsindex 8ac2d32,cb6bc59..c3c8467--- a/frontend/src/api/wms/deliveryManagement.ts+++ b/frontend/src/api/wms/deliveryManagement.ts@@@ -1,221 -1,230 +1,230 @@@-import http from '@/utils/http/request'-import { PageConfigProps } from '@/types/System/Form'-import { addRequestVO, ConfirmOrderVO, PackageVO, WeighVO, DeliveryVO, SignInVO, CancleOrderVO, SetCarrierVO } from '@/types/DeliveryManagement/DeliveryManagement'--// Get Pre shipment-export const getShipment = (data: PageConfigProps) => http({- url: '/dispatchlist/advanced-list',- method: 'post',- data- })--// Get Pre shipment-export const getPreShipment = (data: PageConfigProps) => http({- url: '/dispatchlist/advanced-list',- method: 'post',- data: {- ...data,- sqlTitle: 'dispatch_status=0'- }- })--// Get new shipment-export const getNewShipment = (data: PageConfigProps) => http({- url: '/dispatchlist/advanced-list',- method: 'post',- data: {- ...data,- sqlTitle: 'dispatch_status=1'- }- })--// Get new shipment-export const getGoodsToBePicked = (data: PageConfigProps) => http({- url: '/dispatchlist/list',- method: 'post',- data: {- ...data,- sqlTitle: 'dispatch_status=2'- }- })--// Get To Be Packaged-export const getToBePackaged = (data: PageConfigProps) => http({- url: '/dispatchlist/list',- method: 'post',- data: {- ...data,- sqlTitle: 'to_package'- }- })--// Get picked-export const getPicked = (data: PageConfigProps) => http({- url: '/dispatchlist/list',- method: 'post',- data: {- ...data,- sqlTitle: 'dispatch_status=3'- }- })--// Get Packaged-export const getPackaged = (data: PageConfigProps) => http({- url: '/dispatchlist/list',- method: 'post',- data: {- ...data,- sqlTitle: 'dispatch_status=4'- }- })--// Get To Be Weight-export const getToBeWeighed = (data: PageConfigProps) => http({- url: '/dispatchlist/list',- method: 'post',- data: {- ...data,- sqlTitle: 'to_weight'- }- })--// Get Weight-export const getWeighed = (data: PageConfigProps) => http({- url: '/dispatchlist/list',- method: 'post',- data: {- ...data,- sqlTitle: 'dispatch_status=5'- }- })--// Get To Be Delivery-export const getToBeDelivery = (data: PageConfigProps) => http({- url: '/dispatchlist/list',- method: 'post',- data: {- ...data,- sqlTitle: 'to_delivery'- }- })--// Get Delivery-export const getDelivery = (data: PageConfigProps) => http({- url: '/dispatchlist/list',- method: 'post',- data: {- ...data,- sqlTitle: 'dispatch_status=6'- }- })--// Get Sign In-export const getSignIn = (data: PageConfigProps) => http({- url: '/dispatchlist/list',- method: 'post',- data: {- ...data,- sqlTitle: 'dispatch_status=7'- }- })--// Add-export const addShipment = (data: addRequestVO[]) => http({- url: '/dispatchlist',- method: 'post',- data- })--// Delete-export const delShipment = (dispatch_no: string) => http({- url: '/dispatchlist',- method: 'delete',- params: {- dispatch_no- }- })--// Get order confirmation information-export const getConfirmOrderInfoAndStock = (dispatch_no: string) => http({- url: '/dispatchlist/confirm-check',- method: 'get',- params: {- dispatch_no- }- })--// Confirm orders and create dispatchpicklist-export const confirmOrder = (data: ConfirmOrderVO[]) => http({- url: '/dispatchlist/confirm-order',- method: 'post',- data- })--// Confirm picking-export const confirmPicking = (dispatch_no: string) => http({- url: '/dispatchlist/confirm-pick-dispatchlistno',- method: 'put',- params: {- dispatch_no- }- })--// Pack-export const handlePackage = (data: PackageVO[]) => http({- url: '/dispatchlist/package',- method: 'post',- data- })--// Weigh-export const handleWeigh = (data: WeighVO[]) => http({- url: '/dispatchlist/weight',- method: 'post',- data- })--// Delivery-export const handleDelivery = (data: DeliveryVO[]) => http({- url: '/dispatchlist/delivery',- method: 'post',- data- })--// Sign in-export const handleSignIn = (data: SignInVO[]) => http({- url: '/dispatchlist/sign',- method: 'post',- data- })--// Undo to previous step by detail-export const cancelOrderByDetail = (id: number) => http({- url: '/dispatchlist/cancel-order',- method: 'put',- params: {- id- }- })--// Undo to previous step by dispatch-export const cancelOrderByDispatch = (data: CancleOrderVO) => http({- url: '/dispatchlist/cancel-order',- method: 'post',- data- })--// Set carrier-export const setCarrier = (data: SetCarrierVO[]) => http({- url: '/dispatchlist/freightfee',- method: 'post',- data- })--// Set carrier-export const viewInventoryDetails = (dispatch_id: number) => http({- url: '/dispatchlist/pick-list',- method: 'get',- params: {- dispatch_id- }- })--// Set carrier-export const viewDeliveryMainDetail = (dispatch_no: string) => http({- url: '/dispatchlist/by-dispatch_no',- method: 'get',- params: {- dispatch_no- }- })+import http from '@/utils/http/request'+import { PageConfigProps } from '@/types/System/Form'+import { addRequestVO, ConfirmOrderVO, PackageVO, WeighVO, DeliveryVO, SignInVO, CancleOrderVO, SetCarrierVO } from '@/types/DeliveryManagement/DeliveryManagement'++// Get Pre shipment+export const getShipment = (data: PageConfigProps) => http({+ url: '/dispatchlist/advanced-list',+ method: 'post',+ data+ })++// Get Pre shipment+export const getPreShipment = (data: PageConfigProps) => http({+ url: '/dispatchlist/advanced-list',+ method: 'post',+ data: {+ ...data,+ sqlTitle: 'dispatch_status=0'+ }+ })++// Get new shipment+export const getNewShipment = (data: PageConfigProps) => http({+ url: '/dispatchlist/advanced-list',+ method: 'post',+ data: {+ ...data,+ sqlTitle: 'dispatch_status=1'+ }+ })++// Get new shipment+export const getGoodsToBePicked = (data: PageConfigProps) => http({+ url: '/dispatchlist/list',+ method: 'post',+ data: {+ ...data,+ sqlTitle: 'dispatch_status=2'+ }+ })++// Get To Be Packaged+export const getToBePackaged = (data: PageConfigProps) => http({+ url: '/dispatchlist/list',+ method: 'post',+ data: {+ ...data,+ sqlTitle: 'to_package'+ }+ })++// Get picked+export const getPicked = (data: PageConfigProps) => http({+ url: '/dispatchlist/list',+ method: 'post',+ data: {+ ...data,+ sqlTitle: 'dispatch_status=3'+ }+ })++// Get Packaged+export const getPackaged = (data: PageConfigProps) => http({+ url: '/dispatchlist/list',+ method: 'post',+ data: {+ ...data,+ sqlTitle: 'dispatch_status=4'+ }+ })++// Get To Be Weight+export const getToBeWeighed = (data: PageConfigProps) => http({+ url: '/dispatchlist/list',+ method: 'post',+ data: {+ ...data,+ sqlTitle: 'to_weight'+ }+ })++// Get Weight+export const getWeighed = (data: PageConfigProps) => http({+ url: '/dispatchlist/list',+ method: 'post',+ data: {+ ...data,+ sqlTitle: 'dispatch_status=5'+ }+ })++// Get To Be Delivery+export const getToBeDelivery = (data: PageConfigProps) => http({+ url: '/dispatchlist/list',+ method: 'post',+ data: {+ ...data,+ sqlTitle: 'to_delivery'+ }+ })++// Get Delivery+export const getDelivery = (data: PageConfigProps) => http({+ url: '/dispatchlist/list',+ method: 'post',+ data: {+ ...data,+ sqlTitle: 'dispatch_status=6'+ }+ })++// Get Sign In+export const getSignIn = (data: PageConfigProps) => http({+ url: '/dispatchlist/list',+ method: 'post',+ data: {+ ...data,+ sqlTitle: 'dispatch_status=7'+ }+ })++// Add+export const addShipment = (data: addRequestVO[]) => http({+ url: '/dispatchlist',+ method: 'post',+ data+ })++// Delete+export const delShipment = (dispatch_no: string) => http({+ url: '/dispatchlist',+ method: 'delete',+ params: {+ dispatch_no+ }+ })++// Get order confirmation information+export const getConfirmOrderInfoAndStock = (dispatch_no: string) => http({+ url: '/dispatchlist/confirm-check',+ method: 'get',+ params: {+ dispatch_no+ }+ })++// Confirm orders and create dispatchpicklist+export const confirmOrder = (data: ConfirmOrderVO[]) => http({+ url: '/dispatchlist/confirm-order',+ method: 'post',+ data+ })++// Confirm picking+export const confirmPicking = (dispatch_no: string) => http({+ url: '/dispatchlist/confirm-pick-dispatchlistno',+ method: 'put',+ params: {+ dispatch_no+ }+ })++// Pack+export const handlePackage = (data: PackageVO[]) => http({+ url: '/dispatchlist/package',+ method: 'post',+ data+ })++// Weigh+export const handleWeigh = (data: WeighVO[]) => http({+ url: '/dispatchlist/weight',+ method: 'post',+ data+ })++// Delivery+export const handleDelivery = (data: DeliveryVO[]) => http({+ url: '/dispatchlist/delivery',+ method: 'post',+ data+ })++// Sign in+export const handleSignIn = (data: SignInVO[]) => http({+ url: '/dispatchlist/sign',+ method: 'post',+ data+ })++// Undo to previous step by detail+export const cancelOrderByDetail = (id: number) => http({+ url: '/dispatchlist/cancel-order',+ method: 'put',+ params: {+ id+ }+ })++// Undo to previous step by dispatch+export const cancelOrderByDispatch = (data: CancleOrderVO) => http({+ url: '/dispatchlist/cancel-order',+ method: 'post',+ data+ })++// Set carrier+export const setCarrier = (data: SetCarrierVO[]) => http({+ url: '/dispatchlist/freightfee',+ method: 'post',+ data+ })++// Set carrier+export const viewInventoryDetails = (dispatch_id: number) => http({+ url: '/dispatchlist/pick-list',+ method: 'get',+ params: {+ dispatch_id+ }+ })++++// Set carrier++export const viewDeliveryMainDetail = (dispatch_no: string) => http({++ url: '/dispatchlist/by-dispatch_no',++ method: 'get',++ params: {++ dispatch_no++ }++ })diff --cc frontend/src/languages/langs/cnZh.tsindex 04dc46d,32d2a8b..ec07143--- a/frontend/src/languages/langs/cnZh.ts+++ b/frontend/src/languages/langs/cnZh.ts@@@ -1,537 -1,539 +1,539 @@@-export default {- system: {- hookComponent: {- dialog: {- defaultClose: '关闭',- defaultConfirm: '确认',- defaultTitle: '提示'- }- },- page: {- add: '新增',- update: '修改',- refresh: '刷新',- export: '导出',- operate: '操作',- edit: '编辑',- delete: '删除',- close: '关闭',- submit: '提交',- reset: '重置',- confirm: '确认',- insertOneRow: '新增一行',- view: '查看',- import: '导入',- chooseFile: '选择文件',- exportTemplate: '导出模板',- noData: '暂无数据',- },- tips: {- success: '成功!',- fail: '失败!',- beforeDeleteMessage: '您确定要删除此条数据吗?',- beforeDeleteDetailMessage: '您确定要删除此行吗?',- detailLengthIsZero: '请添加明细数据!',- detailHasItemRepeat: '明细中含有重复项目!',- noData: '暂无数据',- beforeAsnConfirm: '确认到货?',- beforeAsnUnload: '确认卸货?',- beforeAsnSorted: '确认分拣完成?',- requestTimeout: '请求超时!',- requestFail: '接口请求失败,请重试',- vaildEmail: '请输入正确的邮箱格式!'- },- checkText: {- checkFormFail: '操作失败, 请检查数据后重试!',- mustInput: '请填写',- mustSelect: '请选择',- integer: '整数',- decimal: ' 小数',- pleaseEnter: '请输入长度为',- inputIntMsg: '的整数位',- inputDecimalMsg: '的小数位',- lengthValid: '字段长度应该在'- },- homeHeader: {- logout: '注销'- },- combobox: {- sex: {- male: '男',- female: '女'- },- yesOrNo: {- yes: '是',- no: '否'- }- },- pager: {- pageSizes: '条/页',- goTo: '前往',- total: '共',- record: '条记录'- }- },- router: {- sideBar: {- homepage: '首页',- baseModule: '基础设置',- ownerOfCargo: '货主信息',- menuBasicSettings: '菜单基础设置',- userManagement: '用户管理',- commodityCategorySetting: '商品类别设置',- commodityManagement: '商品管理',- userRoleSetting: '角色设置',- companySetting: '公司信息',- freightSetting: '运费设置',- warehouseSetting: '仓库设置',- customer: '客户信息',- supplier: '供应商信息',- roleMenu: '菜单设置',- stockManagement: '库存管理',- warehouseWorkingModule: '仓内作业',- warehouseProcessing: '仓内加工',- warehouseMove: '库存移动',- warehouseFreeze: '库存冻结',- warehouseAdjust: '库存调整',- warehouseTaking: '库存盘点',- deliveryManagement: '发货管理',- stockAsn: '收货管理'- }- },- login: {- welcomeTitle: '欢迎来到ModernWMS!👋🏻',- mainButtonLabel: '登录',- rememberTips: '记住账号密码',- userName: '用户名',- password: '密码',- loginSuccess: '登录成功',- notAuthority: '该账号未分配菜单权限,请联系管理员',- registerTips: '没有账号?点此注册一个!',- register: '注册'- },- homepage: {- subTitle: '现代化仓库管理系统'- },- base: {- freightSetting: {- carrier: '承运商',- departure_city: '始发城市',- arrival_city: '到货城市',- price_per_weight: '单公斤运费',- price_per_volume: '单立方米运费',- min_payment: '最小运费',- creator: '创建人',- create_time: '创建时间',- last_update_time: '最后更新时间',- is_valid: '是否有效',- freightSelectModal: '运费选择框',- },- userManagement: {- user_num: '员工编号',- user_name: '员工名称',- user_role: '角色',- contact_tel: '联系方式',- sex: '性别',- is_valid: '是否有效',- restPwd: '重置密码',- checkboxIsNull: '请选中数据!',- beforeResetPwd: '您确定要重置这些用户的密码吗?',- afterResetPwd: '重置密码成功, 新密码为: ',- user_register_name: '用户名',- email: 'Email',- auth_string: '密码'- },- warehouseSetting: {- warehouseSetting: '仓库设置',- reservoirSetting: '库区设置',- locationSetting: '库位设置',- locationSelectModal: '库位选择框',- email: 'Email',- warehouse_name: '仓库名称',- city: '所在城市',- address: '详细地址',- contact_tel: '联系方式',- manager: '负责人',- is_valid: '是否有效',- area_name: '库区名称',- area_property: '库区类型',- location_name: '库位编码',- location_length: '库位长(m)',- location_width: '库位宽(m)',- location_heigth: '库位高(m)',- location_volume: '库位容积(m³)',- location_load: '库位承重(kg)',- roadway_number: '巷道号',- shelf_number: '货架号',- layer_number: '层号',- tag_number: '位号',- picking_area: '拣货区',- stocking_area: '备货区',- receiving_area: '收货区',- return_area: '退货区',- defective_area: '次品区',- inventory_area: '存货区',- creator: '创建人',- create_time: '创建时间',- last_update_time: '最后更新时间'- },- customer: {- customer_name: '客户名称',- city: '所在城市',- address: '详细地址',- manager: '负责人',- email: 'Email',- contact_tel: '联系方式',- creator: '创建人',- create_time: '创建时间',- last_update_time: '最后更新时间',- is_valid: '是否有效'- },- supplier: {- supplier_name: '供应商名称',- city: '所在城市',- address: '详细地址',- email: 'Email',- manager: '负责人',- contact_tel: '联系方式',- creator: '创建人',- create_time: '创建时间',- last_update_time: '最后更新时间',- is_valid: '是否有效'- },- userRoleSetting: {- role_name: '用户角色',- is_valid: '是否有效'- },- companySetting: {- company_name: '公司名称',- city: '所在城市',- address: '详细地址',- manager: '负责人',- contact_tel: '联系方式'- },- ownerOfCargo: {- goods_owner_name: '货主名称',- city: '所在城市',- address: '详细地址',- manager: '负责人',- contact_tel: '联系方式',- creator: '创建人',- create_time: '创建时间'- },- commodityCategorySetting: {- category_name: '商品类别',- parent_name: '所属类别',- creator: '创建人',- create_time: '创建时间'- },- roleMenu: {- role_name: '角色名称',- menu_name: '菜单名称',- beforeUpdateOrDel: '请先选择需要处理的数据!'- },- commodityManagement: {- spu_code: '商品编码',- spu_name: '商品名称',- sku_code: '规格编码',- sku_name: '规格名称',- category_name: '商品类别',- spu_description: '商品描述',- bar_code: '商品条码',- supplier_name: '供应商名称',- brand: '品牌',- unit: '商品单位',- cost: '商品成本',- price: '商品价格',- origin: '产地',- length_unit: '长度单位',- volume_unit: '体积单位',- weight_unit: '重量单位',- weight: '商品重量',- lenght: '商品长度',- width: '商品宽度',- height: '商品高度',- volume: '商品体积'- }- },- wms: {- stock: {- stockSelectModal: '库存选择框',- skuSelectModal: '商品选择框',- warehouse: '仓库名称',- location_name: '库位编码',- qty_available: '可用数量'- },- warehouseWorking: {- warehouseProcessing: {- job_code: '作业单号',- job_type: '作业类型',- process_status: '加工状态',- processor: '操作人',- process_time: '操作时间',- qty: '数量',- is_source: '是否来源商品',- spu_code: '商品编码',- spu_name: '商品名称',- sku_code: '规格编码',- sku_name: '规格名称',- target_warehouse: '目标仓库',- target_location: '目标库位',- unit: '商品单位',- is_update_stock: '是否已更新库存',- creator: '创建人',- create_time: '创建时间',- last_update_time: '最后更新时间',- adjust_status: '是否已调整',- source: '来源',- target: '目标',- process_split: '拆分加工',- process_combine: '组合加工',- confirmProcess: '确认加工',- confirmAdjust: '确认调整',- qtyMoreThanAvailable: '不可超过可用数量',- beforeConfirmProcess: '您确认对该条数据进行加工吗?',- beforeConfirmAdjust: '您确认对该条数据进行调整吗?',- alreadyProcess: '该数据已完成加工,不可删除',- alreadyAdjust: '该数据已完成调整,不可删除'- },- warehouseMove: {- job_code: '作业单号',- move_status: '作业状态',- qty: '数量',- handler: '操作人',- handle_time: '操作时间',- orig_goods_warehouse: '来源仓库',- orig_goods_location_name: '来源库位',- dest_googs_warehouse: '目标仓库',- dest_googs_location_name: '目标库位',- confirmMove: '确认移库',- creator: '创建人',- create_time: '创建时间',- beforeConfirmMove: '您确认对该条数据进行移库吗?',- unadjust: '未调整',- adjusted: '已调整'- },- warehouseFreeze: {- job_code: '作业单号',- job_type: '作业类型',- handler: '操作人',- handle_time: '操作时间',- creator: '创建人',- create_time: '创建时间',- warehouse: '所在仓库',- location_name: '所在库位',- freeze: '冻结',- unfreeze: '解冻'- },- warehouseAdjust: {- job_code: '作业单号',- job_type: '作业类型',- warehouse: '所在仓库',- location_name: '所在库位',- handler: '操作人',- handle_time: '操作时间',- creator: '创建人',- create_time: '创建时间',- qty: '调整差异数量',- warehouseTake: '盘点',- processCombine: '仓内加工',- processSplit: '仓内加工',- warehouseMove: '移库',- confirmAdjust: '确认调整',- beforeConfirmAdjust: '您确认对该条数据进行调整吗?'- },- warehouseTaking: {- job_code: '作业单号',- job_status: '作业状态',- warehouse: '所在仓库',- location_name: '所在库位',- book_qty: '账面数量',- counted_qty: '盘点数量',- difference_qty: '差异数量',- confirmTaking: '确认盘点',- handler: '操作人',- handle_time: '操作时间',- creator: '创建人',- create_time: '创建时间',- unfinish: '待作业',- finish: '已完成',- confirmAdjust: '确认调整',- beforeConfirmAdjust: '您确认对该条数据进行调整吗?',- addFromCommodity: '选择商品',- addFromStock: '选择库存',- addTips: '当目标库存不存在时,可通过手动选择商品和库位来新增记录'- }- },- stockManagement: {- stockLocation: '库位列表',- stock: '库存列表'- },- stockLocation: {- warehouse_name: '仓库名称',- location_name: '库位名称',- spu_code: '商品编码',- spu_name: '商品名称',- sku_id: '规格标识',- sku_code: '规格编码',- sku_name: '规格名称',- qty: '数量',- qty_available: '可用数量',- qty_locked: '锁定数量',- qty_frozen: '冻结数量'- },- stockList: {- spu_code: '商品编码',- spu_name: '商品名称',- sku_code: '规格编码',- sku_id: '规格标识',- qty: '数量',- qty_available: '可用数量',- qty_locked: '锁定数量',- qty_frozen: '冻结数量',- qty_asn: '到货通知书数量',- qty_to_unload: '待卸货数量',- qty_to_sort: '待分拣数量',- qty_sorted: '已分拣数量',- shortage_qty: '欠货数量'- },- stockAsn: {- tabNotice: '到货通知',- tabToDoArrival: '待到货',- tabToDoUnload: '待卸货',- tabToDoSorting: '待分拣',- tabToDoGrounding: '待上架',- tabReceiptDetails: '收货明细'- },- stockAsnInfo: {- id: '标识',- asn_no: '到货通知书编号',- asn_status: '到货通知书状态',- spu_id: '商品spu标识',- spu_code: '商品编码',- spu_name: '商品名称',- sku_id: '商品sku标识',- sku_code: '规格编码',- sku_name: '规格名称',- origin: '产地',- length_unit: '长度单位',- volume_unit: '体积单位',- weight_unit: '重量单位',- asn_qty: '到货通知书数据',- actual_qty: '上架数量',- sorted_qty: '分拣数量',- shortage_qty: '短少数量',- more_qty: '超量数量',- damage_qty: '破损数量',- weight: '总重量',- volume: '总体积',- supplier_id: '供应商标识',- supplier_name: '供应商名称',- goods_owner_id: '货主标识',- goods_owner_name: '货主名称',- is_valid: '是否有效'- },- skuInfo: {- spu_id: '商品spu标识',- spu_code: '商品编码',- spu_name: '商品名称',- category_id: '商品类别标识',- category_name: '商品类别',- spu_description: '商品描述',- bar_code: '商品条码',- supplier_id: '供应商标识',- supplier_name: '供应商名称',- brand: '品牌',- origin: '产地',- length_unit: '长度单位',- volume_unit: '体积单位',- weight_unit: '重量单位',- sku_id: '规格标识',- sku_code: '规格编码',- sku_name: '规格名称',- weight: '总重量',- lenght: '商品长度',- width: '商品宽度',- height: '商品高度',- volume: '商品体积',- unit: '商品单位',- cost: '商品成本',- price: '商品价格'- },- deliveryManagement: {- shipment: '发货单',- preShipment: '预发货',- newShipment: '新发货',- goodsToBePicked: '待拣货',- picked: '已拣货',- toBePackaged: '待打包',- package: '打包',- packaged: '已打包',- toBeWeighed: '待称重',- weigh: '称重',- weighed: '已称重',- delivery: '出库',- toBeDelivered: '待出库',- outOfWarehouse: '已出库',- signIn: '签收',- signedIn: '已签收',- dispatch_no: '发货单号',- dispatch_status: '发货单状态',- qty: '总数量',- detailQty: '数量',- weight: '总重量',- volume: '总体积',- customer_name: '客户名称',- spu_code: '商品编码',- spu_name: '商品名称',- sku_code: '规格编码',- sku_name: '规格名称',- unit: '商品单位',- creator: '创建人',- create_time: '创建时间',- confirmOrder: '确认发货单',- orderDetail: '发货单商品详情',- quantityOverflow: '发货数量之和不能超出发货单数量',- quantityIsZero: '请保证选择的商品至少有一项出库数量大于0!',- NoItemSelected: '请至少选中一项商品进行出库!',- confirmSuccess: '确认发货单成功!',- confirmPicking: '确认拣货',- confirmDelivery: '确认出库',- confirmSignIn: '确认签收',- detailWeight: '重量',- unpackage_qty: '待打包数量',- unweighing_qty: '待称重数量',- validQtyMsgPackage: '请输入有效数值, 且不能超过总数量',- validQtyMsgSignIn: '请输入有效数值, 且不能超过总数量',- signInQty: '实际签收数量',- incorrectStatusMsg: '操作失败, 状态应该为',- backToThePreviousStep: '撤回到上一个流程',- confirmBack: '确认撤回',- or: '或',- irreversible: '此操作不可逆',- detailQuantityIsZero: '发货数量不能为0',- qty_available: '可用数量',- spu_description: '商品描述',- bar_code: '条码',- order_qty: '订单数量',- unpicked_qty: '待拣货数量',- picked_qty: '已拣货数量',- detailVolume: '体积',- package_qty: '已打包数量',- package_person: '打包员',- package_time: '打包时间',- weighing_no: '称重单号',- package_no: '打包流水号',- weighing_person: '称重员',- weighing_weight: '称重重量',- waybill_no: '运单号',- carrier: '承运单位',- damagedQuantity: '到货破损数量',- setFreight: '设置承运单位',- departure_city: '始发城市',- arrival_city: '到货城市',- ViewInventoryDetails: '查看商品明细',- invalidValue: '请输入有效数值',- exceedingQuantity: '不能超过总数量'- }- }-}+export default {+ system: {+ hookComponent: {+ dialog: {+ defaultClose: '关闭',+ defaultConfirm: '确认',+ defaultTitle: '提示'+ }+ },+ page: {+ add: '新增',+ update: '修改',+ refresh: '刷新',+ export: '导出',+ operate: '操作',+ edit: '编辑',+ delete: '删除',+ close: '关闭',+ submit: '提交',+ reset: '重置',+ confirm: '确认',+ insertOneRow: '新增一行',+ view: '查看',+ import: '导入',+ chooseFile: '选择文件',+ exportTemplate: '导出模板',+ noData: '暂无数据',+ },+ tips: {+ success: '成功!',+ fail: '失败!',+ beforeDeleteMessage: '您确定要删除此条数据吗?',+ beforeDeleteDetailMessage: '您确定要删除此行吗?',+ detailLengthIsZero: '请添加明细数据!',+ detailHasItemRepeat: '明细中含有重复项目!',+ noData: '暂无数据',+ beforeAsnConfirm: '确认到货?',+ beforeAsnUnload: '确认卸货?',+ beforeAsnSorted: '确认分拣完成?',+ requestTimeout: '请求超时!',+ requestFail: '接口请求失败,请重试',+ vaildEmail: '请输入正确的邮箱格式!'+ },+ checkText: {+ checkFormFail: '操作失败, 请检查数据后重试!',+ mustInput: '请填写',+ mustSelect: '请选择',+ integer: '整数',+ decimal: ' 小数',+ pleaseEnter: '请输入长度为',+ inputIntMsg: '的整数位',+ inputDecimalMsg: '的小数位',+ lengthValid: '字段长度应该在'+ },+ homeHeader: {+ logout: '注销'+ },+ combobox: {+ sex: {+ male: '男',+ female: '女'+ },+ yesOrNo: {+ yes: '是',+ no: '否'+ }+ },+ pager: {+ pageSizes: '条/页',+ goTo: '前往',+ total: '共',+ record: '条记录'+ }+ },+ router: {+ sideBar: {+ homepage: '首页',+ baseModule: '基础设置',+ ownerOfCargo: '货主信息',+ menuBasicSettings: '菜单基础设置',+ userManagement: '用户管理',+ commodityCategorySetting: '商品类别设置',+ commodityManagement: '商品管理',+ userRoleSetting: '角色设置',+ companySetting: '公司信息',+ freightSetting: '运费设置',+ warehouseSetting: '仓库设置',+ customer: '客户信息',+ supplier: '供应商信息',+ roleMenu: '菜单设置',+ stockManagement: '库存管理',+ warehouseWorkingModule: '仓内作业',+ warehouseProcessing: '仓内加工',+ warehouseMove: '库存移动',+ warehouseFreeze: '库存冻结',+ warehouseAdjust: '库存调整',+ warehouseTaking: '库存盘点',+ deliveryManagement: '发货管理',+ stockAsn: '收货管理'+ }+ },+ login: {+ welcomeTitle: '欢迎来到ModernWMS!👋🏻',+ mainButtonLabel: '登录',+ rememberTips: '记住账号密码',+ userName: '用户名',+ password: '密码',+ loginSuccess: '登录成功',+ notAuthority: '该账号未分配菜单权限,请联系管理员',+ registerTips: '没有账号?点此注册一个!',+ register: '注册'+ },+ homepage: {+ subTitle: '现代化仓库管理系统'+ },+ base: {+ freightSetting: {+ carrier: '承运商',+ departure_city: '始发城市',+ arrival_city: '到货城市',+ price_per_weight: '单公斤运费',+ price_per_volume: '单立方米运费',+ min_payment: '最小运费',+ creator: '创建人',+ create_time: '创建时间',+ last_update_time: '最后更新时间',+ is_valid: '是否有效',+ freightSelectModal: '运费选择框',+ },+ userManagement: {+ user_num: '员工编号',+ user_name: '员工名称',+ user_role: '角色',+ contact_tel: '联系方式',+ sex: '性别',+ is_valid: '是否有效',+ restPwd: '重置密码',+ checkboxIsNull: '请选中数据!',+ beforeResetPwd: '您确定要重置这些用户的密码吗?',+ afterResetPwd: '重置密码成功, 新密码为: ',+ user_register_name: '用户名',+ email: 'Email',+ auth_string: '密码'+ },+ warehouseSetting: {+ warehouseSetting: '仓库设置',+ reservoirSetting: '库区设置',+ locationSetting: '库位设置',+ locationSelectModal: '库位选择框',+ email: 'Email',+ warehouse_name: '仓库名称',+ city: '所在城市',+ address: '详细地址',+ contact_tel: '联系方式',+ manager: '负责人',+ is_valid: '是否有效',+ area_name: '库区名称',+ area_property: '库区类型',+ location_name: '库位编码',+ location_length: '库位长(m)',+ location_width: '库位宽(m)',+ location_heigth: '库位高(m)',+ location_volume: '库位容积(m³)',+ location_load: '库位承重(kg)',+ roadway_number: '巷道号',+ shelf_number: '货架号',+ layer_number: '层号',+ tag_number: '位号',+ picking_area: '拣货区',+ stocking_area: '备货区',+ receiving_area: '收货区',+ return_area: '退货区',+ defective_area: '次品区',+ inventory_area: '存货区',+ creator: '创建人',+ create_time: '创建时间',+ last_update_time: '最后更新时间'+ },+ customer: {+ customer_name: '客户名称',+ city: '所在城市',+ address: '详细地址',+ manager: '负责人',+ email: 'Email',+ contact_tel: '联系方式',+ creator: '创建人',+ create_time: '创建时间',+ last_update_time: '最后更新时间',+ is_valid: '是否有效'+ },+ supplier: {+ supplier_name: '供应商名称',+ city: '所在城市',+ address: '详细地址',+ email: 'Email',+ manager: '负责人',+ contact_tel: '联系方式',+ creator: '创建人',+ create_time: '创建时间',+ last_update_time: '最后更新时间',+ is_valid: '是否有效'+ },+ userRoleSetting: {+ role_name: '用户角色',+ is_valid: '是否有效'+ },+ companySetting: {+ company_name: '公司名称',+ city: '所在城市',+ address: '详细地址',+ manager: '负责人',+ contact_tel: '联系方式'+ },+ ownerOfCargo: {+ goods_owner_name: '货主名称',+ city: '所在城市',+ address: '详细地址',+ manager: '负责人',+ contact_tel: '联系方式',+ creator: '创建人',+ create_time: '创建时间'+ },+ commodityCategorySetting: {+ category_name: '商品类别',+ parent_name: '所属类别',+ creator: '创建人',+ create_time: '创建时间'+ },+ roleMenu: {+ role_name: '角色名称',+ menu_name: '菜单名称',+ beforeUpdateOrDel: '请先选择需要处理的数据!'+ },+ commodityManagement: {+ spu_code: '商品编码',+ spu_name: '商品名称',+ sku_code: '规格编码',+ sku_name: '规格名称',+ category_name: '商品类别',+ spu_description: '商品描述',+ bar_code: '商品条码',+ supplier_name: '供应商名称',+ brand: '品牌',+ unit: '商品单位',+ cost: '商品成本',+ price: '商品价格',+ origin: '产地',+ length_unit: '长度单位',+ volume_unit: '体积单位',+ weight_unit: '重量单位',+ weight: '商品重量',+ lenght: '商品长度',+ width: '商品宽度',+ height: '商品高度',+ volume: '商品体积'+ }+ },+ wms: {+ stock: {+ stockSelectModal: '库存选择框',+ skuSelectModal: '商品选择框',+ warehouse: '仓库名称',+ location_name: '库位编码',+ qty_available: '可用数量'+ },+ warehouseWorking: {+ warehouseProcessing: {+ job_code: '作业单号',+ job_type: '作业类型',+ process_status: '加工状态',+ processor: '操作人',+ process_time: '操作时间',+ qty: '数量',+ is_source: '是否来源商品',+ spu_code: '商品编码',+ spu_name: '商品名称',+ sku_code: '规格编码',+ sku_name: '规格名称',+ target_warehouse: '目标仓库',+ target_location: '目标库位',+ unit: '商品单位',+ is_update_stock: '是否已更新库存',+ creator: '创建人',+ create_time: '创建时间',+ last_update_time: '最后更新时间',+ adjust_status: '是否已调整',+ source: '来源',+ target: '目标',+ process_split: '拆分加工',+ process_combine: '组合加工',+ confirmProcess: '确认加工',+ confirmAdjust: '确认调整',+ qtyMoreThanAvailable: '不可超过可用数量',+ beforeConfirmProcess: '您确认对该条数据进行加工吗?',+ beforeConfirmAdjust: '您确认对该条数据进行调整吗?',+ alreadyProcess: '该数据已完成加工,不可删除',+ alreadyAdjust: '该数据已完成调整,不可删除'+ },+ warehouseMove: {+ job_code: '作业单号',+ move_status: '作业状态',+ qty: '数量',+ handler: '操作人',+ handle_time: '操作时间',+ orig_goods_warehouse: '来源仓库',+ orig_goods_location_name: '来源库位',+ dest_googs_warehouse: '目标仓库',+ dest_googs_location_name: '目标库位',+ confirmMove: '确认移库',+ creator: '创建人',+ create_time: '创建时间',+ beforeConfirmMove: '您确认对该条数据进行移库吗?',+ unadjust: '未调整',+ adjusted: '已调整'+ },+ warehouseFreeze: {+ job_code: '作业单号',+ job_type: '作业类型',+ handler: '操作人',+ handle_time: '操作时间',+ creator: '创建人',+ create_time: '创建时间',+ warehouse: '所在仓库',+ location_name: '所在库位',+ freeze: '冻结',+ unfreeze: '解冻'+ },+ warehouseAdjust: {+ job_code: '作业单号',+ job_type: '作业类型',+ warehouse: '所在仓库',+ location_name: '所在库位',+ handler: '操作人',+ handle_time: '操作时间',+ creator: '创建人',+ create_time: '创建时间',+ qty: '调整差异数量',+ warehouseTake: '盘点',+ processCombine: '仓内加工',+ processSplit: '仓内加工',+ warehouseMove: '移库',+ confirmAdjust: '确认调整',+ beforeConfirmAdjust: '您确认对该条数据进行调整吗?'+ },+ warehouseTaking: {+ job_code: '作业单号',+ job_status: '作业状态',+ warehouse: '所在仓库',+ location_name: '所在库位',+ book_qty: '账面数量',+ counted_qty: '盘点数量',+ difference_qty: '差异数量',+ confirmTaking: '确认盘点',+ handler: '操作人',+ handle_time: '操作时间',+ creator: '创建人',+ create_time: '创建时间',+ unfinish: '待作业',+ finish: '已完成',+ confirmAdjust: '确认调整',+ beforeConfirmAdjust: '您确认对该条数据进行调整吗?',+ addFromCommodity: '选择商品',+ addFromStock: '选择库存',+ addTips: '当目标库存不存在时,可通过手动选择商品和库位来新增记录'+ }+ },+ stockManagement: {+ stockLocation: '库位列表',+ stock: '库存列表'+ },+ stockLocation: {+ warehouse_name: '仓库名称',+ location_name: '库位名称',+ spu_code: '商品编码',+ spu_name: '商品名称',+ sku_id: '规格标识',+ sku_code: '规格编码',+ sku_name: '规格名称',+ qty: '数量',+ qty_available: '可用数量',+ qty_locked: '锁定数量',+ qty_frozen: '冻结数量'+ },+ stockList: {+ spu_code: '商品编码',+ spu_name: '商品名称',+ sku_code: '规格编码',+ sku_id: '规格标识',+ qty: '数量',+ qty_available: '可用数量',+ qty_locked: '锁定数量',+ qty_frozen: '冻结数量',+ qty_asn: '到货通知书数量',+ qty_to_unload: '待卸货数量',+ qty_to_sort: '待分拣数量',+ qty_sorted: '已分拣数量',+ shortage_qty: '欠货数量'+ },+ stockAsn: {+ tabNotice: '到货通知',+ tabToDoArrival: '待到货',+ tabToDoUnload: '待卸货',+ tabToDoSorting: '待分拣',+ tabToDoGrounding: '待上架',+ tabReceiptDetails: '收货明细'+ },+ stockAsnInfo: {+ id: '标识',+ asn_no: '到货通知书编号',+ asn_status: '到货通知书状态',+ spu_id: '商品spu标识',+ spu_code: '商品编码',+ spu_name: '商品名称',+ sku_id: '商品sku标识',+ sku_code: '规格编码',+ sku_name: '规格名称',+ origin: '产地',+ length_unit: '长度单位',+ volume_unit: '体积单位',+ weight_unit: '重量单位',+ asn_qty: '到货通知书数据',+ actual_qty: '上架数量',+ sorted_qty: '分拣数量',+ shortage_qty: '短少数量',+ more_qty: '超量数量',+ damage_qty: '破损数量',+ weight: '总重量',+ volume: '总体积',+ supplier_id: '供应商标识',+ supplier_name: '供应商名称',+ goods_owner_id: '货主标识',+ goods_owner_name: '货主名称',+ is_valid: '是否有效'+ },+ skuInfo: {+ spu_id: '商品spu标识',+ spu_code: '商品编码',+ spu_name: '商品名称',+ category_id: '商品类别标识',+ category_name: '商品类别',+ spu_description: '商品描述',+ bar_code: '商品条码',+ supplier_id: '供应商标识',+ supplier_name: '供应商名称',+ brand: '品牌',+ origin: '产地',+ length_unit: '长度单位',+ volume_unit: '体积单位',+ weight_unit: '重量单位',+ sku_id: '规格标识',+ sku_code: '规格编码',+ sku_name: '规格名称',+ weight: '总重量',+ lenght: '商品长度',+ width: '商品宽度',+ height: '商品高度',+ volume: '商品体积',+ unit: '商品单位',+ cost: '商品成本',+ price: '商品价格'+ },+ deliveryManagement: {+ shipment: '发货单',+ preShipment: '预发货',+ newShipment: '新发货',+ goodsToBePicked: '待拣货',+ picked: '已拣货',+ toBePackaged: '待打包',+ package: '打包',+ packaged: '已打包',+ toBeWeighed: '待称重',+ weigh: '称重',+ weighed: '已称重',+ delivery: '出库',+ toBeDelivered: '待出库',+ outOfWarehouse: '已出库',+ signIn: '签收',+ signedIn: '已签收',+ dispatch_no: '发货单号',+ dispatch_status: '发货单状态',+ qty: '总数量',+ detailQty: '数量',+ weight: '总重量',+ volume: '总体积',+ customer_name: '客户名称',+ spu_code: '商品编码',+ spu_name: '商品名称',+ sku_code: '规格编码',++ sku_name: '规格名称',++ unit: '商品单位',+ creator: '创建人',+ create_time: '创建时间',+ confirmOrder: '确认发货单',+ orderDetail: '发货单商品详情',+ quantityOverflow: '发货数量之和不能超出发货单数量',+ quantityIsZero: '请保证选择的商品至少有一项出库数量大于0!',+ NoItemSelected: '请至少选中一项商品进行出库!',+ confirmSuccess: '确认发货单成功!',+ confirmPicking: '确认拣货',+ confirmDelivery: '确认出库',+ confirmSignIn: '确认签收',+ detailWeight: '重量',+ unpackage_qty: '待打包数量',+ unweighing_qty: '待称重数量',+ validQtyMsgPackage: '请输入有效数值, 且不能超过总数量',+ validQtyMsgSignIn: '请输入有效数值, 且不能超过总数量',+ signInQty: '实际签收数量',+ incorrectStatusMsg: '操作失败, 状态应该为',+ backToThePreviousStep: '撤回到上一个流程',+ confirmBack: '确认撤回',+ or: '或',+ irreversible: '此操作不可逆',+ detailQuantityIsZero: '发货数量不能为0',+ qty_available: '可用数量',+ spu_description: '商品描述',+ bar_code: '条码',+ order_qty: '订单数量',+ unpicked_qty: '待拣货数量',+ picked_qty: '已拣货数量',+ detailVolume: '体积',+ package_qty: '已打包数量',+ package_person: '打包员',+ package_time: '打包时间',+ weighing_no: '称重单号',+ package_no: '打包流水号',+ weighing_person: '称重员',+ weighing_weight: '称重重量',+ waybill_no: '运单号',+ carrier: '承运单位',+ damagedQuantity: '到货破损数量',+ setFreight: '设置承运单位',+ departure_city: '始发城市',+ arrival_city: '到货城市',+ ViewInventoryDetails: '查看商品明细',+ invalidValue: '请输入有效数值',+ exceedingQuantity: '不能超过总数量'+ }+ }+}diff --cc frontend/src/languages/langs/enUs.tsindex 15b1345,0e182c4..0e8db76--- a/frontend/src/languages/langs/enUs.ts+++ b/frontend/src/languages/langs/enUs.ts@@@ -1,537 -1,539 +1,539 @@@-export default {- system: {- hookComponent: {- dialog: {- defaultClose: 'Close',- defaultConfirm: 'Agree',- defaultTitle: 'Tips'- }- },- page: {- add: 'Add',- update: 'Update',- refresh: 'Refresh',- export: 'Export',- operate: 'Operate',- edit: 'Edit',- delete: 'Delete',- close: 'Colse',- submit: 'Submit',- reset: 'Reset',- confirm: 'Confirm',- insertOneRow: 'Insert One Row',- view: 'View',- import: 'Import',- chooseFile: 'Choose File',- exportTemplate: 'Export Template',- noData: 'No data',- },- tips: {- success: ' success!',- fail: ' fail!',- beforeDeleteMessage: 'Do you want to delete this data?',- beforeDeleteDetailMessage: 'Are you sure you want to delete this row?',- detailLengthIsZero: 'Details verification before document submission!',- detailHasItemRepeat: 'The details contain duplicate items!',- noData: 'no data',- beforeAsnConfirm: 'Confirm Arrival?',- beforeAsnUnload: 'Confirm Unload?',- beforeAsnSorted: 'Confirm Sorted?',- requestTimeout: 'Request Timeout!',- requestFail: 'Request fail.Please try it again',- vaildEmail: 'Please enter the correct email format!'- },- checkText: {- checkFormFail: 'Operation failed. Please check the data and try again!',- mustInput: 'Please fill in the ',- mustSelect: 'Please select ',- integer: ' integer',- decimal: ' decimal',- pleaseEnter: 'Please enter ',- inputIntMsg: 'decimal places of integer part',- inputDecimalMsg: ' decimal places of the decimal part',- lengthValid: 'The length should be between '- },- homeHeader: {- logout: 'Logout'- },- combobox: {- sex: {- male: 'Male',- female: 'Female'- },- yesOrNo: {- yes: 'yes',- no: 'no'- }- },- pager: {- pageSizes: '/page',- goTo: 'Go to',- total: 'Total',- record: 'record'- }- },- router: {- sideBar: {- homepage: 'Home Page',- baseModule: 'Basic Settings',- ownerOfCargo: 'Owner Information',- menuBasicSettings: 'Menu',- userManagement: 'User Management',- commodityCategorySetting: 'Commodity Category',- commodityManagement: 'Commodity Management',- userRoleSetting: 'User Role',- companySetting: 'Company Information',- freightSetting: 'Freight Setting',- warehouseSetting: 'Warehouse Setting',- customer: 'Customer Info',- supplier: 'Supplier Info',- roleMenu: 'Role Menu Settings',- stockManagement: 'Stock Management',- warehouseWorkingModule: 'Warehouse Working',- warehouseProcessing: 'Warehouse Processing',- warehouseMove: 'Inventory Move',- warehouseFreeze: 'Inventory freeze',- warehouseAdjust: 'Inventory Adjust',- warehouseTaking: 'Inventory Take',- deliveryManagement: 'Delivery Management',- stockAsn: 'Receiving Management'- }- },- login: {- welcomeTitle: 'Welcome to ModernWMS!👋🏻',- mainButtonLabel: 'Login',- rememberTips: 'Remember me',- userName: 'UserName',- password: 'Password',- loginSuccess: 'Login succeeded!',- notAuthority: 'Undistributed menu access the account, please contact the administrator to add it!',- registerTips: 'No account? Click here to register!',- register: 'Register'- },- homepage: {- subTitle: 'Modern Warehouse Management System'- },- base: {- freightSetting: {- carrier: 'carrier',- departure_city: 'Departure City',- arrival_city: 'Arrival City',- price_per_weight: 'Weight Fee',- price_per_volume: 'Volume Fee',- min_payment: 'Min Payment',- creator: 'Creator',- create_time: 'Create Time',- last_update_time: 'Last Update Time',- is_valid: 'Valid',- freightSelectModal: 'Freight Select Modal',- },- userManagement: {- user_num: 'User Num',- user_name: 'User Name',- user_role: 'Role',- contact_tel: 'Contact Information',- sex: 'Sex',- is_valid: 'Valid',- restPwd: 'Reset password',- checkboxIsNull: 'Please select data!',- beforeResetPwd: 'Are you sure you want to reset the passwords of these users?',- afterResetPwd: 'Password reset succeeded, The new password is ',- user_register_name: 'User Name',- email: 'Email',- auth_string: 'Password'- },- warehouseSetting: {- warehouseSetting: 'Warehouse Setting',- reservoirSetting: 'Reservoir Setting',- locationSetting: 'Location Setting',- locationSelectModal: 'Location Select Modal',- email: 'Email',- warehouse_name: 'Warehouse Name',- city: 'City',- address: 'Address',- contact_tel: 'Acontact Tel',- manager: 'Manager',- is_valid: 'Valid',- area_name: 'Reservoir Name',- area_property: 'Reservoir Category',- location_name: 'Location Code',- location_length: 'Location Length(m)',- location_width: 'Location Width(m)',- location_heigth: 'Location Height(m)',- location_volume: 'Location Volume(m³)',- location_load: 'Location Load(kg)',- roadway_number: 'Roadway Number',- shelf_number: 'Shelf Number',- layer_number: 'Layer Number',- tag_number: 'Tag Number',- picking_area: 'Picking Area',- stocking_area: 'Stocking Area',- receiving_area: 'Receiving Area',- return_area: 'Return Area',- defective_area: 'Defective Area',- inventory_area: 'Inventory Area',- creator: 'Creator',- create_time: 'Create Time',- last_update_time: 'Last Update Time'- },- customer: {- customer_name: 'Customer Name',- city: 'City',- address: 'Address',- manager: 'Manager',- email: 'Email',- contact_tel: 'Contact Tel',- creator: 'Creator',- create_time: 'Create Time',- last_update_time: 'Last Update Time',- is_valid: 'Valid'- },- supplier: {- supplier_name: 'Supplier Name',- city: 'City',- address: 'Address',- email: 'Email',- manager: 'Manager',- contact_tel: 'Contact Tel',- creator: 'Creator',- create_time: 'Create Time',- last_update_time: 'Last Update Time',- is_valid: 'Valid'- },- userRoleSetting: {- role_name: 'User Role',- is_valid: 'Valid'- },- companySetting: {- company_name: 'Corporate Name',- city: 'City',- address: 'Detailed Address',- manager: 'Person In Charge',- contact_tel: 'Contact Information'- },- ownerOfCargo: {- goods_owner_name: 'Owner Of Cargo',- city: 'City',- address: 'Detailed Address',- manager: 'Person In Charge',- contact_tel: 'Contact Information',- creator: 'Creator',- create_time: 'Create Time'- },- commodityCategorySetting: {- category_name: 'Commodity category',- parent_name: 'Parent Category',- creator: 'Creator',- create_time: 'Create Time'- },- roleMenu: {- role_name: 'Role Name',- menu_name: 'Menu Name',- beforeUpdateOrDel: 'Please select the data to be processed first!'- },- commodityManagement: {- spu_code: 'Commodity Code',- spu_name: 'Commodity Name',- category_name: 'Commodity Category',- spu_description: 'Commodity Description',- bar_code: 'Specification Code',- sku_code: 'Specification Code',- sku_name: 'Specification Name',- supplier_name: 'Supplier Name',- brand: 'Brand',- unit: 'Commodity Unit',- cost: 'Commodity Cost',- price: 'Commodity Price',- origin: 'origin',- length_unit: 'Length Unit',- volume_unit: 'Volume Unit',- weight_unit: 'Weight Unit',- weight: 'Commodity Weight',- lenght: 'Commodity Length',- width: 'Commodity Width',- height: 'Commodity Height',- volume: 'Commodity Volume'- }- },- wms: {- stock: {- stockSelectModal: 'Stock Select Modal',- skuSelectModal: 'Commodity Select Modal',- warehouse: 'Warehouse Name',- location_name: 'Location Code',- qty_available: 'Available Qty'- },- warehouseWorking: {- warehouseProcessing: {- job_code: 'Job Code',- job_type: 'Job Type',- process_status: 'Process Status',- processor: 'Processor',- process_time: 'Process Time',- qty: 'Qty',- is_source: 'Is Source',- spu_code: 'Commodity Code',- spu_name: 'Commodity Name',- sku_code: 'Specification Code',- sku_name: 'Specification Name',- target_warehouse: 'Target Warehouse',- target_location: 'Target Location',- unit: 'Unit',- is_update_stock: 'Is Updated Stock',- creator: 'Creator',- create_time: 'Create Time',- last_update_time: 'Last Update Time',- adjust_status: 'Is Updated Stock',- source: 'Source',- target: 'Target',- process_split: 'Split Processing',- process_combine: 'Combine Processing',- confirmProcess: 'Confirm Process',- confirmAdjust: 'Confirm Adjust',- qtyMoreThanAvailable: 'Can\'t more than the number of Available',- beforeConfirmProcess: 'Are you sure to process this data?',- beforeConfirmAdjust: 'Are you sure to adjust this data?',- alreadyProcess: 'The data can\'t delete because it had been processed',- alreadyAdjust: 'The data can\'t delete because it had been adjusted'- },- warehouseMove: {- job_code: 'Job No',- move_status: 'Move Status',- qty: 'Qty',- handler: 'Handler',- handle_time: 'Handle Time',- orig_goods_warehouse: 'Origin Warehouse',- orig_goods_location_name: 'Origin Location',- dest_googs_warehouse: 'Target Warehouse',- dest_googs_location_name: 'Target Location',- confirmMove: 'Confirm Move',- creator: 'Creator',- create_time: 'Create Time',- beforeConfirmMove: 'Are you sure to move this data?',- unadjust: 'Unadjust',- adjusted: 'Adjusted'- },- warehouseFreeze: {- job_code: 'Job Code',- job_type: 'Job Type',- handler: 'Handler',- handle_time: 'Handle Time',- creator: 'Creator',- create_time: 'Create Time',- warehouse: 'Warehouse',- location_name: 'Location Code',- freeze: 'Freeze',- unfreeze: 'Unfreeze'- },- warehouseAdjust: {- job_code: 'Job Code',- job_type: 'Job Type',- warehouse: 'Warehouse',- location_name: 'Location Code',- handler: 'Handler',- handle_time: 'Handle Time',- creator: 'Creator',- create_time: 'Create Time',- qty: 'Difference Qty',- warehouseTake: 'Warehouse Take',- processCombine: 'Warehouse Process',- processSplit: 'Warehouse Process',- warehouseMove: 'Warehouse Move',- confirmAdjust: 'Confirm Adjust',- beforeConfirmAdjust: 'Are you sure to adjust this data?'- },- warehouseTaking: {- job_code: 'Job Code',- job_status: 'Job Status',- warehouse: 'Warehouse',- location_name: 'Location Code',- book_qty: 'Book Qty',- counted_qty: 'Actual Qty',- difference_qty: 'Difference Qty',- handler: 'Handler',- handle_time: 'Handle Time',- creator: 'Creator',- create_time: 'Create Time',- confirmTaking: 'Confirm Taking',- unfinish: 'Unfinish',- finish: 'Finish',- confirmAdjust: 'Confirm Adjust',- beforeConfirmAdjust: 'Are you sure to adjust this data?',- addFromCommodity: 'Choose From Commodity',- addFromStock: 'Choose From Inventory',- addTips: 'You can choose goods and the location to add a new record when there is no target inventory'- }- },- stockManagement: {- stockLocation: 'Stock Location',- stock: 'Stock'- },- stockLocation: {- warehouse_name: 'Warehouse',- location_name: 'Location Code',- spu_code: 'Commodity code',- spu_name: 'Trade name',- sku_id: 'Sku Id',- sku_code: 'Specification code',- sku_name: 'Form Name',- qty: 'Quantity',- qty_available: 'Available Quantity',- qty_locked: 'Locked Quantity',- qty_frozen: 'Frozen Quantity'- },- stockList: {- spu_code: 'Commodity code',- spu_name: 'Trade name',- sku_code: 'Specification code',- sku_id: 'Sku Id',- qty: 'Quantity',- qty_available: 'Available Quantity',- qty_locked: 'Locked Quantity',- qty_frozen: 'Frozen Quantity',- qty_asn: 'Asn Quantity',- qty_to_unload: 'Unload Quantity',- qty_to_sort: 'Sort Quantity',- qty_sorted: 'Sorted Quantity',- shortage_qty: 'Shortage Quantity'- },- stockAsn: {- tabNotice: 'Notice Of Arrival',- tabToDoArrival: 'To Be Delivered',- tabToDoUnload: 'To Be Unloaded',- tabToDoSorting: 'To Be Sorted',- tabToDoGrounding: 'To Be Put On The Shelf',- tabReceiptDetails: 'Receipt Details'- },- stockAsnInfo: {- id: 'ID',- asn_no: 'Asn No',- asn_status: 'Asn Status',- spu_id: 'Spu Id',- spu_code: 'Commodity code',- spu_name: 'Trade name',- sku_id: 'Sku Id',- sku_code: 'Specification code',- sku_name: 'Form Name',- origin: 'Origin',- length_unit: 'Length Unit',- volume_unit: 'Volume Unit',- weight_unit: 'Weight Unit',- asn_qty: 'Asn Quantity',- actual_qty: 'Actual Quantity',- sorted_qty: 'Sorted Quantity',- shortage_qty: 'Shortage Quantity',- more_qty: 'More Quantity',- damage_qty: 'Damage Quantity',- weight: 'Weight',- volume: 'Volume',- supplier_id: 'Supplier Id',- supplier_name: 'Supplier Name',- goods_owner_id: 'Goods Owner Id',- goods_owner_name: 'Goods Owner Name',- is_valid: 'Valid'- },- skuInfo: {- spu_id: 'Spu Id',- spu_code: 'Commodity code',- spu_name: 'Trade name',- category_id: 'Commodity Category ID',- category_name: 'Commodity Category',- spu_description: 'Commodity Description',- bar_code: 'Specification Code',- supplier_id: 'Supplier Id',- supplier_name: 'Supplier Name',- brand: 'Brand',- origin: 'origin',- length_unit: 'Length Unit',- volume_unit: 'Volume Unit',- weight_unit: 'Weight Unit',- sku_id: 'Sku Id',- sku_code: 'Specification code',- sku_name: 'Form Name',- weight: 'Commodity Weight',- lenght: 'Commodity Length',- width: 'Commodity Width',- height: 'Commodity Height',- volume: 'Commodity Volume',- unit: 'Commodity Unit',- cost: 'Commodity Cost',- price: 'Commodity Price'- },- deliveryManagement: {- shipment: 'Invoice',- preShipment: 'Pre Shipment',- newShipment: 'New Shipment',- goodsToBePicked: 'To Be Picked',- picked: 'Picked',- toBePackaged: 'To Be Packaged',- package: 'Pack',- packaged: 'Packaged',- toBeWeighed: 'To Be Weighed',- weigh: 'Weigh',- weighed: 'Weighed',- delivery: 'Delivery',- toBeDelivered: 'To Be Delivered',- outOfWarehouse: 'Delivered',- signIn: 'Sign In',- signedIn: 'Signed In',- dispatch_no: 'Shipment No',- dispatch_status: 'Shipment Doc Status',- qty: 'Total Quantity',- detailQty: 'Quantity',- weight: 'Total Weight',- volume: 'Total Volume',- customer_name: 'Customer Name',- spu_code: 'Commodity Code',- spu_name: 'Commodity Name',- sku_code: 'Specification Code',- sku_name: 'Specification Name',- unit: 'Commodity Unit',- creator: 'Created By',- create_time: 'Creation Time',- confirmOrder: 'Confirm Shipment Doc',- orderDetail: 'Shipment Order Product Details',- quantityOverflow: 'The sum of shipment quantity cannot exceed the shipment document quantity',- quantityIsZero: 'Please ensure that at least one of the selected goods has an issue quantity greater than 0!',- NoItemSelected: 'Please select at least one commodity to delivered!',- confirmSuccess: 'Confirm the shipment order successfully!',- confirmPicking: 'Confirm Picking',- confirmDelivery: 'Confirm Delivery',- confirmSignIn: 'Confirm Signing',- detailWeight: 'Weight',- unpackage_qty: 'Quantity to be packaged',- unweighing_qty: 'Quantity to be weighed',- validQtyMsgPackage: 'Please enter a valid value, which cannot exceed the total quantity',- validQtyMsgSignIn: 'Please enter a valid value',- signInQty: 'Actual signed in quantity',- incorrectStatusMsg: 'Operation failed, the status should be',- backToThePreviousStep: 'Recall to previous process',- confirmBack: 'Confirm withdrawal',- or: ' or ',- irreversible: 'This operation is irreversible',- detailQuantityIsZero: 'Shipment quantity cannot be 0',- qty_available: 'Available Quantity',- spu_description: 'Product Description',- bar_code: 'Bar Code',- order_qty: 'Order Quantity',- unpicked_qty: 'Quantity to be picked',- picked_qty: 'Picked Quantity',- detailVolume: 'Volume',- package_qty: 'Packed Quantity',- package_person: 'Packer',- package_time: 'Packaging Time',- weighing_no: 'Weighing sheet No',- package_no: 'Packaging serial No',- weighing_person: 'Weigher',- weighing_weight: 'Weighing Weight',- waybill_no: 'Waybill No',- carrier: 'Carrier',- damagedQuantity: 'Damaged quantity upon arrival',- setFreight: 'Set Carrier',- departure_city: 'Originating city',- arrival_city: 'City of arrival',- ViewInventoryDetails: 'View product details',- invalidValue: 'Please enter a valid value',- exceedingQuantity: 'Cannot exceed the total quantity'- }- }-}+export default {+ system: {+ hookComponent: {+ dialog: {+ defaultClose: 'Close',+ defaultConfirm: 'Agree',+ defaultTitle: 'Tips'+ }+ },+ page: {+ add: 'Add',+ update: 'Update',+ refresh: 'Refresh',+ export: 'Export',+ operate: 'Operate',+ edit: 'Edit',+ delete: 'Delete',+ close: 'Colse',+ submit: 'Submit',+ reset: 'Reset',+ confirm: 'Confirm',+ insertOneRow: 'Insert One Row',+ view: 'View',+ import: 'Import',+ chooseFile: 'Choose File',+ exportTemplate: 'Export Template',+ noData: 'No data',+ },+ tips: {+ success: ' success!',+ fail: ' fail!',+ beforeDeleteMessage: 'Do you want to delete this data?',+ beforeDeleteDetailMessage: 'Are you sure you want to delete this row?',+ detailLengthIsZero: 'Details verification before document submission!',+ detailHasItemRepeat: 'The details contain duplicate items!',+ noData: 'no data',+ beforeAsnConfirm: 'Confirm Arrival?',+ beforeAsnUnload: 'Confirm Unload?',+ beforeAsnSorted: 'Confirm Sorted?',+ requestTimeout: 'Request Timeout!',+ requestFail: 'Request fail.Please try it again',+ vaildEmail: 'Please enter the correct email format!'+ },+ checkText: {+ checkFormFail: 'Operation failed. Please check the data and try again!',+ mustInput: 'Please fill in the ',+ mustSelect: 'Please select ',+ integer: ' integer',+ decimal: ' decimal',+ pleaseEnter: 'Please enter ',+ inputIntMsg: 'decimal places of integer part',+ inputDecimalMsg: ' decimal places of the decimal part',+ lengthValid: 'The length should be between '+ },+ homeHeader: {+ logout: 'Logout'+ },+ combobox: {+ sex: {+ male: 'Male',+ female: 'Female'+ },+ yesOrNo: {+ yes: 'yes',+ no: 'no'+ }+ },+ pager: {+ pageSizes: '/page',+ goTo: 'Go to',+ total: 'Total',+ record: 'record'+ }+ },+ router: {+ sideBar: {+ homepage: 'Home Page',+ baseModule: 'Basic Settings',+ ownerOfCargo: 'Owner Information',+ menuBasicSettings: 'Menu',+ userManagement: 'User Management',+ commodityCategorySetting: 'Commodity Category',+ commodityManagement: 'Commodity Management',+ userRoleSetting: 'User Role',+ companySetting: 'Company Information',+ freightSetting: 'Freight Setting',+ warehouseSetting: 'Warehouse Setting',+ customer: 'Customer Info',+ supplier: 'Supplier Info',+ roleMenu: 'Role Menu Settings',+ stockManagement: 'Stock Management',+ warehouseWorkingModule: 'Warehouse Working',+ warehouseProcessing: 'Warehouse Processing',+ warehouseMove: 'Inventory Move',+ warehouseFreeze: 'Inventory freeze',+ warehouseAdjust: 'Inventory Adjust',+ warehouseTaking: 'Inventory Take',+ deliveryManagement: 'Delivery Management',+ stockAsn: 'Receiving Management'+ }+ },+ login: {+ welcomeTitle: 'Welcome to ModernWMS!👋🏻',+ mainButtonLabel: 'Login',+ rememberTips: 'Remember me',+ userName: 'UserName',+ password: 'Password',+ loginSuccess: 'Login succeeded!',+ notAuthority: 'Undistributed menu access the account, please contact the administrator to add it!',+ registerTips: 'No account? Click here to register!',+ register: 'Register'+ },+ homepage: {+ subTitle: 'Modern Warehouse Management System'+ },+ base: {+ freightSetting: {+ carrier: 'carrier',+ departure_city: 'Departure City',+ arrival_city: 'Arrival City',+ price_per_weight: 'Weight Fee',+ price_per_volume: 'Volume Fee',+ min_payment: 'Min Payment',+ creator: 'Creator',+ create_time: 'Create Time',+ last_update_time: 'Last Update Time',+ is_valid: 'Valid',+ freightSelectModal: 'Freight Select Modal',+ },+ userManagement: {+ user_num: 'User Num',+ user_name: 'User Name',+ user_role: 'Role',+ contact_tel: 'Contact Information',+ sex: 'Sex',+ is_valid: 'Valid',+ restPwd: 'Reset password',+ checkboxIsNull: 'Please select data!',+ beforeResetPwd: 'Are you sure you want to reset the passwords of these users?',+ afterResetPwd: 'Password reset succeeded, The new password is ',+ user_register_name: 'User Name',+ email: 'Email',+ auth_string: 'Password'+ },+ warehouseSetting: {+ warehouseSetting: 'Warehouse Setting',+ reservoirSetting: 'Reservoir Setting',+ locationSetting: 'Location Setting',+ locationSelectModal: 'Location Select Modal',+ email: 'Email',+ warehouse_name: 'Warehouse Name',+ city: 'City',+ address: 'Address',+ contact_tel: 'Acontact Tel',+ manager: 'Manager',+ is_valid: 'Valid',+ area_name: 'Reservoir Name',+ area_property: 'Reservoir Category',+ location_name: 'Location Code',+ location_length: 'Location Length(m)',+ location_width: 'Location Width(m)',+ location_heigth: 'Location Height(m)',+ location_volume: 'Location Volume(m³)',+ location_load: 'Location Load(kg)',+ roadway_number: 'Roadway Number',+ shelf_number: 'Shelf Number',+ layer_number: 'Layer Number',+ tag_number: 'Tag Number',+ picking_area: 'Picking Area',+ stocking_area: 'Stocking Area',+ receiving_area: 'Receiving Area',+ return_area: 'Return Area',+ defective_area: 'Defective Area',+ inventory_area: 'Inventory Area',+ creator: 'Creator',+ create_time: 'Create Time',+ last_update_time: 'Last Update Time'+ },+ customer: {+ customer_name: 'Customer Name',+ city: 'City',+ address: 'Address',+ manager: 'Manager',+ email: 'Email',+ contact_tel: 'Contact Tel',+ creator: 'Creator',+ create_time: 'Create Time',+ last_update_time: 'Last Update Time',+ is_valid: 'Valid'+ },+ supplier: {+ supplier_name: 'Supplier Name',+ city: 'City',+ address: 'Address',+ email: 'Email',+ manager: 'Manager',+ contact_tel: 'Contact Tel',+ creator: 'Creator',+ create_time: 'Create Time',+ last_update_time: 'Last Update Time',+ is_valid: 'Valid'+ },+ userRoleSetting: {+ role_name: 'User Role',+ is_valid: 'Valid'+ },+ companySetting: {+ company_name: 'Corporate Name',+ city: 'City',+ address: 'Detailed Address',+ manager: 'Person In Charge',+ contact_tel: 'Contact Information'+ },+ ownerOfCargo: {+ goods_owner_name: 'Owner Of Cargo',+ city: 'City',+ address: 'Detailed Address',+ manager: 'Person In Charge',+ contact_tel: 'Contact Information',+ creator: 'Creator',+ create_time: 'Create Time'+ },+ commodityCategorySetting: {+ category_name: 'Commodity category',+ parent_name: 'Parent Category',+ creator: 'Creator',+ create_time: 'Create Time'+ },+ roleMenu: {+ role_name: 'Role Name',+ menu_name: 'Menu Name',+ beforeUpdateOrDel: 'Please select the data to be processed first!'+ },+ commodityManagement: {+ spu_code: 'Commodity Code',+ spu_name: 'Commodity Name',+ category_name: 'Commodity Category',+ spu_description: 'Commodity Description',+ bar_code: 'Specification Code',+ sku_code: 'Specification Code',+ sku_name: 'Specification Name',+ supplier_name: 'Supplier Name',+ brand: 'Brand',+ unit: 'Commodity Unit',+ cost: 'Commodity Cost',+ price: 'Commodity Price',+ origin: 'origin',+ length_unit: 'Length Unit',+ volume_unit: 'Volume Unit',+ weight_unit: 'Weight Unit',+ weight: 'Commodity Weight',+ lenght: 'Commodity Length',+ width: 'Commodity Width',+ height: 'Commodity Height',+ volume: 'Commodity Volume'+ }+ },+ wms: {+ stock: {+ stockSelectModal: 'Stock Select Modal',+ skuSelectModal: 'Commodity Select Modal',+ warehouse: 'Warehouse Name',+ location_name: 'Location Code',+ qty_available: 'Available Qty'+ },+ warehouseWorking: {+ warehouseProcessing: {+ job_code: 'Job Code',+ job_type: 'Job Type',+ process_status: 'Process Status',+ processor: 'Processor',+ process_time: 'Process Time',+ qty: 'Qty',+ is_source: 'Is Source',+ spu_code: 'Commodity Code',+ spu_name: 'Commodity Name',+ sku_code: 'Specification Code',+ sku_name: 'Specification Name',+ target_warehouse: 'Target Warehouse',+ target_location: 'Target Location',+ unit: 'Unit',+ is_update_stock: 'Is Updated Stock',+ creator: 'Creator',+ create_time: 'Create Time',+ last_update_time: 'Last Update Time',+ adjust_status: 'Is Updated Stock',+ source: 'Source',+ target: 'Target',+ process_split: 'Split Processing',+ process_combine: 'Combine Processing',+ confirmProcess: 'Confirm Process',+ confirmAdjust: 'Confirm Adjust',+ qtyMoreThanAvailable: 'Can\'t more than the number of Available',+ beforeConfirmProcess: 'Are you sure to process this data?',+ beforeConfirmAdjust: 'Are you sure to adjust this data?',+ alreadyProcess: 'The data can\'t delete because it had been processed',+ alreadyAdjust: 'The data can\'t delete because it had been adjusted'+ },+ warehouseMove: {+ job_code: 'Job No',+ move_status: 'Move Status',+ qty: 'Qty',+ handler: 'Handler',+ handle_time: 'Handle Time',+ orig_goods_warehouse: 'Origin Warehouse',+ orig_goods_location_name: 'Origin Location',+ dest_googs_warehouse: 'Target Warehouse',+ dest_googs_location_name: 'Target Location',+ confirmMove: 'Confirm Move',+ creator: 'Creator',+ create_time: 'Create Time',+ beforeConfirmMove: 'Are you sure to move this data?',+ unadjust: 'Unadjust',+ adjusted: 'Adjusted'+ },+ warehouseFreeze: {+ job_code: 'Job Code',+ job_type: 'Job Type',+ handler: 'Handler',+ handle_time: 'Handle Time',+ creator: 'Creator',+ create_time: 'Create Time',+ warehouse: 'Warehouse',+ location_name: 'Location Code',+ freeze: 'Freeze',+ unfreeze: 'Unfreeze'+ },+ warehouseAdjust: {+ job_code: 'Job Code',+ job_type: 'Job Type',+ warehouse: 'Warehouse',+ location_name: 'Location Code',+ handler: 'Handler',+ handle_time: 'Handle Time',+ creator: 'Creator',+ create_time: 'Create Time',+ qty: 'Difference Qty',+ warehouseTake: 'Warehouse Take',+ processCombine: 'Warehouse Process',+ processSplit: 'Warehouse Process',+ warehouseMove: 'Warehouse Move',+ confirmAdjust: 'Confirm Adjust',+ beforeConfirmAdjust: 'Are you sure to adjust this data?'+ },+ warehouseTaking: {+ job_code: 'Job Code',+ job_status: 'Job Status',+ warehouse: 'Warehouse',+ location_name: 'Location Code',+ book_qty: 'Book Qty',+ counted_qty: 'Actual Qty',+ difference_qty: 'Difference Qty',+ handler: 'Handler',+ handle_time: 'Handle Time',+ creator: 'Creator',+ create_time: 'Create Time',+ confirmTaking: 'Confirm Taking',+ unfinish: 'Unfinish',+ finish: 'Finish',+ confirmAdjust: 'Confirm Adjust',+ beforeConfirmAdjust: 'Are you sure to adjust this data?',+ addFromCommodity: 'Choose From Commodity',+ addFromStock: 'Choose From Inventory',+ addTips: 'You can choose goods and the location to add a new record when there is no target inventory'+ }+ },+ stockManagement: {+ stockLocation: 'Stock Location',+ stock: 'Stock'+ },+ stockLocation: {+ warehouse_name: 'Warehouse',+ location_name: 'Location Code',+ spu_code: 'Commodity code',+ spu_name: 'Trade name',+ sku_id: 'Sku Id',+ sku_code: 'Specification code',+ sku_name: 'Form Name',+ qty: 'Quantity',+ qty_available: 'Available Quantity',+ qty_locked: 'Locked Quantity',+ qty_frozen: 'Frozen Quantity'+ },+ stockList: {+ spu_code: 'Commodity code',+ spu_name: 'Trade name',+ sku_code: 'Specification code',+ sku_id: 'Sku Id',+ qty: 'Quantity',+ qty_available: 'Available Quantity',+ qty_locked: 'Locked Quantity',+ qty_frozen: 'Frozen Quantity',+ qty_asn: 'Asn Quantity',+ qty_to_unload: 'Unload Quantity',+ qty_to_sort: 'Sort Quantity',+ qty_sorted: 'Sorted Quantity',+ shortage_qty: 'Shortage Quantity'+ },+ stockAsn: {+ tabNotice: 'Notice Of Arrival',+ tabToDoArrival: 'To Be Delivered',+ tabToDoUnload: 'To Be Unloaded',+ tabToDoSorting: 'To Be Sorted',+ tabToDoGrounding: 'To Be Put On The Shelf',+ tabReceiptDetails: 'Receipt Details'+ },+ stockAsnInfo: {+ id: 'ID',+ asn_no: 'Asn No',+ asn_status: 'Asn Status',+ spu_id: 'Spu Id',+ spu_code: 'Commodity code',+ spu_name: 'Trade name',+ sku_id: 'Sku Id',+ sku_code: 'Specification code',+ sku_name: 'Form Name',+ origin: 'Origin',+ length_unit: 'Length Unit',+ volume_unit: 'Volume Unit',+ weight_unit: 'Weight Unit',+ asn_qty: 'Asn Quantity',+ actual_qty: 'Actual Quantity',+ sorted_qty: 'Sorted Quantity',+ shortage_qty: 'Shortage Quantity',+ more_qty: 'More Quantity',+ damage_qty: 'Damage Quantity',+ weight: 'Weight',+ volume: 'Volume',+ supplier_id: 'Supplier Id',+ supplier_name: 'Supplier Name',+ goods_owner_id: 'Goods Owner Id',+ goods_owner_name: 'Goods Owner Name',+ is_valid: 'Valid'+ },+ skuInfo: {+ spu_id: 'Spu Id',+ spu_code: 'Commodity code',+ spu_name: 'Trade name',+ category_id: 'Commodity Category ID',+ category_name: 'Commodity Category',+ spu_description: 'Commodity Description',+ bar_code: 'Specification Code',+ supplier_id: 'Supplier Id',+ supplier_name: 'Supplier Name',+ brand: 'Brand',+ origin: 'origin',+ length_unit: 'Length Unit',+ volume_unit: 'Volume Unit',+ weight_unit: 'Weight Unit',+ sku_id: 'Sku Id',+ sku_code: 'Specification code',+ sku_name: 'Form Name',+ weight: 'Commodity Weight',+ lenght: 'Commodity Length',+ width: 'Commodity Width',+ height: 'Commodity Height',+ volume: 'Commodity Volume',+ unit: 'Commodity Unit',+ cost: 'Commodity Cost',+ price: 'Commodity Price'+ },+ deliveryManagement: {+ shipment: 'Invoice',+ preShipment: 'Pre Shipment',+ newShipment: 'New Shipment',+ goodsToBePicked: 'To Be Picked',+ picked: 'Picked',+ toBePackaged: 'To Be Packaged',+ package: 'Pack',+ packaged: 'Packaged',+ toBeWeighed: 'To Be Weighed',+ weigh: 'Weigh',+ weighed: 'Weighed',+ delivery: 'Delivery',+ toBeDelivered: 'To Be Delivered',+ outOfWarehouse: 'Delivered',+ signIn: 'Sign In',+ signedIn: 'Signed In',+ dispatch_no: 'Shipment No',+ dispatch_status: 'Shipment Doc Status',+ qty: 'Total Quantity',+ detailQty: 'Quantity',+ weight: 'Total Weight',+ volume: 'Total Volume',+ customer_name: 'Customer Name',+ spu_code: 'Commodity Code',+ spu_name: 'Commodity Name',+ sku_code: 'Specification Code',++ sku_name: 'Specification Name',++ unit: 'Commodity Unit',+ creator: 'Created By',+ create_time: 'Creation Time',+ confirmOrder: 'Confirm Shipment Doc',+ orderDetail: 'Shipment Order Product Details',+ quantityOverflow: 'The sum of shipment quantity cannot exceed the shipment document quantity',+ quantityIsZero: 'Please ensure that at least one of the selected goods has an issue quantity greater than 0!',+ NoItemSelected: 'Please select at least one commodity to delivered!',+ confirmSuccess: 'Confirm the shipment order successfully!',+ confirmPicking: 'Confirm Picking',+ confirmDelivery: 'Confirm Delivery',+ confirmSignIn: 'Confirm Signing',+ detailWeight: 'Weight',+ unpackage_qty: 'Quantity to be packaged',+ unweighing_qty: 'Quantity to be weighed',+ validQtyMsgPackage: 'Please enter a valid value, which cannot exceed the total quantity',+ validQtyMsgSignIn: 'Please enter a valid value',+ signInQty: 'Actual signed in quantity',+ incorrectStatusMsg: 'Operation failed, the status should be',+ backToThePreviousStep: 'Recall to previous process',+ confirmBack: 'Confirm withdrawal',+ or: ' or ',+ irreversible: 'This operation is irreversible',+ detailQuantityIsZero: 'Shipment quantity cannot be 0',+ qty_available: 'Available Quantity',+ spu_description: 'Product Description',+ bar_code: 'Bar Code',+ order_qty: 'Order Quantity',+ unpicked_qty: 'Quantity to be picked',+ picked_qty: 'Picked Quantity',+ detailVolume: 'Volume',+ package_qty: 'Packed Quantity',+ package_person: 'Packer',+ package_time: 'Packaging Time',+ weighing_no: 'Weighing sheet No',+ package_no: 'Packaging serial No',+ weighing_person: 'Weigher',+ weighing_weight: 'Weighing Weight',+ waybill_no: 'Waybill No',+ carrier: 'Carrier',+ damagedQuantity: 'Damaged quantity upon arrival',+ setFreight: 'Set Carrier',+ departure_city: 'Originating city',+ arrival_city: 'City of arrival',+ ViewInventoryDetails: 'View product details',+ invalidValue: 'Please enter a valid value',+ exceedingQuantity: 'Cannot exceed the total quantity'+ }+ }+}diff --cc frontend/src/view/deliveryManagement/deliveryManagement/tabNewShipment.vueindex c010f37,f5fa160..11db4ca--- a/frontend/src/view/deliveryManagement/deliveryManagement/tabNewShipment.vue+++ b/frontend/src/view/deliveryManagement/deliveryManagement/tabNewShipment.vue@@@ -1,205 -1,229 +1,229 @@@-<template>- <div class="operateArea">- <v-row no-gutters>- <!-- Operate Btn -->- <v-col cols="3" class="col">- <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>- <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>- </v-col>-- <!-- Search Input -->- <v-col cols="9">- <v-row no-gutters @keyup.enter="method.sureSearch">- <v-col cols="4"></v-col>- <v-col cols="4">- <v-text-field- v-model="data.searchForm.dispatch_no"- clearable- hide-details- density="comfortable"- class="searchInput ml-5 mt-1"- :label="$t('wms.deliveryManagement.dispatch_no')"- variant="solo"- >- </v-text-field>- </v-col>- <v-col cols="4">- <v-text-field- v-model="data.searchForm.customer_name"- clearable- hide-details- density="comfortable"- class="searchInput ml-5 mt-1"- :label="$t('wms.deliveryManagement.customer_name')"- variant="solo"- >- </v-text-field>- </v-col>- </v-row>- </v-col>- </v-row>- </div>-- <!-- Table -->- <div- class="mt-5"- :style="{- height: cardHeight- }"- >- <vxe-table ref="xTable" :column-config="{ minWidth: '100px' }" :data="data.tableData" :height="tableHeight" align="center">- <template #empty>- {{ i18n.global.t('system.page.noData') }}- </template>- <vxe-column type="seq" width="60"></vxe-column>- <!-- <vxe-column type="checkbox" width="50"></vxe-column> -->- <vxe-column field="dispatch_no" :title="$t('wms.deliveryManagement.dispatch_no')"></vxe-column>- <!-- <vxe-column field="dispatch_status" :title="$t('wms.deliveryManagement.dispatch_status')"></vxe-column> -->- <vxe-column field="qty" :title="$t('wms.deliveryManagement.qty')"></vxe-column>- <vxe-column field="weight" :title="$t('wms.deliveryManagement.weight')">- <template #default="{ row }">- <span>{{ `${row.weight} ${GetUnit('weight', 2)}` }}</span>- </template>- </vxe-column>- <vxe-column field="volume" :title="$t('wms.deliveryManagement.volume')">- <template #default="{ row }">- <span>{{ `${row.volume} ${GetUnit('volume', 1)}` }}</span>- </template>- </vxe-column>- <vxe-column field="customer_name" :title="$t('wms.deliveryManagement.customer_name')"></vxe-column>- <vxe-column field="creator" :title="$t('wms.deliveryManagement.creator')"></vxe-column>- <!-- <vxe-column- field="create_time"- width="170px"- :title="$t('wms.deliveryManagement.create_time')"- ></vxe-column> -->- <vxe-column field="operate" :title="$t('system.page.operate')" width="60" :resizable="false" show-overflow>- <template #default="{ row }">- <div style="width: 100%; display: flex; justify-content: center">- <tooltip-btn :flat="true" icon="mdi-eye-outline" :tooltip-text="$t('system.page.view')" @click="method.viewRow(row)"></tooltip-btn>- </div>- </template>- </vxe-column>- </vxe-table>- <custom-pager- :current-page="data.tablePage.pageIndex"- :page-size="data.tablePage.pageSize"- perfect- :total="data.tablePage.total"- :page-sizes="PAGE_SIZE"- :layouts="PAGE_LAYOUT"- @page-change="method.handlePageChange"- >- </custom-pager>- <!-- View order details -->- <SearchDeliveredMainDetail- :dispatch-no="data.showDeliveredMainDetailNo"- :show-dialog="data.showDeliveredMainDetail"- @close="method.closeDeliveredDetail"- />- </div>-</template>--<script lang="ts" setup>-import { computed, ref, reactive, watch } from 'vue'-import { VxePagerEvents } from 'vxe-table'-import { computedCardHeight, computedTableHeight } from '@/constant/style'-import { DeliveryManagementVO } from '@/types/DeliveryManagement/DeliveryManagement'-import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'-import { hookComponent } from '@/components/system'-import { getNewShipment } from '@/api/wms/deliveryManagement'-import tooltipBtn from '@/components/tooltip-btn.vue'-import i18n from '@/languages/i18n'-import { GetUnit } from '@/constant/commodityManagement'-import customPager from '@/components/custom-pager.vue'-import { setSearchObject } from '@/utils/common'-import { TablePage } from '@/types/System/Form'-import { exportData } from '@/utils/exportTable'-import { DEBOUNCE_TIME } from '@/constant/system'-import SearchDeliveredMainDetail from './search-delivered-main-detail.vue'--const xTable = ref()--const data = reactive({- showDeliveredMainDetailNo: '',- showDeliveredMainDetail: false,- showDialog: false,- searchForm: {- dispatch_no: '',- customer_name: ''- },- timer: ref<any>(null),- activeTab: null,- tableData: ref<DeliveryManagementVO[]>([]),- tablePage: ref<TablePage>({- total: 0,- pageIndex: 1,- pageSize: DEFAULT_PAGE_SIZE,- searchObjects: []- })-})--const method = reactive({- viewRow: (row: DeliveryManagementVO) => {- if (row.dispatch_no) {- data.showDeliveredMainDetailNo = row.dispatch_no- data.showDeliveredMainDetail = true- }- },- closeDeliveredDetail: () => {- data.showDeliveredMainDetail = false- },- // Refresh data- refresh: () => {- method.getNewShipment()- },- getNewShipment: async () => {- const { data: res } = await getNewShipment(data.tablePage)- if (!res.isSuccess) {- hookComponent.$message({- type: 'error',- content: res.errorMessage- })- return- }- data.tableData = res.data.rows- data.tablePage.total = res.data.totals- },- handlePageChange: ref<VxePagerEvents.PageChange>(({ currentPage, pageSize }) => {- data.tablePage.pageIndex = currentPage- data.tablePage.pageSize = pageSize-- method.getNewShipment()- }),- exportTable: () => {- const $table = xTable.value- exportData({- table: $table,- filename: i18n.global.t('wms.deliveryManagement.newShipment'),- columnFilterMethod({ column }: any) {- return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)- }- })- },- sureSearch: () => {- data.tablePage.searchObjects = setSearchObject(data.searchForm)- method.getNewShipment()- }-})--const cardHeight = computed(() => computedCardHeight({}))-const tableHeight = computed(() => computedTableHeight({}))--watch(- () => data.searchForm,- () => {- // debounce- if (data.timer) {- clearTimeout(data.timer)- }- data.timer = setTimeout(() => {- data.timer = null- method.sureSearch()- }, DEBOUNCE_TIME)- },- {- deep: true- }-)--defineExpose({- getNewShipment: method.getNewShipment-})-</script>--<style lang="less" scoped>-.operateArea {- width: 100%;- min-width: 760px;- display: flex;- align-items: center;- border-radius: 10px;- padding: 0 10px;-}--.col {- display: flex;- align-items: center;-}-</style>+<template>+ <div class="operateArea">+ <v-row no-gutters>+ <!-- Operate Btn -->+ <v-col cols="3" class="col">+ <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ </v-col>++ <!-- Search Input -->+ <v-col cols="9">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="4"></v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.dispatch_no"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.dispatch_no')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.customer_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.customer_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ </v-row>+ </v-col>+ </v-row>+ </div>++ <!-- Table -->+ <div+ class="mt-5"+ :style="{+ height: cardHeight+ }"+ >+ <vxe-table ref="xTable" :column-config="{ minWidth: '100px' }" :data="data.tableData" :height="tableHeight" align="center">+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <!-- <vxe-column type="checkbox" width="50"></vxe-column> -->+ <vxe-column field="dispatch_no" :title="$t('wms.deliveryManagement.dispatch_no')"></vxe-column>+ <!-- <vxe-column field="dispatch_status" :title="$t('wms.deliveryManagement.dispatch_status')"></vxe-column> -->+ <vxe-column field="qty" :title="$t('wms.deliveryManagement.qty')"></vxe-column>+ <vxe-column field="weight" :title="$t('wms.deliveryManagement.weight')">+ <template #default="{ row }">+ <span>{{ `${row.weight} ${GetUnit('weight', 2)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="volume" :title="$t('wms.deliveryManagement.volume')">+ <template #default="{ row }">+ <span>{{ `${row.volume} ${GetUnit('volume', 1)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="customer_name" :title="$t('wms.deliveryManagement.customer_name')"></vxe-column>+ <vxe-column field="creator" :title="$t('wms.deliveryManagement.creator')"></vxe-column>+ <!-- <vxe-column+ field="create_time"+ width="170px"+ :title="$t('wms.deliveryManagement.create_time')"-+ ></vxe-column> -->++ <vxe-column field="operate" :title="$t('system.page.operate')" width="60" :resizable="false" show-overflow>++ <template #default="{ row }">++ <div style="width: 100%; display: flex; justify-content: center">++ <tooltip-btn :flat="true" icon="mdi-eye-outline" :tooltip-text="$t('system.page.view')" @click="method.viewRow(row)"></tooltip-btn>++ </div>++ </template>++ </vxe-column>+ </vxe-table>+ <custom-pager+ :current-page="data.tablePage.pageIndex"+ :page-size="data.tablePage.pageSize"+ perfect+ :total="data.tablePage.total"+ :page-sizes="PAGE_SIZE"+ :layouts="PAGE_LAYOUT"+ @page-change="method.handlePageChange"+ >+ </custom-pager>++ <!-- View order details -->++ <SearchDeliveredMainDetail++ :dispatch-no="data.showDeliveredMainDetailNo"++ :show-dialog="data.showDeliveredMainDetail"++ @close="method.closeDeliveredDetail"++ />+ </div>+</template>++<script lang="ts" setup>+import { computed, ref, reactive, watch } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight } from '@/constant/style'+import { DeliveryManagementVO } from '@/types/DeliveryManagement/DeliveryManagement'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { hookComponent } from '@/components/system'+import { getNewShipment } from '@/api/wms/deliveryManagement'+import tooltipBtn from '@/components/tooltip-btn.vue'+import i18n from '@/languages/i18n'+import { GetUnit } from '@/constant/commodityManagement'+import customPager from '@/components/custom-pager.vue'+import { setSearchObject } from '@/utils/common'+import { TablePage } from '@/types/System/Form'+import { exportData } from '@/utils/exportTable'+import { DEBOUNCE_TIME } from '@/constant/system'++import SearchDeliveredMainDetail from './search-delivered-main-detail.vue'++const xTable = ref()++const data = reactive({++ showDeliveredMainDetailNo: '',++ showDeliveredMainDetail: false,+ showDialog: false,+ searchForm: {+ dispatch_no: '',+ customer_name: ''+ },+ timer: ref<any>(null),+ activeTab: null,+ tableData: ref<DeliveryManagementVO[]>([]),+ tablePage: ref<TablePage>({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: []+ })+})++const method = reactive({++ viewRow: (row: DeliveryManagementVO) => {++ if (row.dispatch_no) {++ data.showDeliveredMainDetailNo = row.dispatch_no++ data.showDeliveredMainDetail = true++ }++ },++ closeDeliveredDetail: () => {++ data.showDeliveredMainDetail = false++ },+ // Refresh data+ refresh: () => {+ method.getNewShipment()+ },+ getNewShipment: async () => {+ const { data: res } = await getNewShipment(data.tablePage)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ },+ handlePageChange: ref<VxePagerEvents.PageChange>(({ currentPage, pageSize }) => {+ data.tablePage.pageIndex = currentPage+ data.tablePage.pageSize = pageSize++ method.getNewShipment()+ }),+ exportTable: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('wms.deliveryManagement.newShipment'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getNewShipment()+ }+})++const cardHeight = computed(() => computedCardHeight({}))+const tableHeight = computed(() => computedTableHeight({}))++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)++defineExpose({+ getNewShipment: method.getNewShipment+})+</script>++<style lang="less" scoped>+.operateArea {+ width: 100%;+ min-width: 760px;+ display: flex;+ align-items: center;+ border-radius: 10px;+ padding: 0 10px;+}++.col {+ display: flex;+ align-items: center;+}+</style>diff --cc frontend/src/view/deliveryManagement/deliveryManagement/tabPreShipment.vueindex 1035523,bd8a2bd..eb7d6d0--- a/frontend/src/view/deliveryManagement/deliveryManagement/tabPreShipment.vue+++ b/frontend/src/view/deliveryManagement/deliveryManagement/tabPreShipment.vue@@@ -1,208 -1,232 +1,232 @@@-<template>- <div class="operateArea">- <v-row no-gutters>- <!-- Operate Btn -->- <v-col cols="3" class="col">- <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>- <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>- </v-col>-- <!-- Search Input -->- <v-col cols="9">- <v-row no-gutters @keyup.enter="method.sureSearch">- <v-col cols="4"></v-col>- <v-col cols="4">- <v-text-field- v-model="data.searchForm.dispatch_no"- clearable- hide-details- density="comfortable"- class="searchInput ml-5 mt-1"- :label="$t('wms.deliveryManagement.dispatch_no')"- variant="solo"- >- </v-text-field>- </v-col>- <v-col cols="4">- <v-text-field- v-model="data.searchForm.customer_name"- clearable- hide-details- density="comfortable"- class="searchInput ml-5 mt-1"- :label="$t('wms.deliveryManagement.customer_name')"- variant="solo"- >- </v-text-field>- </v-col>- </v-row>- </v-col>- </v-row>- </div>-- <!-- Table -->- <div- class="mt-5"- :style="{- height: cardHeight- }"- >- <vxe-table ref="xTable" :column-config="{ minWidth: '100px' }" :data="data.tableData" :height="tableHeight" align="center">- <template #empty>- {{ i18n.global.t('system.page.noData') }}- </template>- <vxe-column type="seq" width="60"></vxe-column>- <!-- <vxe-column type="checkbox" width="50"></vxe-column> -->- <vxe-column field="dispatch_no" :title="$t('wms.deliveryManagement.dispatch_no')"></vxe-column>- <!-- <vxe-column field="dispatch_status" :title="$t('wms.deliveryManagement.dispatch_status')"></vxe-column> -->- <vxe-column field="qty" :title="$t('wms.deliveryManagement.qty')"></vxe-column>- <vxe-column field="weight" :title="$t('wms.deliveryManagement.weight')">- <template #default="{ row }">- <span>{{ `${row.weight} ${GetUnit('weight', 2)}` }}</span>- </template>- </vxe-column>- <vxe-column field="volume" :title="$t('wms.deliveryManagement.volume')">- <template #default="{ row }">- <span>{{ `${row.volume} ${GetUnit('volume', 1)}` }}</span>- </template>- </vxe-column>- <vxe-column field="customer_name" :title="$t('wms.deliveryManagement.customer_name')"></vxe-column>- <vxe-column field="creator" :title="$t('wms.deliveryManagement.creator')"></vxe-column>- <!-- <vxe-column- field="create_time"- width="170px"- :title="$t('wms.deliveryManagement.create_time')"- ></vxe-column> -->- <vxe-column field="operate" :title="$t('system.page.operate')" width="70" :resizable="false" show-overflow>- <template #default="{ row }">- <div style="width: 100%; display: flex; justify-content: center">- <tooltip-btn :flat="true" icon="mdi-eye-outline" :tooltip-text="$t('system.page.view')" @click="method.viewRow(row)"></tooltip-btn>- </div>- </template>- </vxe-column>- </vxe-table>- <custom-pager- :current-page="data.tablePage.pageIndex"- :page-size="data.tablePage.pageSize"- perfect- :total="data.tablePage.total"- :page-sizes="PAGE_SIZE"- :layouts="PAGE_LAYOUT"- @page-change="method.handlePageChange"- >- </custom-pager>- <!-- View order details -->- <SearchDeliveredMainDetail- :dispatch-no="data.showDeliveredMainDetailNo"- :show-dialog="data.showDeliveredMainDetail"- @close="method.closeDeliveredDetail"- />- </div>-</template>--<script lang="ts" setup>-import { computed, ref, reactive, watch } from 'vue'-import { VxePagerEvents } from 'vxe-table'-import { computedCardHeight, computedTableHeight } from '@/constant/style'-import { DeliveryManagementVO } from '@/types/DeliveryManagement/DeliveryManagement'-import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'-import { hookComponent } from '@/components/system'-import { getPreShipment } from '@/api/wms/deliveryManagement'-import tooltipBtn from '@/components/tooltip-btn.vue'-import i18n from '@/languages/i18n'-import { GetUnit } from '@/constant/commodityManagement'-import customPager from '@/components/custom-pager.vue'-import { setSearchObject } from '@/utils/common'-import { TablePage } from '@/types/System/Form'-import { exportData } from '@/utils/exportTable'-import { DEBOUNCE_TIME } from '@/constant/system'-import SearchDeliveredMainDetail from './search-delivered-main-detail.vue'--const xTable = ref()--const data = reactive({- showDeliveredMainDetailNo: '',- showDeliveredMainDetail: false,- showDialog: false,- dialogForm: {- id: 0- },- searchForm: {- dispatch_no: '',- customer_name: ''- },- timer: ref<any>(null),- activeTab: null,- tableData: ref<DeliveryManagementVO[]>([]),- tablePage: ref<TablePage>({- total: 0,- pageIndex: 1,- pageSize: DEFAULT_PAGE_SIZE,- searchObjects: []- })-})--const method = reactive({- viewRow: (row: DeliveryManagementVO) => {- if (row.dispatch_no) {- data.showDeliveredMainDetailNo = row.dispatch_no- data.showDeliveredMainDetail = true- }- },- closeDeliveredDetail: () => {- data.showDeliveredMainDetail = false- },- // Refresh data- refresh: () => {- method.getPreShipment()- },- getPreShipment: async () => {- const { data: res } = await getPreShipment(data.tablePage)- if (!res.isSuccess) {- hookComponent.$message({- type: 'error',- content: res.errorMessage- })- return- }- data.tableData = res.data.rows- data.tablePage.total = res.data.totals- },- handlePageChange: ref<VxePagerEvents.PageChange>(({ currentPage, pageSize }) => {- data.tablePage.pageIndex = currentPage- data.tablePage.pageSize = pageSize-- method.getPreShipment()- }),- exportTable: () => {- const $table = xTable.value- exportData({- table: $table,- filename: i18n.global.t('wms.deliveryManagement.preShipment'),- columnFilterMethod({ column }: any) {- return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)- }- })- },- sureSearch: () => {- data.tablePage.searchObjects = setSearchObject(data.searchForm)- method.getPreShipment()- }-})--const cardHeight = computed(() => computedCardHeight({}))-const tableHeight = computed(() => computedTableHeight({}))--watch(- () => data.searchForm,- () => {- // debounce- if (data.timer) {- clearTimeout(data.timer)- }- data.timer = setTimeout(() => {- data.timer = null- method.sureSearch()- }, DEBOUNCE_TIME)- },- {- deep: true- }-)--defineExpose({- getPreShipment: method.getPreShipment-})-</script>--<style lang="less" scoped>-.operateArea {- width: 100%;- min-width: 760px;- display: flex;- align-items: center;- border-radius: 10px;- padding: 0 10px;-}--.col {- display: flex;- align-items: center;-}-</style>+<template>+ <div class="operateArea">+ <v-row no-gutters>+ <!-- Operate Btn -->+ <v-col cols="3" class="col">+ <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ </v-col>++ <!-- Search Input -->+ <v-col cols="9">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="4"></v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.dispatch_no"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.dispatch_no')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.customer_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.customer_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ </v-row>+ </v-col>+ </v-row>+ </div>++ <!-- Table -->+ <div+ class="mt-5"+ :style="{+ height: cardHeight+ }"+ >+ <vxe-table ref="xTable" :column-config="{ minWidth: '100px' }" :data="data.tableData" :height="tableHeight" align="center">+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <!-- <vxe-column type="checkbox" width="50"></vxe-column> -->+ <vxe-column field="dispatch_no" :title="$t('wms.deliveryManagement.dispatch_no')"></vxe-column>+ <!-- <vxe-column field="dispatch_status" :title="$t('wms.deliveryManagement.dispatch_status')"></vxe-column> -->+ <vxe-column field="qty" :title="$t('wms.deliveryManagement.qty')"></vxe-column>+ <vxe-column field="weight" :title="$t('wms.deliveryManagement.weight')">+ <template #default="{ row }">+ <span>{{ `${row.weight} ${GetUnit('weight', 2)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="volume" :title="$t('wms.deliveryManagement.volume')">+ <template #default="{ row }">+ <span>{{ `${row.volume} ${GetUnit('volume', 1)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="customer_name" :title="$t('wms.deliveryManagement.customer_name')"></vxe-column>+ <vxe-column field="creator" :title="$t('wms.deliveryManagement.creator')"></vxe-column>+ <!-- <vxe-column+ field="create_time"+ width="170px"+ :title="$t('wms.deliveryManagement.create_time')"-+ ></vxe-column> -->++ <vxe-column field="operate" :title="$t('system.page.operate')" width="70" :resizable="false" show-overflow>++ <template #default="{ row }">++ <div style="width: 100%; display: flex; justify-content: center">++ <tooltip-btn :flat="true" icon="mdi-eye-outline" :tooltip-text="$t('system.page.view')" @click="method.viewRow(row)"></tooltip-btn>++ </div>++ </template>++ </vxe-column>+ </vxe-table>+ <custom-pager+ :current-page="data.tablePage.pageIndex"+ :page-size="data.tablePage.pageSize"+ perfect+ :total="data.tablePage.total"+ :page-sizes="PAGE_SIZE"+ :layouts="PAGE_LAYOUT"+ @page-change="method.handlePageChange"+ >+ </custom-pager>++ <!-- View order details -->++ <SearchDeliveredMainDetail++ :dispatch-no="data.showDeliveredMainDetailNo"++ :show-dialog="data.showDeliveredMainDetail"++ @close="method.closeDeliveredDetail"++ />+ </div>+</template>++<script lang="ts" setup>+import { computed, ref, reactive, watch } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight } from '@/constant/style'+import { DeliveryManagementVO } from '@/types/DeliveryManagement/DeliveryManagement'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { hookComponent } from '@/components/system'+import { getPreShipment } from '@/api/wms/deliveryManagement'+import tooltipBtn from '@/components/tooltip-btn.vue'+import i18n from '@/languages/i18n'+import { GetUnit } from '@/constant/commodityManagement'+import customPager from '@/components/custom-pager.vue'+import { setSearchObject } from '@/utils/common'+import { TablePage } from '@/types/System/Form'+import { exportData } from '@/utils/exportTable'+import { DEBOUNCE_TIME } from '@/constant/system'++import SearchDeliveredMainDetail from './search-delivered-main-detail.vue'++const xTable = ref()++const data = reactive({++ showDeliveredMainDetailNo: '',++ showDeliveredMainDetail: false,+ showDialog: false,+ dialogForm: {+ id: 0+ },+ searchForm: {+ dispatch_no: '',+ customer_name: ''+ },+ timer: ref<any>(null),+ activeTab: null,+ tableData: ref<DeliveryManagementVO[]>([]),+ tablePage: ref<TablePage>({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: []+ })+})++const method = reactive({++ viewRow: (row: DeliveryManagementVO) => {++ if (row.dispatch_no) {++ data.showDeliveredMainDetailNo = row.dispatch_no++ data.showDeliveredMainDetail = true++ }++ },++ closeDeliveredDetail: () => {++ data.showDeliveredMainDetail = false++ },+ // Refresh data+ refresh: () => {+ method.getPreShipment()+ },+ getPreShipment: async () => {+ const { data: res } = await getPreShipment(data.tablePage)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ },+ handlePageChange: ref<VxePagerEvents.PageChange>(({ currentPage, pageSize }) => {+ data.tablePage.pageIndex = currentPage+ data.tablePage.pageSize = pageSize++ method.getPreShipment()+ }),+ exportTable: () => {+ const $table = xTable.value- exportData({- table: $table,- filename: i18n.global.t('wms.deliveryManagement.preShipment'),- columnFilterMethod({ column }: any) {- return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)- }- })++ exportData({++ table: $table,++ filename: i18n.global.t('wms.deliveryManagement.preShipment'),++ columnFilterMethod({ column }: any) {++ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)++ }++ })+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm)+ method.getPreShipment()+ }+})++const cardHeight = computed(() => computedCardHeight({}))+const tableHeight = computed(() => computedTableHeight({}))++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)++defineExpose({+ getPreShipment: method.getPreShipment+})+</script>++<style lang="less" scoped>+.operateArea {+ width: 100%;+ min-width: 760px;+ display: flex;+ align-items: center;+ border-radius: 10px;+ padding: 0 10px;+}++.col {+ display: flex;+ align-items: center;+}+</style>diff --cc frontend/src/view/deliveryManagement/deliveryManagement/tabShipment.vueindex ee6bd27,86ff145..8bece4e--- a/frontend/src/view/deliveryManagement/deliveryManagement/tabShipment.vue+++ b/frontend/src/view/deliveryManagement/deliveryManagement/tabShipment.vue@@@ -1,424 -1,443 +1,443 @@@-<template>- <div class="operateArea">- <v-row no-gutters>- <!-- Operate Btn -->- <v-col cols="3" class="col">- <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.add')" @click="method.add()"></tooltip-btn>- <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>- <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>- </v-col>-- <!-- Search Input -->- <v-col cols="9">- <v-row no-gutters @keyup.enter="method.sureSearch">- <v-col cols="4">- <v-text-field- v-model="data.searchForm.dispatch_no"- clearable- hide-details- density="comfortable"- class="searchInput ml-5 mt-1"- :label="$t('wms.deliveryManagement.dispatch_no')"- variant="solo"- >- </v-text-field>- </v-col>- <v-col cols="4">- <v-select- v-model="data.searchForm.dispatch_status"- :items="data.combobox.dispatch_status"- item-title="label"- item-value="value"- :label="$t('wms.deliveryManagement.dispatch_status')"- variant="solo"- density="comfortable"- class="searchInput ml-5 mt-1"- clearable- hide-details- ></v-select>- </v-col>- <v-col cols="4">- <v-text-field- v-model="data.searchForm.customer_name"- clearable- hide-details- density="comfortable"- class="searchInput ml-5 mt-1"- :label="$t('wms.deliveryManagement.customer_name')"- variant="solo"- >- </v-text-field>- </v-col>- </v-row>- </v-col>- </v-row>- </div>-- <!-- Table -->- <div- class="mt-5"- :style="{- height: cardHeight- }"- >- <vxe-table ref="xTable" :column-config="{ minWidth: '100px' }" :data="data.tableData" :height="tableHeight" align="center">- <template #empty>- {{ i18n.global.t('system.page.noData') }}- </template>- <vxe-column type="seq" width="60"></vxe-column>- <!-- <vxe-column type="checkbox" width="50"></vxe-column> -->- <vxe-column field="dispatch_no" width="120" :title="$t('wms.deliveryManagement.dispatch_no')"></vxe-column>- <vxe-column field="dispatch_status" :title="$t('wms.deliveryManagement.dispatch_status')">- <template #default="{ row }">- <span>{{ getShipmentState(row.dispatch_status) }}</span>- </template>- </vxe-column>- <vxe-column field="qty" :title="$t('wms.deliveryManagement.qty')"></vxe-column>- <vxe-column field="weight" :title="$t('wms.deliveryManagement.weight')">- <template #default="{ row }">- <span>{{ `${row.weight} ${GetUnit('weight', 2)}` }}</span>- </template>- </vxe-column>- <vxe-column field="volume" :title="$t('wms.deliveryManagement.volume')">- <template #default="{ row }">- <span>{{ `${row.volume} ${GetUnit('volume', 1)}` }}</span>- </template>- </vxe-column>- <vxe-column field="customer_name" :title="$t('wms.deliveryManagement.customer_name')"></vxe-column>- <vxe-column field="creator" :title="$t('wms.deliveryManagement.creator')"></vxe-column>- <!-- <vxe-column field="create_time" width="170px" :title="$t('wms.deliveryManagement.create_time')"></vxe-column> -->- <vxe-column field="operate" :title="$t('system.page.operate')" width="290" :resizable="false" show-overflow>- <template #default="{ row }">- <div style="width: 100%; display: flex; justify-content: center">- <tooltip-btn :flat="true" icon="mdi-eye-outline" :tooltip-text="$t('system.page.view')" @click="method.viewRow(row)"></tooltip-btn>- <tooltip-btn- :disabled="row.dispatch_status !== 0 && row.dispatch_status !== 1"- :flat="true"- icon="mdi-clipboard-check-outline"- :tooltip-text="$t('wms.deliveryManagement.confirmOrder')"- @click="method.confirmOrder(row)"- ></tooltip-btn>- <tooltip-btn- :disabled="row.dispatch_status !== 2"- :flat="true"- icon="mdi-cart-arrow-down"- :tooltip-text="$t('wms.deliveryManagement.confirmPicking')"- @click="method.confirmPicking(row)"- ></tooltip-btn>- <tooltip-btn- :disabled="row.dispatch_status !== 2 && row.dispatch_status !== 3"- :flat="true"- icon="mdi-arrow-u-left-top"- :tooltip-text="$t('wms.deliveryManagement.backToThePreviousStep')"- @click="method.backToThePreviousStep(row)"- ></tooltip-btn>- <tooltip-btn- :disabled="row.dispatch_status !== 0 && row.dispatch_status !== 1"- :flat="true"- icon="mdi-delete-outline"- :tooltip-text="$t('system.page.delete')"- :icon-color="errorColor"- @click="method.deleteRow(row)"- ></tooltip-btn>- </div>- </template>- </vxe-column>- </vxe-table>- <custom-pager- :current-page="data.tablePage.pageIndex"- :page-size="data.tablePage.pageSize"- perfect- :total="data.tablePage.total"- :page-sizes="PAGE_SIZE"- :layouts="PAGE_LAYOUT"- @page-change="method.handlePageChange"- >- </custom-pager>- <!-- Add or modify data mode window -->- <addOrUpdateShipment :show-dialog="data.showDialog" :form="data.dialogForm" @close="method.closeDialog" @saveSuccess="method.saveSuccess" />- <!-- Confirm Order -->- <ConfirmOrder- :confirm-order-no="data.confirmOrderNo"- :show-dialog="data.showConfirmOrder"- @close="method.closeConfirmOrder"- @save-success="method.confirmSuccess"- />- <!-- View order details -->- <SearchDeliveredMainDetail- :dispatch-no="data.showDeliveredMainDetailNo"- :show-dialog="data.showDeliveredMainDetail"- @close="method.closeDeliveredDetail"- />- </div>-</template>--<script lang="ts" setup>-import { computed, ref, reactive, watch } from 'vue'-import { VxePagerEvents } from 'vxe-table'-import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'-import { DeliveryManagementVO } from '@/types/DeliveryManagement/DeliveryManagement'-import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'-import { hookComponent } from '@/components/system'-import { getShipment, delShipment, cancelOrderByDispatch, confirmPicking } from '@/api/wms/deliveryManagement'-import tooltipBtn from '@/components/tooltip-btn.vue'-import i18n from '@/languages/i18n'-import addOrUpdateShipment from './add-or-update-shipment.vue'-import { getShipmentState } from './shipmentFun'-import ConfirmOrder from './confirm-order.vue'-import { GetUnit } from '@/constant/commodityManagement'-import customPager from '@/components/custom-pager.vue'-import { setSearchObject } from '@/utils/common'-import { TablePage } from '@/types/System/Form'-import { exportData } from '@/utils/exportTable'-import { DEBOUNCE_TIME } from '@/constant/system'-import SearchDeliveredMainDetail from './search-delivered-main-detail.vue'--const xTable = ref()--const data = reactive({- showDeliveredMainDetailNo: '',- showDeliveredMainDetail: false,- showDialog: false,- dialogForm: {- id: 0,- detailList: []- },- searchForm: ref<{- dispatch_no: string- customer_name: string- dispatch_status?: string- }>({- dispatch_no: '',- customer_name: ''- }),- timer: ref<any>(null),- activeTab: null,- tableData: ref<DeliveryManagementVO[]>([]),- tablePage: ref<TablePage>({- total: 0,- pageIndex: 1,- pageSize: DEFAULT_PAGE_SIZE,- searchObjects: []- }),- showConfirmOrder: false,- confirmOrderNo: '',- combobox: {- dispatch_status: [- {- label: i18n.global.t('wms.deliveryManagement.preShipment'),- value: '0'- },- {- label: i18n.global.t('wms.deliveryManagement.newShipment'),- value: '1'- },- {- label: i18n.global.t('wms.deliveryManagement.goodsToBePicked'),- value: '2'- },- {- label: i18n.global.t('wms.deliveryManagement.picked'),- value: '3'- },- {- label: i18n.global.t('wms.deliveryManagement.packaged'),- value: '4'- },- {- label: i18n.global.t('wms.deliveryManagement.weighed'),- value: '5'- },- {- label: i18n.global.t('wms.deliveryManagement.outOfWarehouse'),- value: '6'- },- {- label: i18n.global.t('wms.deliveryManagement.signedIn'),- value: '7'- }- ]- }-})--const method = reactive({- viewRow: (row: DeliveryManagementVO) => {- if (row.dispatch_no) {- data.showDeliveredMainDetailNo = row.dispatch_no- data.showDeliveredMainDetail = true- }- },- closeDeliveredDetail: () => {- data.showDeliveredMainDetail = false- },- // Confirm picking- confirmPicking: async (row: DeliveryManagementVO) => {- hookComponent.$dialog({- content: `${ i18n.global.t('wms.deliveryManagement.confirmPicking') }?`,- handleConfirm: async () => {- if (row.dispatch_no) {- const { data: res } = await confirmPicking(row.dispatch_no)- if (!res.isSuccess) {- hookComponent.$message({- type: 'error',- content: res.errorMessage- })- return- }- hookComponent.$message({- type: 'success',- content: res.data- })- method.refresh()- }- }- })- },- // Back to the previous step- backToThePreviousStep(row: DeliveryManagementVO) {- hookComponent.$dialog({- content: `${ i18n.global.t('wms.deliveryManagement.confirmBack') }?`,- handleConfirm: async () => {- const { data: res } = await cancelOrderByDispatch({- dispatch_no: row.dispatch_no,- dispatch_status: row.dispatch_status- })- if (!res.isSuccess) {- hookComponent.$message({- type: 'error',- content: res.errorMessage- })- return- }- hookComponent.$message({- type: 'success',- content: res.data- })- method.refresh()- }- })- },- // Close the order confirmation window- closeConfirmOrder: () => {- data.showConfirmOrder = false- },- // After confirming the shipment document- confirmSuccess: () => {- method.refresh()- method.closeConfirmOrder()- },- // after Add or update success.- saveSuccess: () => {- method.refresh()- method.closeDialog()- },- // Shut add or update dialog- closeDialog: () => {- data.showDialog = false- },- // Refresh dialog data- clearDialogForm: () => {- data.dialogForm = {- id: 0,- detailList: []- }- },- add: () => {- method.clearDialogForm()- data.showDialog = true- },- confirmOrder: (row: DeliveryManagementVO) => {- if (row.dispatch_status === undefined || ![0, 1].includes(row.dispatch_status)) {- hookComponent.$message({- type: 'error',- content: `${ i18n.global.t('wms.deliveryManagement.incorrectStatusMsg') }${ getShipmentState(0) }${ i18n.global.t(- 'wms.deliveryManagement.or'- ) }${ getShipmentState(1) }`- })- return- }- if (row.dispatch_no) {- data.confirmOrderNo = row.dispatch_no- data.showConfirmOrder = true- }- },- deleteRow: (row: DeliveryManagementVO) => {- hookComponent.$dialog({- content: i18n.global.t('system.tips.beforeDeleteMessage'),- handleConfirm: async () => {- if (row.dispatch_no) {- const { data: res } = await delShipment(row.dispatch_no)- if (!res.isSuccess) {- hookComponent.$message({- type: 'error',- content: res.errorMessage- })- return- }- hookComponent.$message({- type: 'success',- content: `${ i18n.global.t('system.page.delete') }${ i18n.global.t('system.tips.success') }`- })- method.refresh()- }- }- })- },- // Refresh data- refresh: () => {- method.getShipment()- },- getShipment: async () => {- const { data: res } = await getShipment(data.tablePage)- if (!res.isSuccess) {- hookComponent.$message({- type: 'error',- content: res.errorMessage- })- return- }- data.tableData = res.data.rows- data.tablePage.total = res.data.totals- },- handlePageChange: ref<VxePagerEvents.PageChange>(({ currentPage, pageSize }) => {- data.tablePage.pageIndex = currentPage- data.tablePage.pageSize = pageSize-- method.getShipment()- }),- exportTable: () => {- const $table = xTable.value- exportData({- table: $table,- filename: i18n.global.t('wms.deliveryManagement.shipment'),- columnFilterMethod({ column }: any) {- return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)- }- })- },- sureSearch: () => {- data.tablePage.searchObjects = setSearchObject(data.searchForm, ['dispatch_status'])- method.getShipment()- }-})--const cardHeight = computed(() => computedCardHeight({}))-const tableHeight = computed(() => computedTableHeight({}))--watch(- () => data.searchForm,- () => {- // debounce- if (data.timer) {- clearTimeout(data.timer)- }- data.timer = setTimeout(() => {- data.timer = null- method.sureSearch()- }, DEBOUNCE_TIME)- },- {- deep: true- }-)--defineExpose({- getShipment: method.getShipment-})-</script>--<style lang="less" scoped>-.operateArea {- width: 100%;- min-width: 760px;- display: flex;- align-items: center;- border-radius: 10px;- padding: 0 10px;-}--.col {- display: flex;- align-items: center;-}-</style>+<template>+ <div class="operateArea">+ <v-row no-gutters>+ <!-- Operate Btn -->+ <v-col cols="3" class="col">+ <tooltip-btn icon="mdi-plus" :tooltip-text="$t('system.page.add')" @click="method.add()"></tooltip-btn>+ <tooltip-btn icon="mdi-refresh" :tooltip-text="$t('system.page.refresh')" @click="method.refresh"></tooltip-btn>+ <tooltip-btn icon="mdi-export-variant" :tooltip-text="$t('system.page.export')" @click="method.exportTable"> </tooltip-btn>+ </v-col>++ <!-- Search Input -->+ <v-col cols="9">+ <v-row no-gutters @keyup.enter="method.sureSearch">+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.dispatch_no"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.dispatch_no')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ <v-col cols="4">+ <v-select+ v-model="data.searchForm.dispatch_status"+ :items="data.combobox.dispatch_status"+ item-title="label"+ item-value="value"+ :label="$t('wms.deliveryManagement.dispatch_status')"+ variant="solo"+ density="comfortable"+ class="searchInput ml-5 mt-1"+ clearable+ hide-details+ ></v-select>+ </v-col>+ <v-col cols="4">+ <v-text-field+ v-model="data.searchForm.customer_name"+ clearable+ hide-details+ density="comfortable"+ class="searchInput ml-5 mt-1"+ :label="$t('wms.deliveryManagement.customer_name')"+ variant="solo"+ >+ </v-text-field>+ </v-col>+ </v-row>+ </v-col>+ </v-row>+ </div>++ <!-- Table -->+ <div+ class="mt-5"+ :style="{+ height: cardHeight+ }"+ >+ <vxe-table ref="xTable" :column-config="{ minWidth: '100px' }" :data="data.tableData" :height="tableHeight" align="center">+ <template #empty>+ {{ i18n.global.t('system.page.noData') }}+ </template>+ <vxe-column type="seq" width="60"></vxe-column>+ <!-- <vxe-column type="checkbox" width="50"></vxe-column> -->+ <vxe-column field="dispatch_no" width="120" :title="$t('wms.deliveryManagement.dispatch_no')"></vxe-column>+ <vxe-column field="dispatch_status" :title="$t('wms.deliveryManagement.dispatch_status')">+ <template #default="{ row }">+ <span>{{ getShipmentState(row.dispatch_status) }}</span>+ </template>+ </vxe-column>+ <vxe-column field="qty" :title="$t('wms.deliveryManagement.qty')"></vxe-column>+ <vxe-column field="weight" :title="$t('wms.deliveryManagement.weight')">+ <template #default="{ row }">+ <span>{{ `${row.weight} ${GetUnit('weight', 2)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="volume" :title="$t('wms.deliveryManagement.volume')">+ <template #default="{ row }">+ <span>{{ `${row.volume} ${GetUnit('volume', 1)}` }}</span>+ </template>+ </vxe-column>+ <vxe-column field="customer_name" :title="$t('wms.deliveryManagement.customer_name')"></vxe-column>+ <vxe-column field="creator" :title="$t('wms.deliveryManagement.creator')"></vxe-column>+ <!-- <vxe-column field="create_time" width="170px" :title="$t('wms.deliveryManagement.create_time')"></vxe-column> -->- <vxe-column field="operate" :title="$t('system.page.operate')" width="240" :resizable="false" show-overflow>++ <vxe-column field="operate" :title="$t('system.page.operate')" width="290" :resizable="false" show-overflow>+ <template #default="{ row }">+ <div style="width: 100%; display: flex; justify-content: center">++ <tooltip-btn :flat="true" icon="mdi-eye-outline" :tooltip-text="$t('system.page.view')" @click="method.viewRow(row)"></tooltip-btn>+ <tooltip-btn+ :disabled="row.dispatch_status !== 0 && row.dispatch_status !== 1"+ :flat="true"+ icon="mdi-clipboard-check-outline"+ :tooltip-text="$t('wms.deliveryManagement.confirmOrder')"+ @click="method.confirmOrder(row)"+ ></tooltip-btn>+ <tooltip-btn+ :disabled="row.dispatch_status !== 2"+ :flat="true"+ icon="mdi-cart-arrow-down"+ :tooltip-text="$t('wms.deliveryManagement.confirmPicking')"+ @click="method.confirmPicking(row)"+ ></tooltip-btn>+ <tooltip-btn+ :disabled="row.dispatch_status !== 2 && row.dispatch_status !== 3"+ :flat="true"+ icon="mdi-arrow-u-left-top"+ :tooltip-text="$t('wms.deliveryManagement.backToThePreviousStep')"+ @click="method.backToThePreviousStep(row)"+ ></tooltip-btn>+ <tooltip-btn+ :disabled="row.dispatch_status !== 0 && row.dispatch_status !== 1"+ :flat="true"+ icon="mdi-delete-outline"+ :tooltip-text="$t('system.page.delete')"+ :icon-color="errorColor"+ @click="method.deleteRow(row)"+ ></tooltip-btn>+ </div>+ </template>+ </vxe-column>+ </vxe-table>+ <custom-pager+ :current-page="data.tablePage.pageIndex"+ :page-size="data.tablePage.pageSize"+ perfect+ :total="data.tablePage.total"+ :page-sizes="PAGE_SIZE"+ :layouts="PAGE_LAYOUT"+ @page-change="method.handlePageChange"+ >+ </custom-pager>+ <!-- Add or modify data mode window -->+ <addOrUpdateShipment :show-dialog="data.showDialog" :form="data.dialogForm" @close="method.closeDialog" @saveSuccess="method.saveSuccess" />+ <!-- Confirm Order -->+ <ConfirmOrder+ :confirm-order-no="data.confirmOrderNo"+ :show-dialog="data.showConfirmOrder"+ @close="method.closeConfirmOrder"+ @save-success="method.confirmSuccess"+ />++ <!-- View order details -->++ <SearchDeliveredMainDetail++ :dispatch-no="data.showDeliveredMainDetailNo"++ :show-dialog="data.showDeliveredMainDetail"++ @close="method.closeDeliveredDetail"++ />+ </div>+</template>++<script lang="ts" setup>+import { computed, ref, reactive, watch } from 'vue'+import { VxePagerEvents } from 'vxe-table'+import { computedCardHeight, computedTableHeight, errorColor } from '@/constant/style'+import { DeliveryManagementVO } from '@/types/DeliveryManagement/DeliveryManagement'+import { PAGE_SIZE, PAGE_LAYOUT, DEFAULT_PAGE_SIZE } from '@/constant/vxeTable'+import { hookComponent } from '@/components/system'+import { getShipment, delShipment, cancelOrderByDispatch, confirmPicking } from '@/api/wms/deliveryManagement'+import tooltipBtn from '@/components/tooltip-btn.vue'+import i18n from '@/languages/i18n'+import addOrUpdateShipment from './add-or-update-shipment.vue'+import { getShipmentState } from './shipmentFun'+import ConfirmOrder from './confirm-order.vue'+import { GetUnit } from '@/constant/commodityManagement'+import customPager from '@/components/custom-pager.vue'+import { setSearchObject } from '@/utils/common'+import { TablePage } from '@/types/System/Form'+import { exportData } from '@/utils/exportTable'+import { DEBOUNCE_TIME } from '@/constant/system'++import SearchDeliveredMainDetail from './search-delivered-main-detail.vue'++const xTable = ref()++const data = reactive({++ showDeliveredMainDetailNo: '',++ showDeliveredMainDetail: false,+ showDialog: false,+ dialogForm: {+ id: 0,+ detailList: []+ },+ searchForm: ref<{+ dispatch_no: string+ customer_name: string+ dispatch_status?: string+ }>({+ dispatch_no: '',+ customer_name: ''+ }),+ timer: ref<any>(null),+ activeTab: null,+ tableData: ref<DeliveryManagementVO[]>([]),+ tablePage: ref<TablePage>({+ total: 0,+ pageIndex: 1,+ pageSize: DEFAULT_PAGE_SIZE,+ searchObjects: []+ }),+ showConfirmOrder: false,+ confirmOrderNo: '',+ combobox: {+ dispatch_status: [+ {+ label: i18n.global.t('wms.deliveryManagement.preShipment'),+ value: '0'+ },+ {+ label: i18n.global.t('wms.deliveryManagement.newShipment'),+ value: '1'+ },+ {+ label: i18n.global.t('wms.deliveryManagement.goodsToBePicked'),+ value: '2'+ },+ {+ label: i18n.global.t('wms.deliveryManagement.picked'),+ value: '3'+ },+ {+ label: i18n.global.t('wms.deliveryManagement.packaged'),+ value: '4'+ },+ {+ label: i18n.global.t('wms.deliveryManagement.weighed'),+ value: '5'+ },+ {+ label: i18n.global.t('wms.deliveryManagement.outOfWarehouse'),+ value: '6'+ },+ {+ label: i18n.global.t('wms.deliveryManagement.signedIn'),+ value: '7'+ }+ ]+ }+})++const method = reactive({++ viewRow: (row: DeliveryManagementVO) => {++ if (row.dispatch_no) {++ data.showDeliveredMainDetailNo = row.dispatch_no++ data.showDeliveredMainDetail = true++ }++ },++ closeDeliveredDetail: () => {++ data.showDeliveredMainDetail = false++ },+ // Confirm picking+ confirmPicking: async (row: DeliveryManagementVO) => {+ hookComponent.$dialog({+ content: `${ i18n.global.t('wms.deliveryManagement.confirmPicking') }?`,+ handleConfirm: async () => {+ if (row.dispatch_no) {+ const { data: res } = await confirmPicking(row.dispatch_no)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: res.data+ })+ method.refresh()+ }+ }+ })+ },+ // Back to the previous step+ backToThePreviousStep(row: DeliveryManagementVO) {+ hookComponent.$dialog({+ content: `${ i18n.global.t('wms.deliveryManagement.confirmBack') }?`,+ handleConfirm: async () => {+ const { data: res } = await cancelOrderByDispatch({+ dispatch_no: row.dispatch_no,+ dispatch_status: row.dispatch_status+ })+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: res.data+ })+ method.refresh()+ }+ })+ },+ // Close the order confirmation window+ closeConfirmOrder: () => {+ data.showConfirmOrder = false+ },+ // After confirming the shipment document+ confirmSuccess: () => {+ method.refresh()+ method.closeConfirmOrder()+ },+ // after Add or update success.+ saveSuccess: () => {+ method.refresh()+ method.closeDialog()+ },+ // Shut add or update dialog+ closeDialog: () => {+ data.showDialog = false+ },+ // Refresh dialog data+ clearDialogForm: () => {+ data.dialogForm = {+ id: 0,+ detailList: []+ }+ },+ add: () => {+ method.clearDialogForm()+ data.showDialog = true+ },+ confirmOrder: (row: DeliveryManagementVO) => {+ if (row.dispatch_status === undefined || ![0, 1].includes(row.dispatch_status)) {+ hookComponent.$message({+ type: 'error',+ content: `${ i18n.global.t('wms.deliveryManagement.incorrectStatusMsg') }${ getShipmentState(0) }${ i18n.global.t(+ 'wms.deliveryManagement.or'+ ) }${ getShipmentState(1) }`+ })+ return+ }+ if (row.dispatch_no) {+ data.confirmOrderNo = row.dispatch_no+ data.showConfirmOrder = true+ }+ },+ deleteRow: (row: DeliveryManagementVO) => {+ hookComponent.$dialog({+ content: i18n.global.t('system.tips.beforeDeleteMessage'),+ handleConfirm: async () => {+ if (row.dispatch_no) {+ const { data: res } = await delShipment(row.dispatch_no)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ hookComponent.$message({+ type: 'success',+ content: `${ i18n.global.t('system.page.delete') }${ i18n.global.t('system.tips.success') }`+ })+ method.refresh()+ }+ }+ })+ },+ // Refresh data+ refresh: () => {+ method.getShipment()+ },+ getShipment: async () => {+ const { data: res } = await getShipment(data.tablePage)+ if (!res.isSuccess) {+ hookComponent.$message({+ type: 'error',+ content: res.errorMessage+ })+ return+ }+ data.tableData = res.data.rows+ data.tablePage.total = res.data.totals+ },+ handlePageChange: ref<VxePagerEvents.PageChange>(({ currentPage, pageSize }) => {+ data.tablePage.pageIndex = currentPage+ data.tablePage.pageSize = pageSize++ method.getShipment()+ }),+ exportTable: () => {+ const $table = xTable.value+ exportData({+ table: $table,+ filename: i18n.global.t('wms.deliveryManagement.shipment'),+ columnFilterMethod({ column }: any) {+ return !['checkbox'].includes(column?.type) && !['operate'].includes(column?.field)+ }+ })+ },+ sureSearch: () => {+ data.tablePage.searchObjects = setSearchObject(data.searchForm, ['dispatch_status'])+ method.getShipment()+ }+})++const cardHeight = computed(() => computedCardHeight({}))+const tableHeight = computed(() => computedTableHeight({}))++watch(+ () => data.searchForm,+ () => {+ // debounce+ if (data.timer) {+ clearTimeout(data.timer)+ }+ data.timer = setTimeout(() => {+ data.timer = null+ method.sureSearch()+ }, DEBOUNCE_TIME)+ },+ {+ deep: true+ }+)++defineExpose({+ getShipment: method.getShipment+})+</script>++<style lang="less" scoped>+.operateArea {+ width: 100%;+ min-width: 760px;+ display: flex;+ align-items: center;+ border-radius: 10px;+ padding: 0 10px;+}++.col {+ display: flex;+ align-items: center;+}+</style>