lhq/FT501-WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	ruoyi-ui/src/lang/zh.js
This commit is contained in:
liuhanqing
2025-06-06 15:26:01 +08:00
parent 25343c13cb 91ab45ad45
commit e0a7d8f8a7
8 changed files with 1552 additions and 820 deletions
Download Patch File Download Diff File Expand all files Collapse all files

653
ruoyi-ui/src/lang/en.js
View File

@@ -22,7 +22,7 @@ export default {
sidebarLogo: 'Sidebar Logo'
},
// ***************收货单据新增*************
receiveStockinAdd:{
receiveStockinAdd: {
title: 'Add Receive Stockin',
warehouse: 'Warehouse',
supplier: 'Supplier',
@@ -79,7 +79,7 @@ export default {
grossWeight: 'Gross Weight (KG)'
},
// ***************收货单据管理*************
inReceiveStockin:{
inReceiveStockin: {
stockinId: 'Stockin Order ID',
inputstockinId: 'Please input stockin order ID',
supplierNo: 'Supplier Code',
@@ -116,7 +116,7 @@ export default {
selecInType: 'Please select stockin type',
},
// ***************入库单据管理*************
inStockin:{
inStockin: {
selecInType: 'Please select stockin type',
cancel: 'Cancel Document',
examine: 'Document Review',
@@ -168,7 +168,7 @@ export default {
selectStatus: 'Please select Task Status',
inputTaskNo: 'Please input Task No.',
inputTrayCode: 'Please input Tray Code',
targetCargoSpaceId:'TargetCargoSpaceID',
targetCargoSpaceId: 'TargetCargoSpaceID',
inputTargetCargoSpaceId: 'Please input Target Cargo Space ID',
selectExecutionPhase: 'Please select Execution Phase',
selectInOrOut: 'Please select Task Type',
@@ -177,17 +177,20 @@ export default {
inputEntranceId: 'Please input Entrance ID',
inputExitId: 'Please input Exit ID'
},
outStockoutManage:{
// ***************出库单据管理**************
outStockoutManage: {
stockoutId: 'Outbound Order ID',
outType: 'Outbound Type',
status: 'Document Status',
customerNo: 'Customer Code',
customerName: 'Customer Name',
productName:'Product Name',
createManId: 'Creator',
createDate: 'Create Time',
startDate: 'Start Time',
finishDate: 'Confirm Time',
warehouseId: 'Warehouse ID',
warehouseName:'Warehouse　Name',
stockoutDetailId: 'Outbound Detail ID',
productId: 'Material Code',
lotNo: 'Batch No.',
@@ -210,9 +213,15 @@ export default {
inputStockoutId: 'Please input outbound order ID',
selectOutType: 'Please select outbound type',
selectStatus: 'Please select document status',
inputCustomerNo: 'Please input customer code'
inputCustomerNo: 'Please input customer code',
inputCustomerName:'Please input customer name',
inputProductName:'Please input product name',
selectStartDate: 'Please input start date',
selectFinishDate: 'Please input finish date',
},
addOutStockout:{
// ***************新建出库单据**************
addOutStockout: {
warehouse: 'Warehouse',
selectWarehouse: 'Please select warehouse',
customer: 'Customer',
@@ -237,7 +246,7 @@ export default {
confirm: 'Confirm',
cancel: 'Cancel'
},
productAndStock:{
productAndStock: {
serialNumber: 'Serial Number1111111111',
productId: 'Material Code',
lotNo: 'Batch Number',
@@ -254,6 +263,7 @@ export default {
inputProductName: 'Please input material name',
inputWarehouse: 'Please input warehouse'
},
// ***************出库作业管理**************
outJobManagement: {
// Status and Job Type
status: 'Status',
@@ -302,51 +312,478 @@ export default {
manualComplete: 'Manual Complete',
manualInvalidate: 'Manual Invalidate'
},
// *****************新建盘点单据***************
checkCreate: {
warehouse: 'Warehouse',
selectWarehouse: 'Please select warehouse',
customer: 'Customer',
inputCustomerNo: 'Please input customer number',
documentType: 'Document Type',
selectDocumentType: 'Please select document type',
reset: 'Reset',
saveDocument: 'Save Document',
selectMaterial: 'Select Material',
recreateDocument: 'Recreate Document',
materialCode: 'Material Code',
materialName: 'Material Name',
batchNo: 'Batch No.',
inputBatchNo: 'Please input batch number',
quantity: 'Quantity',
operation: 'Operation',
delete: 'Delete',
inputMaterialCode: 'Please input material code',
inputMaterialName: 'Please input material name',
search: 'Search',
confirm: 'Confirm',
cancel: 'Cancel',
warehouseRequired: 'Please select warehouse',
customerRequired: 'Please input customer number',
documentTypeRequired: 'Please select document type',
selectMaterialRequired: 'Please select material',
materialExistWarning: 'Selected material already exists, please reselect',
quantityExceedError: 'Quantity cannot exceed stock quantity',
saveSuccess: 'Document {msg} saved successfully'
},
//***************盘点单据管理***************
checkStockCheck: {
stockCheckId: 'Stock Check ID',
inputStockCheckId: 'Please input stock check ID',
checkType: 'Check Type',
selectCheckType: 'Please select check type',
status: 'Status',
selectStatus: 'Please select status',
warehouse: 'Warehouse',
selectWarehouse: 'Please select warehouse',
search: 'Search',
reset: 'Reset',
invalidate: 'Invalidate',
review: 'Review',
confirm: 'Confirm',
warehouseId: 'Warehouse ID',
stockSource: 'Stock Source',
departmentNo: 'Department No',
createManId: 'Creator',
createDate: 'Create Date',
finishDate: 'Finish Date',
detailId: 'Detail ID',
mainId: 'Main ID',
lotNo: 'Lot No',
productId: 'Product ID',
materialDesc: 'Material Description',
englishDesc: 'English Description',
cartonNo: 'Carton No',
packingMethod: 'Packing Method',
quantity: 'Planned Quantity',
scanNum: 'Scanned Quantity',
assignNum: 'Actual Quantity',
stockCheckIdRequired: 'Stock check ID is required',
checkTypeRequired: 'Check type is required',
createDateRequired: 'Create date is required',
statusRequired: 'Status is required',
editSuccess: 'Edit successful',
addSuccess: 'Add successful',
invalidateSuccess: 'Invalidate successful',
onlyUnreviewedCanInvalidate: 'Only unreviewed documents can be invalidated',
alreadyReviewed: 'Document has been reviewed, please do not review again',
reviewSuccess: 'Review successful',
onlyUnreviewedCanReview: 'Only unreviewed documents can be reviewed',
confirmSuccess: 'Confirm successful',
onlyReviewedCanConfirm: 'Only reviewed documents can be confirmed'
},
// ***************盘点入库作业*************
checkJobIn: {
jobId: 'Task ID',
status: 'Task Status',
onLineType: 'Online Type',
jobType: 'Task Type',
taskNo: 'Task No.',
supplier: 'Supplier',
department: 'Department',
trayCode: 'Tray Code',
roadwayId: 'Roadway ID',
cargoSpace: 'Cargo Space',
targetRoadway: 'Target Roadway',
targetCargoSpace: 'Target Cargo Space',
lineId: 'Production Line ID',
workshopId: 'Workshop ID',
priority: 'Priority',
executionPhase: 'Execution Phase',
startTime: 'Start Time',
finishTime: 'Finish Time',
entrance: 'Entrance',
entranceId: 'Entrance ID',
exit: 'Exit',
exitId: 'Exit ID',
classId: 'Class ID',
warehouseId: 'Warehouse ID',
warehouse: 'Warehouse',
faultFlag: 'Fault Flag',
jobDetailId: 'Sub-task ID',
stockId: 'Stock ID',
lotNo: 'Lot No.',
inDate: 'Storage Time',
inOrOutId: 'Document ID',
inOrOutDId: 'Sub-document ID',
productGuid: 'Material GUID',
productId: 'Material Code',
stockStatus: 'Stock Status',
inQuantity: 'Storage Quantity',
printDate: 'Production Date',
supplierId: 'Supplier ID',
// 按钮和操作文本
search: 'Search',
reset: 'Reset',
manualVoid: 'Manual Void',
manualFinish: 'Manual Complete',
// 输入框提示文本
inputJobId: 'Please input Task ID',
selectStatus: 'Please select Task Status',
inputTaskNo: 'Please input Task No.',
inputTrayCode: 'Please input Tray Code',
inputTargetCargoSpace: 'Please input Target Cargo Space',
selectExecutionPhase: 'Please select Execution Phase',
selectJobType: 'Please select Task Type',
selectStartTime: 'Please select Start Time',
selectFinishTime: 'Please select Finish Time',
inputEntranceId: 'Please input Entrance ID',
inputExitId: 'Please input Exit ID',
inputWarehouseId: 'Please input Warehouse ID',
// 校验提示信息
jobIdRequired: 'Task ID cannot be empty',
statusRequired: 'Task Status cannot be empty',
taskNoRequired: 'Task No. cannot be empty',
selectData: 'Please select data to operate'
},
// **************盘点出库作业****************
checkJobOut: {
jobId: 'Task ID',
status: 'Task Status',
onLineType: 'Online Type',
jobType: 'Task Type',
taskNo: 'Task No.',
supplierId: 'Supplier ID',
departmentId: 'Department ID',
trayCode: 'Tray Code',
roadwayId: 'Roadway ID',
cargoSpaceId: 'Cargo Space ID',
targetRoadwayId: 'Target Roadway ID',
targetCargoSpace: 'Target Cargo Space',
lineId: 'Production Line ID',
workshopId: 'Workshop ID',
priority: 'Priority',
executionPhase: 'Execution Phase',
startTime: 'Start Time',
finishTime: 'Finish Time',
entranceId: 'Entrance ID',
exitId: 'Exit ID',
classId: 'Class ID',
warehouse: 'Warehouse',
faultFlag: 'Fault Flag',
operation: 'Operation',
subJobId: 'Sub Task ID',
stockId: 'Stock ID',
batchNo: 'Batch No.',
inTime: 'In Time',
billId: 'Bill ID',
subBillId: 'Sub Bill ID',
materialGuid: 'Material GUID',
materialCode: 'Material Code',
stockStatus: 'Stock Status',
inQty: 'In Quantity',
productDate: 'Production Date',
search: 'Search',
reset: 'Reset',
manualFinish: 'Manual Finish',
manualInvalid: 'Manual Invalid',
inputJobId: 'Please input task ID',
selectStatus: 'Please select task status',
inputTaskNo: 'Please input task No.',
inputTrayCode: 'Please input tray code',
inputTargetCargoSpace: 'Please input target cargo space ID',
selectExecutionPhase: 'Please select execution phase',
selectJobType: 'Please select task type',
selectStartTime: 'Please select start time',
selectFinishTime: 'Please select finish time',
inputEntranceId: 'Please input entrance ID',
inputExitId: 'Please input exit ID',
inputWarehouseId: 'Please input warehouse ID',
selectData: 'Please select data to operate',
confirmFinish: 'Are you sure to manually finish the data with ID "{jobIds}"?',
finishSuccess: 'Manual finish successful',
confirmInvalid: 'Are you sure to manually invalid the data with ID "{jobIds}"?',
invalidSuccess: 'Manual invalid successful'
},
// ****************盘点差异管理*****************
checkDifference: {
checkGuid: 'Check ID',
checkStockDetailId: 'Check Document ID',
stockId: 'Stock ID',
trayCode: 'Tray',
cargoSpaceId: 'Cargo Space ID',
productId: 'Product ID',
lotNo: 'Lot No.',
supplier: 'Supplier',
customer: 'Customer',
oldQuantity: 'Original Value',
newQuantity: 'New Value',
recordType: 'Operation Type',
productGuid: 'Product GUID',
operation: 'Operation',
edit: 'Edit',
delete: 'Delete',
search: 'Search',
reset: 'Reset',
confirm: 'Confirm',
cancel: 'Cancel',
inputCheckStockDetailId: 'Please enter check document ID',
inputStockId: 'Please enter stock ID',
inputTrayCode: 'Please enter tray',
inputCargoSpaceId: 'Please enter cargo space ID',
inputProductId: 'Please enter product ID',
inputLotNo: 'Please enter lot No.',
inputSupplier: 'Please enter supplier',
inputCustomer: 'Please enter customer',
inputOldQuantity: 'Please enter original value',
inputNewQuantity: 'Please enter new value',
inputProductGuid: 'Please enter product GUID'
},
// ********************库存信息*************
stockManagement: {
stockId: 'Stock ID',
cargoSpaceId: 'Cargo Space ID',
stockStatus: 'Stock Status',
productStatus: 'Product Status',
lotNo: 'Lot No',
inDate: 'In Date',
backDate: 'Back Date',
productGuid: 'Product GUID',
quantity: 'Quantity',
jobId: 'Job ID',
trayCode: 'Tray Code',
outQuantity: 'Out Quantity',
stockinDetailId: 'Stock-in Detail ID',
stockinId: 'Stock-in ID',
inType: 'In Type',
inClassId: 'In Class ID',
warehouseId: 'Warehouse',
stackingId: 'Stacking ID',
operation: 'Operation',
add: 'Add',
edit: 'Edit',
delete: 'Delete',
export: 'Export',
confirm: 'Confirm',
cancel: 'Cancel',
search: 'search',
reset: 'reset',
inputStockId: 'Please input stock ID',
inputCargoSpaceId: 'Please input cargo space ID',
selectStockStatus: 'Please select stock status',
selectProductStatus: 'Please select product status',
inputLotNo: 'Please input lot No',
inputInDate: 'Please input in date',
inputBackDate: 'Please input back date',
inputProductGuid: 'Please input product GUID',
inputQuantity: 'Please input quantity',
inputJobId: 'Please input job ID',
inputTrayCode: 'Please input tray code',
inputOutQuantity: 'Please input out quantity',
inputStockinDetailId: 'Please input stock-in detail ID',
inputStockinId: 'Please input stock-in ID',
inputInClassId: 'Please input in class ID',
inputWarehouseId: 'Please input warehouse',
inputStackingId: 'Please input stacking ID',
stockIdRequired: 'Stock ID is required',
addTitle: 'Add Stock Information',
editTitle: 'Edit Stock Information',
addSuccess: 'Added successfully',
editSuccess: 'Modified successfully',
deleteSuccess: 'Deleted successfully',
confirmDelete: 'Are you sure to delete the stock information with ID "{stockIds}"?'
},
// *************库存操作记录***************
stockRecord: {
stockId: 'Stock ID',
cargoSpaceId: 'Cargo Space ID',
trayCode: 'Tray Code',
productId: 'Product ID',
productName: 'Product Name',
printDate: 'Production Date',
lotNo: 'Lot No.',
oldQuantity: 'Initial Quantity',
quantity: 'Quantity After Operation',
method: 'Operation',
warehouseId: 'Warehouse',
stockDetailId: 'Stock Detail ID',
operatingTarget: 'Operation Target',
barCodeOldQuantity: 'Barcode Quantity',
barCodeQuantity: 'Barcode Quantity',
productGuid: 'Product GUID',
inputStockId: 'Please enter stock ID',
inputCargoSpaceId: 'Please enter cargo space ID',
inputTrayCode: 'Please enter tray code',
inputProductId: 'Please enter product ID',
inputProductName: 'Please enter product name',
inputPrintDate: 'Please enter production date',
inputLotNo: 'Please enter lot number',
inputOldQuantity: 'Please enter initial quantity',
inputQuantity: 'Please enter quantity after operation',
selectMethod: 'Please select operation',
inputWarehouseId: 'Please enter warehouse',
inputStockDetailId: 'Please enter stock detail ID',
inputOperatingTarget: 'Please enter operation target',
inputBarCodeOldQuantity: 'Please enter barcode quantity',
inputBarCodeQuantity: 'Please enter barcode quantity',
inputProductGuid: 'Please enter product GUID',
stockIdRequired: 'Stock ID cannot be empty',
cargoSpaceIdRequired: 'Cargo space ID cannot be empty',
trayCodeRequired: 'Tray code cannot be empty',
productIdRequired: 'Product ID cannot be empty',
productNameRequired: 'Product name cannot be empty',
printDateRequired: 'Production date cannot be empty',
lotNoRequired: 'Lot number cannot be empty',
oldQuantityRequired: 'Initial quantity cannot be empty',
quantityRequired: 'Quantity after operation cannot be empty',
methodRequired: 'Operation cannot be empty',
warehouseIdRequired: 'Warehouse cannot be empty',
stockDetailIdRequired: 'Stock detail ID cannot be empty',
operatingTargetRequired: 'Operation target cannot be empty',
barCodeOldQuantityRequired: 'Barcode quantity cannot be empty',
barCodeQuantityRequired: 'Barcode quantity cannot be empty',
productGuidRequired: 'Product GUID cannot be empty',
search: 'Search',
reset: 'Reset',
export: 'Export',
confirm: 'Confirm',
cancel: 'Cancel',
addTitle: 'Add Stock Operation Record',
editTitle: 'Edit Stock Operation Record',
addSuccess: 'Added successfully',
editSuccess: 'Modified successfully',
deleteSuccess: 'Deleted successfully',
confirmDelete: 'Are you sure to delete the stock operation record with ID {whGuids}?',
fileName: 'record_{time}'
},
// **************库存冻结记录**************
stockFreeze: {
stockId: 'Stock ID',
inputStockId: 'Please input stock ID',
stockIdRequired: 'Stock ID is required',
cargoSpaceId: 'Cargo Space ID',
inputCargoSpaceId: 'Please input cargo space ID',
cargoSpaceIdRequired: 'Cargo space ID is required',
trayCode: 'Tray Code',
inputTrayCode: 'Please input tray code',
trayCodeRequired: 'Tray code is required',
productId: 'Product ID',
inputProductId: 'Please input product ID',
productIdRequired: 'Product ID is required',
productName: 'Product Name',
inputProductName: 'Please input product name',
productNameRequired: 'Product name is required',
printDate: 'Production Date',
inputPrintDate: 'Please input production date',
printDateRequired: 'Production date is required',
lotNo: 'Lot No.',
inputLotNo: 'Please input lot No.',
lotNoRequired: 'Lot No. is required',
method: 'Operation',
inputMethod: 'Please input operation',
methodRequired: 'Operation is required',
warehouseId: 'Warehouse',
inputWarehouseId: 'Please input warehouse',
warehouseIdRequired: 'Warehouse is required',
stockDetailId: 'Stock Detail ID',
inputStockDetailId: 'Please input stock detail ID',
stockDetailIdRequired: 'Stock detail ID is required',
operatingTarget: 'Operating Target',
inputOperatingTarget: 'Please input operating target',
operatingTargetRequired: 'Operating target is required',
barCodeOldQuantity: 'Barcode Quantity',
inputBarCodeOldQuantity: 'Please input barcode quantity',
barCodeOldQuantityRequired: 'Barcode quantity is required',
barCodeQuantity: 'Barcode Quantity',
inputBarCodeQuantity: 'Please input barcode quantity',
barCodeQuantityRequired: 'Barcode quantity is required',
productGuid: 'Product GUID',
inputProductGuid: 'Please input product GUID',
productGuidRequired: 'Product GUID is required',
operation: 'Operation',
search: 'Search',
reset: 'Reset',
add: 'Add',
edit: 'Edit',
delete: 'Delete',
export: 'Export',
confirm: 'Confirm',
cancel: 'Cancel',
addTitle: 'Add Stock Freeze Record',
editTitle: 'Edit Stock Freeze Record',
addSuccess: 'Added successfully',
editSuccess: 'Modified successfully',
deleteSuccess: 'Deleted successfully',
deleteConfirm: 'Are you sure to delete the selected stock freeze records?'
},
menu: {
//收货单据新增
InboundManagement: 'InboundManagement',
ReceivingDocumentsAdd:"ReceivingDocumentsAdd",
ReceiptDocumentManagement:"ReceiptDocumentManagement",
ManagementOfInboundDocuments:"ManagementOfInboundDocuments",
InboundTaskManagement:"InboundTaskManagement",
ReceivingDocumentsAdd: "ReceivingDocumentsAdd",
ReceiptDocumentManagement: "ReceiptDocumentManagement",
ManagementOfInboundDocuments: "ManagementOfInboundDocuments",
InboundTaskManagement: "InboundTaskManagement",
//********************仓库管理********************
WarehouseManagement: 'WarehouseManagement',
//仓库（库区）管理
WarehouseAreaManagement: 'WarehouseManagement',
//货位管理
CargoSpaceManagement: 'CargoSpaceManagement',
//仓库（库区）管理
WarehouseAreaManagement: 'WarehouseManagement',
//货位管理
CargoSpaceManagement: 'CargoSpaceManagement',
//********************出库管理********************
outboundManagement:'outboundManagement',
createNewOutboundDocument:'createNewOutboundDocument',
outboundDocumentManagement:'outboundDocumentManagement',
outboundTaskManagement:'outboundTaskManagement',
outboundManagement: 'outboundManagement',
createNewOutboundDocument: 'createNewOutboundDocument',
outboundDocumentManagement: 'outboundDocumentManagement',
outboundTaskManagement: 'outboundTaskManagement',
//********************系统管理********************
SystemManagement: 'SystemManagement',
//用户管理
UserManagement: 'UserManagement',
//角色管理
RoleManagement: 'RoleManagement',
//菜单管理
MenuManagement: 'MenuManagement',
//部门管理
DepartmentManagement: 'DepartmentManagement',
//岗位管理
PostManagement: 'PostManagement',
//字典管理
DictionaryManagement: 'DictionaryManagement',
//参数管理
ParameterManagement: 'ParameterManagement',
//通知公告
NoticeManagement: 'NoticeManagement',
//日志管理
LogManagement: 'LogManagement',
//用户管理
UserManagement: 'UserManagement',
//角色管理
RoleManagement: 'RoleManagement',
//菜单管理
MenuManagement: 'MenuManagement',
//部门管理
DepartmentManagement: 'DepartmentManagement',
//岗位管理
PostManagement: 'PostManagement',
//字典管理
DictionaryManagement: 'DictionaryManagement',
//参数管理
ParameterManagement: 'ParameterManagement',
//通知公告
NoticeManagement: 'NoticeManagement',
//日志管理
LogManagement: 'LogManagement',
// ****************盘点管理******************
inventoryManagement: 'inventoryManagement',
createNewInventoryDocument: 'createNewInventoryDocument',
inventoryDocumentManagement: 'inventoryDocumentManagement',
inventoryStorageTask: 'inventoryStorageTask',
inventoryOutboundTask: 'inventoryOutboundTask',
inventoryDiscrepancyManagement: 'inventoryDiscrepancyManagement',
// ****************库存管理******************
stockManagement: 'stockManagement',
stockInformation: 'stockInformation',
stockOperationRecords: 'stockOperationRecords',
stockFreezeRecord: 'stockFreezeRecord',
// ***************基础信息****************
basicInformation:'basicInformation',
customerManagement:'customerManagement',
supplierManagement:'supplierManagement',
materialManagement:'materialManagement',
basicPointLocation:'basicPointLocation'
},
//=====================仓库（库区）管理=====================
@@ -409,7 +846,7 @@ export default {
},
//=====================货位管理=====================
cargoSpace:{
cargoSpace: {
//--------------数据表标题--------------
title: 'CargoSpace Management',
cargoSpaceId: 'CargoSpaceId',
@@ -492,116 +929,6 @@ export default {
},
//=====================系统管理：用户管理=====================
systemManagement_UserManagement: {
//--------------数据表标题--------------
userId: 'UserId',
userName: 'UserName',
password: 'Password',
nickName: 'NickName',
deptName: 'DeptName',
phoneNumber: 'PhoneNumber',
status: 'Status',
creatTime: 'CreatTime',
operation: 'Operation',
email: 'Email',
post: 'Post',
role: 'Role',
gender: 'Gender',
remark: 'Remark',
//--------------交互框操作提示--------------
placeholderDeptName: 'Enter DeptName',
placeholderUserId: 'Enter UserId',
placeholderUserName: 'Enter UserName',
placeholderPassword: 'Enter Password',
placeholderNickName: 'Enter NickName',
placeholderPhoneNumber: 'Enter PhoneNumber',
placeholderStatus: 'Enter Status',
placeholderCreatTime: 'Enter CreatTime',
placeholderDateStart: 'DateStart',
placeholderDateEnd: 'DateEnd',
placeholderEmail: 'Enter Email',
placeholderPost: 'Select Post',
placeholderRole: 'Select Role',
placeholderGender: 'Select Gender',
placeholderRemark: 'Enter Remark',
//--------------交互按钮--------------
btnSearch: 'Search',
btnReset: 'Reset',
btnAdd: 'Add',
btnEdit: 'Edit',
btnDelete: 'Delete',
btnImport: 'Import',
btnExport: 'Export',
btnSubmit: 'Submit',
btnCancel: 'Cancel',
btnMore: 'More',
btnResetPassword: 'Reset Password',
btnAssignRole: 'Assign Role',
//--------------二级窗口标题--------------
addUserItem: 'Add User',
editUserItem: 'Edit User',
//--------------提示文本--------------
//---布局---
textDragOrClick1: 'Drag file here, or ',
textDragOrClick2: 'click to upload',
textUpdateExistingData: 'Do you want to update existing user data?',
textUploadTip: 'Only xlsx and xls files are allowed.',
textDownloadTemplate: 'Download Template',
//---函数：handleStatusChange---
textEnable: 'enable',
textDisable: 'disable',
textUserConfirm1:"Are you sure you want to \"",
textUserConfirm2:"\" user？",
textSuccess: 'success',
//---函数：handleResetPwd---
textInputPassword1: 'Please enter the new password for the \"',
textInputPassword2: '\" user',
textTips: 'Tip',
textConfirm: 'Confirm',
textCancel: 'Cancel',
textResetPassword: 'The change was successful and the new password is:',
//---函数：handleDelete---
textDeleteConfirm1: 'Is it confirmed to delete the data item with user number "',
textDeleteConfirm2: '"?',
//---函数：handleImport---
textImportTitle: 'Import User Data',
//---函数：textUploadTitle---
textImportResult: 'Result',
//--------------操作提示--------------
addSuccessInfo: 'Add Success',
editSuccessInfo: 'Edit Success',
deleteSuccessInfo: 'Delete Success',
resetPasswordSuccessInfo: 'Reset Password Success',
assignRoleSuccessInfo: 'Assign Role Success',
//--------------校验提示--------------
checkUserNameIsNull: 'UserName cannot be null!',
checkUserNameLength: 'UserName length must be between 2-20 characters!',
checkNickNameIsNull: 'NickName cannot be null!',
checkPasswordIsNull: 'Password cannot be null!',
checkPasswordLength: 'Password length must be between 5-20 characters!',
checkPasswordCharacter: "Password cannot contain illegal characters: < > \" \' \\\ |",
checkEmailFormat: 'Please enter a valid email address!',
checkPhoneNumberFormat: 'Please enter a valid phone number!',
//--------------其他--------------
lblWidthUserName: '80px',
lblWidthPhoneNumber: '90px',
},
//=====================系统管理:角色管理=====================
systemManagement_RoleManagement: {
@@ -800,7 +1127,7 @@ export default {
// ***************出库作业流水查询*************
searchViewOutJobFlow: {
title: '出库作业流水查询',
jobId: '作业ID',
jobId: '作业ID1111',
inputJobId: '请输入作业ID',
jobDetailId: '子作业ID',
inputJobDetailId: '请输入子作业ID',
@@ -880,7 +1207,7 @@ export default {
},
// ***************入库作业流水查询*************
searchViewInJobFlow: {
status: '状态',
status: '状态11111111',
selectStatus: '请选择状态',
taskNo: '任务号',
inputTaskNo: '请输入任务号',
@@ -958,7 +1285,7 @@ export default {
},
// ***************库存明细查询*************
searchViewStockDetail: {
stockId: '库存ID',
stockId: '库存ID111111',
inputStockId: '请输入库存ID',
cargoSpaceId: '货位ID',
inputCargoSpaceId: '请输入货位ID',
@@ -1016,7 +1343,7 @@ export default {
},
// ***************平库出库流水*************
searchViewFlatWarehouseOutFlow: {
warehouse: '仓库',
warehouse: '仓库11111111111',
selectWarehouse: '请选择仓库',
productId: '物料ID',
inputProductId: '请输入物料ID',
@@ -1061,7 +1388,7 @@ export default {
},
// ***************平库入库流水*************
searchViewFlatWarehouseInFlow: {
warehouse: '仓库',
warehouse: '仓库11111111',
selectWarehouse: '请选择仓库',
productId: '物料ID',
inputProductId: '请输入物料ID',
@@ -1094,7 +1421,7 @@ export default {
},
// ***************出库单据历史查询*************
searchViewStockoutHistory: {
stockoutId: '出库单号',
stockoutId: '出库单号1111111111',
inputStockoutId: '请输入出库单号',
outType: '出库类型',
selectOutType: '请选择出库类型',
@@ -1142,9 +1469,9 @@ export default {
},
// ***************入库单据历史查询*************
searchViewStockinHistory: {
stockinGuid: '入库单guid',
stockinGuid: '入库单guid11111111111',
inputStockinGuid: '请输入入库单guid',
stockinId: '入库单号',
stockinId: '入库单号1111111',
inputStockinId: '请输入入库单号',
inType: '入库类型',
selectInType: '请选择入库类型',
@@ -1224,7 +1551,7 @@ export default {
// ***************收货单据管理*************
searchStockSummary: {
export: '导出',
productId: '物料编码',
productId: '物料编码111111111',
inputProductId: '请输入物料编码',
productName: '物料名称',
inputProductName: '请输入物料名称',
@@ -1243,7 +1570,7 @@ export default {
},
// ***************预警库存查询*************
searchViewStockWarning: {
stockId: '库存ID',
stockId: '库存ID111111111',
inputStockId: '请输入库存ID',
cargoSpaceId: '货位ID',
inputCargoSpaceId: '请输入货位ID',

936
ruoyi-ui/src/lang/zh.js
View File

File diff suppressed because it is too large Load Diff

34
ruoyi-ui/src/views/out/outStockoutManage.vue
View File

@@ -38,36 +38,36 @@
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="客户名称" prop="customerName">
<el-form-item :label="$t('outStockoutManage.customerName')" prop="customerName">
<el-input
v-model="queryParams.customerName"
placeholder="请输入客户名称"
v-model="queryParams.inputCustomerName"
:placeholder="$t('outStockoutManage.inputCustomerName')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物资名称" prop="productName">
<el-form-item :label="$t('outStockoutManage.productName')" prop="productName">
<el-input
v-model="queryParams.customerNo"
placeholder="请输入客户编码"
:placeholder="$t('outStockoutManage.inputProductName')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="创建开始时间" prop="startDate">
<el-form-item :label="$t('outStockoutManage.startDate')" prop="startDate">
<el-date-picker clearable
v-model="queryParams.startDate"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择创建开始时间">
:placeholder="$t('outStockoutManage.selectStartDate')">
</el-date-picker>
</el-form-item>
<el-form-item label="创建结束时间" prop="finishDate">
<el-form-item :label="$t('outStockoutManage.finishDate')" prop="finishDate">
<el-date-picker clearable
v-model="queryParams.finishDate"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择创建结束时间">
:placeholder="$t('outStockoutManage.selectFinishDate')">
</el-date-picker>
</el-form-item>
<el-form-item>
@@ -142,14 +142,14 @@
<dict-tag :options="dict.type.out_bill_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="$t('outStockoutManage.customerNo')" align="center" prop="customerNo" />
<el-table-column label="客户名称" align="center" prop="customerName" />
<el-table-column label="$t('outStockoutManage.createManId')" align="center" prop="createManId" />
<el-table-column label="$t('outStockoutManage.createDate')" align="center" prop="createDate" />
<el-table-column label="$t('outStockoutManage.startDate')" align="center" prop="startDate" />
<el-table-column label="$t('outStockoutManage.finishDate')" align="center" prop="finishDate" />
<el-table-column :label="$t('outStockoutManage.customerNo')" align="center" prop="customerNo" /><!-- 客户编码 -->
<el-table-column :label="$t('outStockoutManage.customerName')" align="center" prop="customerName" />
<el-table-column :label="$t('outStockoutManage.createManId')" align="center" prop="createManId" /> <!-- 建单人 -->
<el-table-column :label="$t('outStockoutManage.createDate')" align="center" prop="createDate" /><!-- 创建时间 -->
<el-table-column :label="$t('outStockoutManage.startDate')" align="center" prop="startDate" /><!-- 开始时间 -->
<el-table-column :label="$t('outStockoutManage.finishDate')" align="center" prop="finishDate" /> <!-- 确认时间 -->
<!-- <el-table-column label="仓库编号" align="center" prop="warehouseId" />-->
<el-table-column label="仓库名称" align="center" prop="warehouseName" />
<el-table-column :label="$t('outStockoutManage.warehouseName')" align="center" prop="warehouseName" /><!-- 仓库名称 -->
</el-table>
<pagination
@@ -164,7 +164,7 @@
<el-table v-loading="detailLoading" :data="outStockDetailList.slice((detailQueryParams.pageNum-1)*detailQueryParams.pageSize, detailQueryParams.pageNum*detailQueryParams.pageSize)" style="margin-top: 20px;">
<el-table-column :label="$t('outStockoutManage.stockoutDetailId')" align="center" prop="stockoutDetailId" /> <!-- 出库子单编号 -->
<el-table-column :label="$t('outStockoutManage.productId')" align="center" prop="productId" /> <!-- 物资编码 -->
<el-table-column label="物资名称" align="center" prop="productName" />
<el-table-column :label="$t('outStockoutManage.productName')" align="center" prop="productName" />
<el-table-column :label="$t('outStockoutManage.lotNo')" align="center" prop="lotNo" /> <!-- 批次 -->
<el-table-column :label="$t('outStockoutManage.quantity')" align="center" prop="quantity" /> <!-- 计划数量 -->

289
ruoyi-ui/src/views/stock/freeze/index.vue
View File

@@ -1,121 +1,121 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="库存编码" prop="stockId">
<el-form-item :label="$t('stockFreeze.stockId')" prop="stockId"> <!-- 库存编码 -->
<el-input
v-model="queryParams.stockId"
placeholder="请输入库存编码"
:placeholder="$t('stockFreeze.inputStockId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="货位编码" prop="cargoSpaceId">
<el-form-item :label="$t('stockFreeze.cargoSpaceId')" prop="cargoSpaceId"> <!-- 货位编码 -->
<el-input
v-model="queryParams.cargoSpaceId"
placeholder="请输入货位编码"
:placeholder="$t('stockFreeze.inputCargoSpaceId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="托盘条码" prop="trayCode">
<el-form-item :label="$t('stockFreeze.trayCode')" prop="trayCode"> <!-- 托盘条码 -->
<el-input
v-model="queryParams.trayCode"
placeholder="请输入托盘条码"
:placeholder="$t('stockFreeze.inputTrayCode')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物品编码" prop="productId">
<el-form-item :label="$t('stockFreeze.productId')" prop="productId"> <!-- 物品编码 -->
<el-input
v-model="queryParams.productId"
placeholder="请输入物品编码"
:placeholder="$t('stockFreeze.inputProductId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物品名称" prop="productName">
<el-form-item :label="$t('stockFreeze.productName')" prop="productName"> <!-- 物品名称 -->
<el-input
v-model="queryParams.productName"
placeholder="请输入物品名称"
:placeholder="$t('stockFreeze.inputProductName')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="生产日期" prop="printDate">
<el-form-item :label="$t('stockFreeze.printDate')" prop="printDate"> <!-- 生产日期 -->
<el-input
v-model="queryParams.printDate"
placeholder="请输入生产日期"
:placeholder="$t('stockFreeze.inputPrintDate')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="批号" prop="lotNo">
<el-form-item :label="$t('stockFreeze.lotNo')" prop="lotNo"> <!-- 批号 -->
<el-input
v-model="queryParams.lotNo"
placeholder="请输入批号"
:placeholder="$t('stockFreeze.inputLotNo')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="操作" prop="method">
<el-form-item :label="$t('stockFreeze.method')" prop="method"> <!-- 操作 -->
<el-input
v-model="queryParams.method"
placeholder="请输入操作"
:placeholder="$t('stockFreeze.inputMethod')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="仓库" prop="warehouseId">
<el-form-item :label="$t('stockFreeze.warehouseId')" prop="warehouseId"> <!-- 仓库 -->
<el-input
v-model="queryParams.warehouseId"
placeholder="请输入仓库"
:placeholder="$t('stockFreeze.inputWarehouseId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="库存字表id" prop="stockDetailId">
<el-form-item :label="$t('stockFreeze.stockDetailId')" prop="stockDetailId"> <!-- 库存字表id -->
<el-input
v-model="queryParams.stockDetailId"
placeholder="请输入库存字表id"
:placeholder="$t('stockFreeze.inputStockDetailId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="操作目标" prop="operatingTarget">
<el-form-item :label="$t('stockFreeze.operatingTarget')" prop="operatingTarget"> <!-- 操作目标 -->
<el-input
v-model="queryParams.operatingTarget"
placeholder="请输入操作目标"
:placeholder="$t('stockFreeze.inputOperatingTarget')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="条码数量" prop="barCodeOldQuantity">
<el-form-item :label="$t('stockFreeze.barCodeOldQuantity')" prop="barCodeOldQuantity"> <!-- 条码数量 -->
<el-input
v-model="queryParams.barCodeOldQuantity"
placeholder="请输入条码数量"
:placeholder="$t('stockFreeze.inputBarCodeOldQuantity')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="条码数量" prop="barCodeQuantity">
<el-form-item :label="$t('stockFreeze.barCodeQuantity')" prop="barCodeQuantity"> <!-- 条码数量 -->
<el-input
v-model="queryParams.barCodeQuantity"
placeholder="请输入条码数量"
:placeholder="$t('stockFreeze.inputBarCodeQuantity')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料guid" prop="productGuid">
<el-form-item :label="$t('stockFreeze.productGuid')" prop="productGuid"> <!-- 物料guid -->
<el-input
v-model="queryParams.productGuid"
placeholder="请输入物料guid"
:placeholder="$t('stockFreeze.inputProductGuid')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{$t('stockFreeze.search')}}</el-button> <!-- 搜索 -->
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{$t('stockFreeze.reset')}}</el-button> <!-- 重置 -->
</el-form-item>
</el-form>
@@ -128,7 +128,7 @@
size="mini"
@click="handleAdd"
v-hasPermi="['stock:freeze:add']"
>新增</el-button>
>{{$t('stockFreeze.add')}}</el-button> <!-- 新增 -->
</el-col>
<el-col :span="1.5">
<el-button
@@ -139,7 +139,7 @@
:disabled="single"
@click="handleUpdate"
v-hasPermi="['stock:freeze:edit']"
>修改</el-button>
>{{$t('stockFreeze.edit')}}</el-button> <!-- 修改 -->
</el-col>
<el-col :span="1.5">
<el-button
@@ -150,7 +150,7 @@
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['stock:freeze:remove']"
>删除</el-button>
>{{$t('stockFreeze.delete')}}</el-button> <!-- 删除 -->
</el-col>
<el-col :span="1.5">
<el-button
@@ -160,31 +160,28 @@
size="mini"
@click="handleExport"
v-hasPermi="['stock:freeze:export']"
>导出</el-button>
>{{$t('stockFreeze.export')}}</el-button> <!-- 导出 -->
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="freezeList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="guid" align="center" prop="whGuid" />
<el-table-column label="库存编码" align="center" prop="stockId" />
<el-table-column label="货位编码" align="center" prop="cargoSpaceId" />
<el-table-column label="托盘条码" align="center" prop="trayCode" />
<el-table-column label="物品编码" align="center" prop="productId" />
<el-table-column label="物品名称" align="center" prop="productName" />
<el-table-column label="生产日期" align="center" prop="printDate" />
<el-table-column label="批号" align="center" prop="lotNo" />
<el-table-column label="初始状态" align="center" prop="oldStatus" />
<el-table-column label="更改状态" align="center" prop="currStatus" />
<el-table-column label="操作" align="center" prop="method" />
<el-table-column label="仓库" align="center" prop="warehouseId" />
<el-table-column label="库存字表id" align="center" prop="stockDetailId" />
<el-table-column label="操作目标" align="center" prop="operatingTarget" />
<el-table-column label="条码数量" align="center" prop="barCodeOldQuantity" />
<el-table-column label="条码数量" align="center" prop="barCodeQuantity" />
<el-table-column label="物料guid" align="center" prop="productGuid" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column :label="$t('stockFreeze.stockId')" align="center" prop="stockId" /> <!-- 库存编码 -->
<el-table-column :label="$t('stockFreeze.cargoSpaceId')" align="center" prop="cargoSpaceId" /> <!-- 货位编码 -->
<el-table-column :label="$t('stockFreeze.trayCode')" align="center" prop="trayCode" /> <!-- 托盘条码 -->
<el-table-column :label="$t('stockFreeze.productId')" align="center" prop="productId" /> <!-- 物品编码 -->
<el-table-column :label="$t('stockFreeze.productName')" align="center" prop="productName" /> <!-- 物品名称 -->
<el-table-column :label="$t('stockFreeze.printDate')" align="center" prop="printDate" /> <!-- 生产日期 -->
<el-table-column :label="$t('stockFreeze.lotNo')" align="center" prop="lotNo" /> <!-- 批号 -->
<el-table-column :label="$t('stockFreeze.method')" align="center" prop="method" /> <!-- 操作 -->
<el-table-column :label="$t('stockFreeze.warehouseId')" align="center" prop="warehouseId" /> <!-- 仓库 -->
<el-table-column :label="$t('stockFreeze.stockDetailId')" align="center" prop="stockDetailId" /> <!-- 库存字表id -->
<el-table-column :label="$t('stockFreeze.operatingTarget')" align="center" prop="operatingTarget" /> <!-- 操作目标 -->
<el-table-column :label="$t('stockFreeze.barCodeOldQuantity')" align="center" prop="barCodeOldQuantity" /> <!-- 条码数量 -->
<el-table-column :label="$t('stockFreeze.barCodeQuantity')" align="center" prop="barCodeQuantity" /> <!-- 条码数量 -->
<el-table-column :label="$t('stockFreeze.productGuid')" align="center" prop="productGuid" /> <!-- 物料guid -->
<el-table-column :label="$t('stockFreeze.operation')" align="center" class-name="small-padding fixed-width"> <!-- 操作 -->
<template slot-scope="scope">
<el-button
size="mini"
@@ -192,18 +189,18 @@
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['stock:freeze:edit']"
>修改</el-button>
>{{$t('stockFreeze.edit')}}</el-button> <!-- 修改 -->
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['stock:freeze:remove']"
>删除</el-button>
>{{$t('stockFreeze.delete')}}</el-button> <!-- 删除 -->
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
@@ -215,52 +212,52 @@
<!-- 添加或修改库存冻结记录对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="库存编码" prop="stockId">
<el-input v-model="form.stockId" placeholder="请输入库存编码" />
<el-form-item :label="$t('stockFreeze.stockId')" prop="stockId"> <!-- 库存编码 -->
<el-input v-model="form.stockId" :placeholder="$t('stockFreeze.inputStockId')" />
</el-form-item>
<el-form-item label="货位编码" prop="cargoSpaceId">
<el-input v-model="form.cargoSpaceId" placeholder="请输入货位编码" />
<el-form-item :label="$t('stockFreeze.cargoSpaceId')" prop="cargoSpaceId"> <!-- 货位编码 -->
<el-input v-model="form.cargoSpaceId" :placeholder="$t('stockFreeze.inputCargoSpaceId')" />
</el-form-item>
<el-form-item label="托盘条码" prop="trayCode">
<el-input v-model="form.trayCode" placeholder="请输入托盘条码" />
<el-form-item :label="$t('stockFreeze.trayCode')" prop="trayCode"> <!-- 托盘条码 -->
<el-input v-model="form.trayCode" :placeholder="$t('stockFreeze.inputTrayCode')" />
</el-form-item>
<el-form-item label="物品编码" prop="productId">
<el-input v-model="form.productId" placeholder="请输入物品编码" />
<el-form-item :label="$t('stockFreeze.productId')" prop="productId"> <!-- 物品编码 -->
<el-input v-model="form.productId" :placeholder="$t('stockFreeze.inputProductId')" />
</el-form-item>
<el-form-item label="物品名称" prop="productName">
<el-input v-model="form.productName" placeholder="请输入物品名称" />
<el-form-item :label="$t('stockFreeze.productName')" prop="productName"> <!-- 物品名称 -->
<el-input v-model="form.productName" :placeholder="$t('stockFreeze.inputProductName')" />
</el-form-item>
<el-form-item label="生产日期" prop="printDate">
<el-input v-model="form.printDate" placeholder="请输入生产日期" />
<el-form-item :label="$t('stockFreeze.printDate')" prop="printDate"> <!-- 生产日期 -->
<el-input v-model="form.printDate" :placeholder="$t('stockFreeze.inputPrintDate')" />
</el-form-item>
<el-form-item label="批号" prop="lotNo">
<el-input v-model="form.lotNo" placeholder="请输入批号" />
<el-form-item :label="$t('stockFreeze.lotNo')" prop="lotNo"> <!-- 批号 -->
<el-input v-model="form.lotNo" :placeholder="$t('stockFreeze.inputLotNo')" />
</el-form-item>
<el-form-item label="操作" prop="method">
<el-input v-model="form.method" placeholder="请输入操作" />
<el-form-item :label="$t('stockFreeze.method')" prop="method"> <!-- 操作 -->
<el-input v-model="form.method" :placeholder="$t('stockFreeze.inputMethod')" />
</el-form-item>
<el-form-item label="仓库" prop="warehouseId">
<el-input v-model="form.warehouseId" placeholder="请输入仓库" />
<el-form-item :label="$t('stockFreeze.warehouseId')" prop="warehouseId"> <!-- 仓库 -->
<el-input v-model="form.warehouseId" :placeholder="$t('stockFreeze.inputWarehouseId')" />
</el-form-item>
<el-form-item label="库存字表id" prop="stockDetailId">
<el-input v-model="form.stockDetailId" placeholder="请输入库存字表id" />
<el-form-item :label="$t('stockFreeze.stockDetailId')" prop="stockDetailId"> <!-- 库存字表id -->
<el-input v-model="form.stockDetailId" :placeholder="$t('stockFreeze.inputStockDetailId')" />
</el-form-item>
<el-form-item label="操作目标" prop="operatingTarget">
<el-input v-model="form.operatingTarget" placeholder="请输入操作目标" />
<el-form-item :label="$t('stockFreeze.operatingTarget')" prop="operatingTarget"> <!-- 操作目标 -->
<el-input v-model="form.operatingTarget" :placeholder="$t('stockFreeze.inputOperatingTarget')" />
</el-form-item>
<el-form-item label="条码数量" prop="barCodeOldQuantity">
<el-input v-model="form.barCodeOldQuantity" placeholder="请输入条码数量" />
<el-form-item :label="$t('stockFreeze.barCodeOldQuantity')" prop="barCodeOldQuantity"> <!-- 条码数量 -->
<el-input v-model="form.barCodeOldQuantity" :placeholder="$t('stockFreeze.inputBarCodeOldQuantity')" />
</el-form-item>
<el-form-item label="条码数量" prop="barCodeQuantity">
<el-input v-model="form.barCodeQuantity" placeholder="请输入条码数量" />
<el-form-item :label="$t('stockFreeze.barCodeQuantity')" prop="barCodeQuantity"> <!-- 条码数量 -->
<el-input v-model="form.barCodeQuantity" :placeholder="$t('stockFreeze.inputBarCodeQuantity')" />
</el-form-item>
<el-form-item label="物料guid" prop="productGuid">
<el-input v-model="form.productGuid" placeholder="请输入物料guid" />
<el-form-item :label="$t('stockFreeze.productGuid')" prop="productGuid"> <!-- 物料guid -->
<el-input v-model="form.productGuid" :placeholder="$t('stockFreeze.inputProductGuid')" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">{{$t('stockFreeze.confirm')}}</el-button> <!-- 确定 -->
<el-button @click="cancel">{{$t('stockFreeze.cancel')}}</el-button> <!-- 取消 -->
</div>
</el-dialog>
</div>
@@ -316,8 +313,50 @@ export default {
form: {},
// 表单校验
rules: {
stockId: [
{ required: true, message: this.$t('stockFreeze.stockIdRequired'), trigger: "blur" }
],
cargoSpaceId: [
{ required: true, message: this.$t('stockFreeze.cargoSpaceIdRequired'), trigger: "blur" }
],
trayCode: [
{ required: true, message: this.$t('stockFreeze.trayCodeRequired'), trigger: "blur" }
],
productId: [
{ required: true, message: this.$t('stockFreeze.productIdRequired'), trigger: "blur" }
],
productName: [
{ required: true, message: this.$t('stockFreeze.productNameRequired'), trigger: "blur" }
],
printDate: [
{ required: true, message: this.$t('stockFreeze.printDateRequired'), trigger: "blur" }
],
lotNo: [
{ required: true, message: this.$t('stockFreeze.lotNoRequired'), trigger: "blur" }
],
method: [
{ required: true, message: this.$t('stockFreeze.methodRequired'), trigger: "blur" }
],
warehouseId: [
{ required: true, message: this.$t('stockFreeze.warehouseIdRequired'), trigger: "blur" }
],
stockDetailId: [
{ required: true, message: this.$t('stockFreeze.stockDetailIdRequired'), trigger: "blur" }
],
operatingTarget: [
{ required: true, message: this.$t('stockFreeze.operatingTargetRequired'), trigger: "blur" }
],
barCodeOldQuantity: [
{ required: true, message: this.$t('stockFreeze.barCodeOldQuantityRequired'), trigger: "blur" }
],
barCodeQuantity: [
{ required: true, message: this.$t('stockFreeze.barCodeQuantityRequired'), trigger: "blur" }
],
productGuid: [
{ required: true, message: this.$t('stockFreeze.productGuidRequired'), trigger: "blur" }
]
}
}
};
},
created() {
this.getList()
@@ -327,10 +366,10 @@ export default {
getList() {
this.loading = true
listFreeze(this.queryParams).then(response => {
this.freezeList = response.rows
this.total = response.total
this.loading = false
})
this.freezeList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
@@ -358,40 +397,40 @@ export default {
barCodeOldQuantity: null,
barCodeQuantity: null,
productGuid: null
}
this.resetForm("form")
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1
this.getList()
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm")
this.handleQuery()
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.whGuid)
this.single = selection.length!==1
this.multiple = !selection.length
this.ids = selection.map(item => item.whGuid);
this.single = selection.length!==1;
this.multiple = !selection.length;
},
/** 新增按钮操作 */
handleAdd() {
this.reset()
this.open = true
this.title = "添加库存冻结记录"
this.reset();
this.open = true;
this.title = this.$t('stockFreeze.addTitle');
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset()
const whGuid = row.whGuid || this.ids
this.reset();
const whGuid = row.whGuid || this.ids;
getFreeze(whGuid).then(response => {
this.form = response.data
this.open = true
this.title = "修改库存冻结记录"
})
this.form = response.data;
this.open = true;
this.title = this.$t('stockFreeze.editTitle');
});
},
/** 提交按钮 */
submitForm() {
@@ -399,36 +438,36 @@ export default {
if (valid) {
if (this.form.whGuid != null) {
updateFreeze(this.form).then(response => {
this.$modal.msgSuccess("修改成功")
this.open = false
this.getList()
})
this.$modal.msgSuccess(this.$t('stockFreeze.editSuccess'));
this.open = false;
this.getList();
});
} else {
addFreeze(this.form).then(response => {
this.$modal.msgSuccess("新增成功")
this.open = false
this.getList()
})
this.$modal.msgSuccess(this.$t('stockFreeze.addSuccess'));
this.open = false;
this.getList();
});
}
}
})
});
},
/** 删除按钮操作 */
handleDelete(row) {
const whGuids = row.whGuid || this.ids
this.$modal.confirm('是否确认删除库存冻结记录编号为"' + whGuids + '"的数据项？').then(function() {
return delFreeze(whGuids)
const whGuids = row.whGuid || this.ids;
this.$modal.confirm(this.$t('stockFreeze.deleteConfirm')).then(function() {
return delFreeze(whGuids);
}).then(() => {
this.getList()
this.$modal.msgSuccess("删除成功")
}).catch(() => {})
this.getList();
this.$modal.msgSuccess(this.$t('stockFreeze.deleteSuccess'));
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('stock/freeze/export', {
...this.queryParams
}, `freeze_${new Date().getTime()}.xlsx`)
}, `freeze_${new Date().getTime()}.xlsx`);
}
}
}
};
</script>

178
ruoyi-ui/src/views/stock/management/index.vue
View File

@@ -1,24 +1,24 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="库存id" prop="stockId">
<el-form-item :label="$t('stockManagement.stockId')" prop="stockId"><!-- 库存id -->
<el-input
v-model="queryParams.stockId"
placeholder="请输入库存id"
:placeholder="$t('stockManagement.inputStockId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="货位id" prop="cargoSpaceId">
<el-form-item :label="$t('stockManagement.cargoSpaceId')" prop="cargoSpaceId"><!-- 货位id -->
<el-input
v-model="queryParams.cargoSpaceId"
placeholder="请输入货位id"
:placeholder="$t('stockManagement.inputCargoSpaceId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="库存状态" prop="stockStatus">
<el-select v-model="queryParams.stockStatus" placeholder="请选择库存状态" clearable>
<el-form-item :label="$t('stockManagement.stockStatus')" prop="stockStatus"><!-- 库存状态 -->
<el-select v-model="queryParams.stockStatus" :placeholder="$t('stockManagement.selectStockStatus')" clearable>
<el-option
v-for="dict in dict.type.stock_status"
:key="dict.value"
@@ -27,8 +27,8 @@
/>
</el-select>
</el-form-item>
<el-form-item label="物料状态" prop="productStatus">
<el-select v-model="queryParams.productStatus" placeholder="请选择物料状态" clearable>
<el-form-item :label="$t('stockManagement.productStatus')" prop="productStatus"><!-- 物料状态 -->
<el-select v-model="queryParams.productStatus" :placeholder="$t('stockManagement.selectProductStatus')" clearable>
<el-option
v-for="dict in dict.type.product_status"
:key="dict.value"
@@ -37,18 +37,18 @@
/>
</el-select>
</el-form-item>
<el-form-item label="批次号" prop="lotNo">
<el-form-item :label="$t('stockManagement.lotNo')" prop="lotNo"><!-- 批次号 -->
<el-input
v-model="queryParams.lotNo"
placeholder="请输入批次号"
:placeholder="$t('stockManagement.inputLotNo')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="入库时间" prop="inDate">
<el-form-item :label="$t('stockManagement.inDate')" prop="inDate"><!-- 入库时间 -->
<el-input
v-model="queryParams.inDate"
placeholder="请输入入库时间"
:placeholder="$t('stockManagement.inputInDate')"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -85,10 +85,10 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<el-form-item label="托盘条码" prop="trayCode">
<el-form-item :label="$t('stockManagement.trayCode')" prop="trayCode"><!-- 托盘条码 -->
<el-input
v-model="queryParams.trayCode"
placeholder="请输入托盘条码"
:placeholder="$t('stockManagement.inputTrayCode')"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -125,18 +125,18 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<el-form-item label="仓库" prop="warehouseId">
<el-form-item :label="$t('stockManagement.warehouseId')" prop="warehouseId"><!-- 仓库id -->
<el-input
v-model="queryParams.warehouseId"
placeholder="请输入仓库"
:placeholder="$t('stockManagement.inputWarehouseId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="垛型ID" prop="stackingId">
<el-form-item :label="$t('stockManagement.stackingId')" prop="stackingId"><!-- 垛型ID -->
<el-input
v-model="queryParams.stackingId"
placeholder="请输入垛型ID"
:placeholder="$t('stockManagement.inputStackingId')"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -190,8 +190,8 @@
/>
</el-form-item>-->
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{$t('stockManagement.search')}}</el-button><!-- 搜索 -->
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{$t('stockManagement.reset')}}</el-button><!-- 重置 -->
</el-form-item>
</el-form>
@@ -204,7 +204,7 @@
size="mini"
@click="handleAdd"
v-hasPermi="['stock:management:add']"
>新增</el-button>
>{{$t('stockManagement.add')}} <!-- 新增 --></el-button>
</el-col>
<el-col :span="1.5">
<el-button
@@ -215,7 +215,7 @@
:disabled="single"
@click="handleUpdate"
v-hasPermi="['stock:management:edit']"
>修改</el-button>
>{{$t('stockManagement.edit')}} <!-- 修改 --></el-button>
</el-col>
<el-col :span="1.5">
<el-button
@@ -226,7 +226,7 @@
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['stock:management:remove']"
>删除</el-button>
>{{$t('stockManagement.delete')}} <!-- 删除 --></el-button>
</el-col>
<el-col :span="1.5">
<el-button
@@ -236,46 +236,40 @@
size="mini"
@click="handleExport"
v-hasPermi="['stock:management:export']"
>导出</el-button>
>{{$t('stockManagement.export')}} <!-- 导出 --></el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="managementList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="库存id" align="center" prop="stockId" />
<el-table-column label="货位id" align="center" prop="cargoSpaceId" />
<el-table-column label="库存状态" align="center" prop="stockStatus">
<el-table-column :label="$t('stockManagement.stockId')" align="center" prop="stockId" /> <!-- 库存id -->
<el-table-column :label="$t('stockManagement.cargoSpaceId')" align="center" prop="cargoSpaceId" /> <!-- 货位id -->
<el-table-column :label="$t('stockManagement.stockStatus')" align="center" prop="stockStatus"> <!-- 库存状态 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.stock_status" :value="scope.row.stockStatus"/>
</template>
</el-table-column>
<el-table-column label="物料状态" align="center" prop="productStatus">
<el-table-column :label="$t('stockManagement.productStatus')" align="center" prop="productStatus"> <!-- 物料状态 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.product_status" :value="scope.row.productStatus"/>
</template>
</el-table-column>
<el-table-column label="批次号" align="center" prop="lotNo" />
<el-table-column label="入库时间" align="center" prop="inDate" />
<el-table-column label="回流时间" align="center" prop="backDate" />
<el-table-column label="物料GUID" align="center" prop="productGuid" />
<el-table-column label="库存数量" align="center" prop="quantity" />
<el-table-column label="作业ID" align="center" prop="jobId" />
<el-table-column label="托盘条码" align="center" prop="trayCode" />
<el-table-column label="出库数量" align="center" prop="outQuantity" />
<el-table-column label="入库子单id" align="center" prop="stockinDetailId" />
<el-table-column label="入库主单" align="center" prop="stockinId" />
<el-table-column label="入库类型" align="center" prop="inType" />
<el-table-column label="入库班组ID" align="center" prop="inClassId" />
<el-table-column label="仓库" align="center" prop="warehouseId" />
<el-table-column label="垛型ID" align="center" prop="stackingId" />
<!-- <el-table-column label="备用字段1" align="center" prop="spare1" />
<el-table-column label="备用字段2" align="center" prop="spare2" />
<el-table-column label="备用字段3" align="center" prop="spare3" />
<el-table-column label="备用字段4" align="center" prop="spare4" />
<el-table-column label="备用字段5" align="center" prop="spare5" />
<el-table-column label="备用字段6" align="center" prop="spare6" />-->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column :label="$t('stockManagement.lotNo')" align="center" prop="lotNo" /> <!-- 批次号 -->
<el-table-column :label="$t('stockManagement.inDate')" align="center" prop="inDate" /> <!-- 入库时间 -->
<el-table-column :label="$t('stockManagement.backDate')" align="center" prop="backDate" /> <!-- 回流时间 -->
<el-table-column :label="$t('stockManagement.productGuid')" align="center" prop="productGuid" /> <!-- 物料GUID -->
<el-table-column :label="$t('stockManagement.quantity')" align="center" prop="quantity" /> <!-- 库存数量 -->
<el-table-column :label="$t('stockManagement.jobId')" align="center" prop="jobId" /> <!-- 作业ID -->
<el-table-column :label="$t('stockManagement.trayCode')" align="center" prop="trayCode" /> <!-- 托盘条码 -->
<el-table-column :label="$t('stockManagement.outQuantity')" align="center" prop="outQuantity" /> <!-- 出库数量 -->
<el-table-column :label="$t('stockManagement.stockinDetailId')" align="center" prop="stockinDetailId" /> <!-- 入库子单id -->
<el-table-column :label="$t('stockManagement.stockinId')" align="center" prop="stockinId" /> <!-- 入库主单 -->
<el-table-column :label="$t('stockManagement.inType')" align="center" prop="inType" /> <!-- 入库类型 -->
<el-table-column :label="$t('stockManagement.inClassId')" align="center" prop="inClassId" /> <!-- 入库班组ID -->
<el-table-column :label="$t('stockManagement.warehouseId')" align="center" prop="warehouseId" /> <!-- 仓库 -->
<el-table-column :label="$t('stockManagement.stackingId')" align="center" prop="stackingId" /> <!-- 垛型ID -->
<el-table-column :label="$t('stockManagement.operation')" align="center" class-name="small-padding fixed-width"> <!-- 操作 -->
<template slot-scope="scope">
<el-button
size="mini"
@@ -283,14 +277,14 @@
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['stock:management:edit']"
>修改</el-button>
>{{$t('stockManagement.edit')}} <!-- 修改 --></el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['stock:management:remove']"
>删除</el-button>
>{{$t('stockManagement.delete')}} <!-- 删除 --></el-button>
</template>
</el-table-column>
</el-table>
@@ -306,14 +300,14 @@
<!-- 添加或修改库存信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="库存id" prop="stockId">
<el-input v-model="form.stockId" placeholder="请输入库存id" />
<el-form-item :label="$t('stockManagement.stockId')" prop="stockId"> <!-- 库存id -->
<el-input v-model="form.stockId" :placeholder="$t('stockManagement.inputStockId')" />
</el-form-item>
<el-form-item label="货位id" prop="cargoSpaceId">
<el-input v-model="form.cargoSpaceId" placeholder="请输入货位id" />
<el-form-item :label="$t('stockManagement.cargoSpaceId')" prop="cargoSpaceId"> <!-- 货位id -->
<el-input v-model="form.cargoSpaceId" :placeholder="$t('stockManagement.inputCargoSpaceId')" />
</el-form-item>
<el-form-item label="库存状态" prop="stockStatus">
<el-select v-model="form.stockStatus" placeholder="请选择库存状态">
<el-form-item :label="$t('stockManagement.stockStatus')" prop="stockStatus"> <!-- 库存状态 -->
<el-select v-model="form.stockStatus" :placeholder="$t('stockManagement.selectStockStatus')">
<el-option
v-for="dict in dict.type.stock_status"
:key="dict.value"
@@ -322,8 +316,8 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="物料状态" prop="productStatus">
<el-select v-model="form.productStatus" placeholder="请选择物料状态">
<el-form-item :label="$t('stockManagement.productStatus')" prop="productStatus"> <!-- 物料状态 -->
<el-select v-model="form.productStatus" :placeholder="$t('stockManagement.selectProductStatus')">
<el-option
v-for="dict in dict.type.product_status"
:key="dict.value"
@@ -332,41 +326,41 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="批次号" prop="lotNo">
<el-input v-model="form.lotNo" placeholder="请输入批次号" />
<el-form-item :label="$t('stockManagement.lotNo')" prop="lotNo"> <!-- 批次号 -->
<el-input v-model="form.lotNo" :placeholder="$t('stockManagement.inputLotNo')" />
</el-form-item>
<el-form-item label="入库时间" prop="inDate">
<el-input v-model="form.inDate" placeholder="请输入入库时间" />
<el-form-item :label="$t('stockManagement.inDate')" prop="inDate"> <!-- 入库时间 -->
<el-input v-model="form.inDate" :placeholder="$t('stockManagement.inputInDate')" />
</el-form-item>
<el-form-item label="回流时间" prop="backDate">
<el-input v-model="form.backDate" placeholder="请输入回流时间" />
<el-form-item :label="$t('stockManagement.backDate')" prop="backDate"> <!-- 回流时间 -->
<el-input v-model="form.backDate" :placeholder="$t('stockManagement.inputBackDate')" />
</el-form-item>
<el-form-item label="物料GUID" prop="productGuid">
<el-input v-model="form.productGuid" placeholder="请输入物料GUID" />
<el-form-item :label="$t('stockManagement.productGuid')" prop="productGuid"> <!-- 物料GUID -->
<el-input v-model="form.productGuid" :placeholder="$t('stockManagement.inputProductGuid')" />
</el-form-item>
<el-form-item label="库存数量" prop="quantity">
<el-input v-model="form.quantity" placeholder="请输入库存数量" />
<el-form-item :label="$t('stockManagement.quantity')" prop="quantity"> <!-- 库存数量 -->
<el-input v-model="form.quantity" :placeholder="$t('stockManagement.inputQuantity')" />
</el-form-item>
<el-form-item label="作业ID" prop="jobId">
<el-input v-model="form.jobId" placeholder="请输入作业ID" />
<el-form-item :label="$t('stockManagement.jobId')" prop="jobId"> <!-- 作业ID -->
<el-input v-model="form.jobId" :placeholder="$t('stockManagement.inputJobId')" />
</el-form-item>
<el-form-item label="托盘条码" prop="trayCode">
<el-input v-model="form.trayCode" placeholder="请输入托盘条码" />
<el-form-item :label="$t('stockManagement.trayCode')" prop="trayCode"> <!-- 托盘条码 -->
<el-input v-model="form.trayCode" :placeholder="$t('stockManagement.inputTrayCode')" />
</el-form-item>
<el-form-item label="出库数量" prop="outQuantity">
<el-input v-model="form.outQuantity" placeholder="请输入出库数量" />
<el-form-item :label="$t('stockManagement.outQuantity')" prop="outQuantity"> <!-- 出库数量 -->
<el-input v-model="form.outQuantity" :placeholder="$t('stockManagement.inputOutQuantity')" />
</el-form-item>
<el-form-item label="入库子单id" prop="stockinDetailId">
<el-input v-model="form.stockinDetailId" placeholder="请输入入库子单id" />
<el-form-item :label="$t('stockManagement.stockinDetailId')" prop="stockinDetailId"> <!-- 入库子单id -->
<el-input v-model="form.stockinDetailId" :placeholder="$t('stockManagement.inputStockinDetailId')" />
</el-form-item>
<el-form-item label="入库主单" prop="stockinId">
<el-input v-model="form.stockinId" placeholder="请输入入库主单" />
<el-form-item :label="$t('stockManagement.stockinId')" prop="stockinId"> <!-- 入库主单 -->
<el-input v-model="form.stockinId" :placeholder="$t('stockManagement.inputStockinId')" />
</el-form-item>
<el-form-item label="入库班组ID" prop="inClassId">
<el-input v-model="form.inClassId" placeholder="请输入入库班组ID" />
<el-form-item :label="$t('stockManagement.inClassId')" prop="inClassId"> <!-- 入库班组ID -->
<el-input v-model="form.inClassId" :placeholder="$t('stockManagement.inputInClassId')" />
</el-form-item>
<el-form-item label="仓库" prop="warehouseId">
<el-input v-model="form.warehouseId" placeholder="请输入仓库" />
<el-form-item :label="$t('stockManagement.warehouseId')" prop="warehouseId"> <!-- 仓库 -->
<el-input v-model="form.warehouseId" :placeholder="$t('stockManagement.inputWarehouseId')" />
</el-form-item>
<el-form-item label="垛型ID" prop="stackingId">
<el-input v-model="form.stackingId" placeholder="请输入垛型ID" />
@@ -391,8 +385,8 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">{{$t('stockManagement.confirm')}} <!-- 确定 --></el-button>
<el-button @click="cancel">{{$t('stockManagement.cancel')}} <!-- 取消 --></el-button>
</div>
</el-dialog>
</div>
@@ -458,7 +452,7 @@ export default {
// 表单校验
rules: {
stockId: [
{ required: true, message: "库存id不能为空", trigger: "blur" }
{ required: true, message: this.$t('stockManagement.stockIdRequired'), trigger: "blur" } // 库存id不能为空
],
}
}
@@ -531,7 +525,7 @@ export default {
handleAdd() {
this.reset()
this.open = true
this.title = "添加库存信息"
this.title = this.$t('stockManagement.addTitle') // 添加库存信息
},
/** 修改按钮操作 */
handleUpdate(row) {
@@ -540,7 +534,7 @@ export default {
getManagement(stockId).then(response => {
this.form = response.data
this.open = true
this.title = "修改库存信息"
this.title = this.$t('stockManagement.editTitle') // 修改库存信息
})
},
/** 提交按钮 */
@@ -549,13 +543,13 @@ export default {
if (valid) {
if (this.form.stockId != null) {
updateManagement(this.form).then(response => {
this.$modal.msgSuccess("修改成功")
this.$modal.msgSuccess(this.$t('stockManagement.editSuccess')) // 修改成功
this.open = false
this.getList()
})
} else {
addManagement(this.form).then(response => {
this.$modal.msgSuccess("新增成功")
this.$modal.msgSuccess(this.$t('stockManagement.addSuccess')) // 新增成功
this.open = false
this.getList()
})
@@ -566,11 +560,11 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const stockIds = row.stockId || this.ids
this.$modal.confirm('是否确认删除库存信息编号为"' + stockIds + '"的数据项？').then(function() {
this.$modal.confirm(this.$t('stockManagement.confirmDelete', { stockIds: stockIds })).then(function() { // 是否确认删除库存信息编号为
return delManagement(stockIds)
}).then(() => {
this.getList()
this.$modal.msgSuccess("删除成功")
this.$modal.msgSuccess(this.$t('stockManagement.deleteSuccess')) // 删除成功
}).catch(() => {})
},
/** 导出按钮操作 */

272
ruoyi-ui/src/views/stock/record/index.vue
View File

@@ -1,26 +1,26 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="库存编码" prop="stockId">
<el-form-item :label="$t('stockRecord.stockId')" prop="stockId"> <!-- 库存编码 -->
<el-input
v-model="queryParams.stockId"
placeholder="请输入库存编码"
:placeholder="$t('stockRecord.inputStockId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="货位编码" prop="cargoSpaceId">
<el-form-item :label="$t('stockRecord.cargoSpaceId')" prop="cargoSpaceId"> <!-- 货位编码 -->
<el-input
v-model="queryParams.cargoSpaceId"
placeholder="请输入货位编码"
:placeholder="$t('stockRecord.inputCargoSpaceId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="托盘条码" prop="trayCode">
<el-form-item :label="$t('stockRecord.trayCode')" prop="trayCode"> <!-- 托盘条码 -->
<el-input
v-model="queryParams.trayCode"
placeholder="请输入托盘条码"
:placeholder="$t('stockRecord.inputTrayCode')"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -33,26 +33,26 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<el-form-item label="物品名称" prop="productName">
<el-form-item :label="$t('stockRecord.productName')" prop="productName"> <!-- 物品名称 -->
<el-input
v-model="queryParams.productName"
placeholder="请输入物品名称"
:placeholder="$t('stockRecord.inputProductName')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="生产日期" prop="printDate">
<el-form-item :label="$t('stockRecord.printDate')" prop="printDate"> <!-- 生产日期 -->
<el-input
v-model="queryParams.printDate"
placeholder="请输入生产日期"
:placeholder="$t('stockRecord.inputPrintDate')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="批号" prop="lotNo">
<el-form-item :label="$t('stockRecord.lotNo')" prop="lotNo"> <!-- 批号 -->
<el-input
v-model="queryParams.lotNo"
placeholder="请输入批号"
:placeholder="$t('stockRecord.inputLotNo')"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -73,8 +73,9 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<el-form-item label="操作" prop="method">
<el-select v-model="queryParams.method" placeholder="请选择操作" clearable>
<el-form-item :label="$t('stockRecord.method')" prop="method"> <!-- 操作 -->
<el-select v-model="queryParams.method" :placeholder="$t('stockRecord.selectMethod')" clearable>
<el-option
v-for="dict in dict.type.stock_maintain_method"
:key="dict.value"
@@ -83,10 +84,10 @@
/>
</el-select>
</el-form-item>
<el-form-item label="仓库" prop="warehouseId">
<el-form-item :label="$t('stockRecord.warehouseId')" prop="warehouseId"> <!-- 仓库 -->
<el-input
v-model="queryParams.warehouseId"
placeholder="请输入仓库"
:placeholder="$t('stockRecord.inputWarehouseId')"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -132,8 +133,8 @@
/>
</el-form-item>-->
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{$t('stockRecord.search')}}</el-button> <!-- 搜索 -->
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{$t('stockRecord.reset')}}</el-button> <!-- 重置 -->
</el-form-item>
</el-form>
@@ -178,34 +179,33 @@
size="mini"
@click="handleExport"
v-hasPermi="['stock:record:export']"
>导出</el-button>
>{{$t('stockRecord.export')}}</el-button> <!-- 导出 -->
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="recordList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="guid" align="center" prop="whGuid" />
<el-table-column label="库存编码" align="center" prop="stockId" />
<el-table-column label="货位编码" align="center" prop="cargoSpaceId" />
<el-table-column label="托盘条码" align="center" prop="trayCode" />
<el-table-column label="物品编码" align="center" prop="productId" />
<el-table-column label="物品名称" align="center" prop="productName" />
<el-table-column label="生产日期" align="center" prop="printDate" />
<el-table-column label="批号" align="center" prop="lotNo" />
<el-table-column label="初始数量" align="center" prop="oldQuantity" />
<el-table-column label="操作后数量" align="center" prop="quantity" />
<el-table-column label="操作" align="center" prop="method">
<el-table-column :label="$t('stockRecord.stockId')" align="center" prop="stockId" /> <!-- 库存编码 -->
<el-table-column :label="$t('stockRecord.cargoSpaceId')" align="center" prop="cargoSpaceId" /> <!-- 货位编码 -->
<el-table-column :label="$t('stockRecord.trayCode')" align="center" prop="trayCode" /> <!-- 托盘条码 -->
<el-table-column :label="$t('stockRecord.productId')" align="center" prop="productId" /> <!-- 物品编码 -->
<el-table-column :label="$t('stockRecord.productName')" align="center" prop="productName" /> <!-- 物品名称 -->
<el-table-column :label="$t('stockRecord.printDate')" align="center" prop="printDate" /> <!-- 生产日期 -->
<el-table-column :label="$t('stockRecord.lotNo')" align="center" prop="lotNo" /> <!-- 批号 -->
<el-table-column :label="$t('stockRecord.oldQuantity')" align="center" prop="oldQuantity" /> <!-- 初始数量 -->
<el-table-column :label="$t('stockRecord.quantity')" align="center" prop="quantity" /> <!-- 操作后数量 -->
<el-table-column :label="$t('stockRecord.method')" align="center" prop="method"> <!-- 操作 -->
<template slot-scope="scope">
<dict-tag :options="dict.type.stock_maintain_method" :value="scope.row.method"/>
</template>
</el-table-column>
<el-table-column label="仓库" align="center" prop="warehouseId" />
<el-table-column label="库存字表id" align="center" prop="stockDetailId" />
<el-table-column label="操作目标" align="center" prop="operatingTarget" />
<el-table-column label="条码数量" align="center" prop="barCodeOldQuantity" />
<el-table-column label="条码数量" align="center" prop="barCodeQuantity" />
<el-table-column label="物料guid" align="center" prop="productGuid" />
<el-table-column :label="$t('stockRecord.warehouseId')" align="center" prop="warehouseId" /> <!-- 仓库 -->
<el-table-column :label="$t('stockRecord.stockDetailId')" align="center" prop="stockDetailId" /> <!-- 库存字表id -->
<el-table-column :label="$t('stockRecord.operatingTarget')" align="center" prop="operatingTarget" /> <!-- 操作目标 -->
<el-table-column :label="$t('stockRecord.barCodeOldQuantity')" align="center" prop="barCodeOldQuantity" /> <!-- 条码数量 -->
<el-table-column :label="$t('stockRecord.barCodeQuantity')" align="center" prop="barCodeQuantity" /> <!-- 条码数量 -->
<el-table-column :label="$t('stockRecord.productGuid')" align="center" prop="productGuid" /> <!-- 物料guid -->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@@ -237,35 +237,35 @@
<!-- 添加或修改库存操作记录对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="库存编码" prop="stockId">
<el-input v-model="form.stockId" placeholder="请输入库存编码" />
<el-form-item :label="$t('stockRecord.stockId')" prop="stockId"> <!-- 库存编码 -->
<el-input v-model="form.stockId" :placeholder="$t('stockRecord.inputStockId')" />
</el-form-item>
<el-form-item label="货位编码" prop="cargoSpaceId">
<el-input v-model="form.cargoSpaceId" placeholder="请输入货位编码" />
<el-form-item :label="$t('stockRecord.cargoSpaceId')" prop="cargoSpaceId"> <!-- 货位编码 -->
<el-input v-model="form.cargoSpaceId" :placeholder="$t('stockRecord.inputCargoSpaceId')" />
</el-form-item>
<el-form-item label="托盘条码" prop="trayCode">
<el-input v-model="form.trayCode" placeholder="请输入托盘条码" />
<el-form-item :label="$t('stockRecord.trayCode')" prop="trayCode"> <!-- 托盘条码 -->
<el-input v-model="form.trayCode" :placeholder="$t('stockRecord.inputTrayCode')" />
</el-form-item>
<el-form-item label="物品编码" prop="productId">
<el-input v-model="form.productId" placeholder="请输入物品编码" />
<el-form-item :label="$t('stockRecord.productId')" prop="productId"> <!-- 物品编码 -->
<el-input v-model="form.productId" :placeholder="$t('stockRecord.inputProductId')" />
</el-form-item>
<el-form-item label="物品名称" prop="productName">
<el-input v-model="form.productName" placeholder="请输入物品名称" />
<el-form-item :label="$t('stockRecord.productName')" prop="productName"> <!-- 物品名称 -->
<el-input v-model="form.productName" :placeholder="$t('stockRecord.inputProductName')" />
</el-form-item>
<el-form-item label="生产日期" prop="printDate">
<el-input v-model="form.printDate" placeholder="请输入生产日期" />
<el-form-item :label="$t('stockRecord.printDate')" prop="printDate"> <!-- 生产日期 -->
<el-input v-model="form.printDate" :placeholder="$t('stockRecord.inputPrintDate')" />
</el-form-item>
<el-form-item label="批号" prop="lotNo">
<el-input v-model="form.lotNo" placeholder="请输入批号" />
<el-form-item :label="$t('stockRecord.lotNo')" prop="lotNo"> <!-- 批号 -->
<el-input v-model="form.lotNo" :placeholder="$t('stockRecord.inputLotNo')" />
</el-form-item>
<el-form-item label="初始数量" prop="oldQuantity">
<el-input v-model="form.oldQuantity" placeholder="请输入初始数量" />
<el-form-item :label="$t('stockRecord.oldQuantity')" prop="oldQuantity"> <!-- 初始数量 -->
<el-input v-model="form.oldQuantity" :placeholder="$t('stockRecord.inputOldQuantity')" />
</el-form-item>
<el-form-item label="操作后数量" prop="quantity">
<el-input v-model="form.quantity" placeholder="请输入操作后数量" />
<el-form-item :label="$t('stockRecord.quantity')" prop="quantity"> <!-- 操作后数量 -->
<el-input v-model="form.quantity" :placeholder="$t('stockRecord.inputQuantity')" />
</el-form-item>
<el-form-item label="操作" prop="method">
<el-select v-model="form.method" placeholder="请选择操作">
<el-form-item :label="$t('stockRecord.method')" prop="method"> <!-- 操作 -->
<el-select v-model="form.method" :placeholder="$t('stockRecord.selectMethod')">
<el-option
v-for="dict in dict.type.stock_maintain_method"
:key="dict.value"
@@ -274,35 +274,35 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="仓库" prop="warehouseId">
<el-input v-model="form.warehouseId" placeholder="请输入仓库" />
<el-form-item :label="$t('stockRecord.warehouseId')" prop="warehouseId"> <!-- 仓库 -->
<el-input v-model="form.warehouseId" :placeholder="$t('stockRecord.inputWarehouseId')" />
</el-form-item>
<el-form-item label="库存字表id" prop="stockDetailId">
<el-input v-model="form.stockDetailId" placeholder="请输入库存字表id" />
<el-form-item :label="$t('stockRecord.stockDetailId')" prop="stockDetailId"> <!-- 库存字表id -->
<el-input v-model="form.stockDetailId" :placeholder="$t('stockRecord.inputStockDetailId')" />
</el-form-item>
<el-form-item label="操作目标" prop="operatingTarget">
<el-input v-model="form.operatingTarget" placeholder="请输入操作目标" />
<el-form-item :label="$t('stockRecord.operatingTarget')" prop="operatingTarget"> <!-- 操作目标 -->
<el-input v-model="form.operatingTarget" :placeholder="$t('stockRecord.inputOperatingTarget')" />
</el-form-item>
<el-form-item label="条码数量" prop="barCodeOldQuantity">
<el-input v-model="form.barCodeOldQuantity" placeholder="请输入条码数量" />
<el-form-item :label="$t('stockRecord.barCodeOldQuantity')" prop="barCodeOldQuantity"> <!-- 条码数量 -->
<el-input v-model="form.barCodeOldQuantity" :placeholder="$t('stockRecord.inputBarCodeOldQuantity')" />
</el-form-item>
<el-form-item label="条码数量" prop="barCodeQuantity">
<el-input v-model="form.barCodeQuantity" placeholder="请输入条码数量" />
<el-form-item :label="$t('stockRecord.barCodeQuantity')" prop="barCodeQuantity"> <!-- 条码数量 -->
<el-input v-model="form.barCodeQuantity" :placeholder="$t('stockRecord.inputBarCodeQuantity')" />
</el-form-item>
<el-form-item label="物料guid" prop="productGuid">
<el-input v-model="form.productGuid" placeholder="请输入物料guid" />
<el-form-item :label="$t('stockRecord.productGuid')" prop="productGuid"> <!-- 物料guid -->
<el-input v-model="form.productGuid" :placeholder="$t('stockRecord.inputProductGuid')" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">{{$t('stockRecord.confirm')}}</el-button> <!-- 确定 -->
<el-button @click="cancel">{{$t('stockRecord.cancel')}}</el-button> <!-- 取消 -->
</div>
</el-dialog>
</div>
</template>
<script>
import { listRecord, getRecord, delRecord, addRecord, updateRecord } from "@/api/stock/record"
import { listRecord, getRecord, delRecord, addRecord, updateRecord, exportRecord } from "@/api/stock/record";
export default {
name: "Record",
@@ -310,7 +310,7 @@ export default {
data() {
return {
// 遮罩层
loading: true,
loading: false,
// 选中数组
ids: [],
// 非单个禁用
@@ -352,26 +352,74 @@ export default {
form: {},
// 表单校验
rules: {
stockId: [
{ required: true, message: this.$t('stockRecord.stockIdRequired'), trigger: "blur" }
],
cargoSpaceId: [
{ required: true, message: this.$t('stockRecord.cargoSpaceIdRequired'), trigger: "blur" }
],
trayCode: [
{ required: true, message: this.$t('stockRecord.trayCodeRequired'), trigger: "blur" }
],
productId: [
{ required: true, message: this.$t('stockRecord.productIdRequired'), trigger: "blur" }
],
productName: [
{ required: true, message: this.$t('stockRecord.productNameRequired'), trigger: "blur" }
],
printDate: [
{ required: true, message: this.$t('stockRecord.printDateRequired'), trigger: "blur" }
],
lotNo: [
{ required: true, message: this.$t('stockRecord.lotNoRequired'), trigger: "blur" }
],
oldQuantity: [
{ required: true, message: this.$t('stockRecord.oldQuantityRequired'), trigger: "blur" }
],
quantity: [
{ required: true, message: this.$t('stockRecord.quantityRequired'), trigger: "blur" }
],
method: [
{ required: true, message: this.$t('stockRecord.methodRequired'), trigger: "change" }
],
warehouseId: [
{ required: true, message: this.$t('stockRecord.warehouseIdRequired'), trigger: "blur" }
],
stockDetailId: [
{ required: true, message: this.$t('stockRecord.stockDetailIdRequired'), trigger: "blur" }
],
operatingTarget: [
{ required: true, message: this.$t('stockRecord.operatingTargetRequired'), trigger: "blur" }
],
barCodeOldQuantity: [
{ required: true, message: this.$t('stockRecord.barCodeOldQuantityRequired'), trigger: "blur" }
],
barCodeQuantity: [
{ required: true, message: this.$t('stockRecord.barCodeQuantityRequired'), trigger: "blur" }
],
productGuid: [
{ required: true, message: this.$t('stockRecord.productGuidRequired'), trigger: "blur" }
]
}
}
};
},
created() {
this.getList()
this.getList();
},
methods: {
/** 查询库存操作记录列表 */
getList() {
this.loading = true
this.loading = true;
listRecord(this.queryParams).then(response => {
this.recordList = response.rows
this.total = response.total
this.loading = false
})
this.recordList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false
this.reset()
this.open = false;
this.reset();
},
// 表单重置
reset() {
@@ -394,40 +442,40 @@ export default {
barCodeOldQuantity: null,
barCodeQuantity: null,
productGuid: null
}
this.resetForm("form")
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1
this.getList()
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm")
this.handleQuery()
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.whGuid)
this.single = selection.length!==1
this.multiple = !selection.length
this.single = selection.length!==1;
this.multiple = !selection.length;
},
/** 新增按钮操作 */
handleAdd() {
this.reset()
this.open = true
this.title = "添加库存操作记录"
this.reset();
this.open = true;
this.title = this.$t('stockRecord.addTitle');
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset()
this.reset();
const whGuid = row.whGuid || this.ids
getRecord(whGuid).then(response => {
this.form = response.data
this.open = true
this.title = "修改库存操作记录"
})
this.form = response.data;
this.open = true;
this.title = this.$t('stockRecord.editTitle');
});
},
/** 提交按钮 */
submitForm() {
@@ -435,29 +483,29 @@ export default {
if (valid) {
if (this.form.whGuid != null) {
updateRecord(this.form).then(response => {
this.$modal.msgSuccess("修改成功")
this.open = false
this.getList()
})
this.$modal.msgSuccess(this.$t('stockRecord.editSuccess'));
this.open = false;
this.getList();
});
} else {
addRecord(this.form).then(response => {
this.$modal.msgSuccess("新增成功")
this.open = false
this.getList()
})
this.$modal.msgSuccess(this.$t('stockRecord.addSuccess'));
this.open = false;
this.getList();
});
}
}
})
});
},
/** 删除按钮操作 */
handleDelete(row) {
const whGuids = row.whGuid || this.ids
this.$modal.confirm('是否确认删除库存操作记录编号为"' + whGuids + '"的数据项？').then(function() {
return delRecord(whGuids)
const whGuids = row.whGuid || this.ids;
this.$modal.confirm(this.$t('stockRecord.confirmDelete', { whGuids: whGuids })).then(function() {
return delRecord(whGuids);
}).then(() => {
this.getList()
this.$modal.msgSuccess("删除成功")
}).catch(() => {})
this.getList();
this.$modal.msgSuccess(this.$t('stockRecord.deleteSuccess'));
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {

2
ruoyi-ui/src/views/system/role/index.vue
View File

@@ -679,4 +679,4 @@ export default {
}
}
}
</script>
</script>

8
ruoyi-ui/src/views/system/user/index.vue
View File

@@ -44,8 +44,8 @@
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('systemManagement_UserManagement.btnReset') }}</el-button>
</el-form-item>
</el-form>
</el-form>
<el-row :gutter="10" class="mb8">
@@ -635,10 +635,10 @@ export default {
// 获取字典数据
lblUserNameWidth() {
if (condition) {
}
}
},
}
</script>
</script>