Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -114,6 +114,10 @@ export default {
|
||||
stockStatus: 'Document Status',
|
||||
operate: 'Operation',
|
||||
selecInType: 'Please select stockin type',
|
||||
netWeight: '净重',
|
||||
totalPrice: '确定',
|
||||
totalNetWeight: '总净重',
|
||||
grossWeight: '毛重',
|
||||
},
|
||||
// ***************入库单据管理*************
|
||||
inStockin: {
|
||||
@@ -175,7 +179,15 @@ export default {
|
||||
selectStartTime: 'Please select Start Time',
|
||||
selectFinishTime: 'Please select Finish Time',
|
||||
inputEntranceId: 'Please input Entrance ID',
|
||||
inputExitId: 'Please input Exit ID'
|
||||
inputExitId: 'Please input Exit ID',
|
||||
netWeight: '净重',
|
||||
totalPrice: '确定',
|
||||
totalNetWeight: '总净重',
|
||||
grossWeight: '毛重',
|
||||
materialDesc: '物料描述',
|
||||
englishDesc: '英文描述',
|
||||
cartonNo: '箱号',
|
||||
packingMethod: '包装方式',
|
||||
},
|
||||
// ***************出库单据管理**************
|
||||
outStockoutManage: {
|
||||
@@ -342,7 +354,8 @@ export default {
|
||||
selectMaterialRequired: 'Please select material',
|
||||
materialExistWarning: 'Selected material already exists, please reselect',
|
||||
quantityExceedError: 'Quantity cannot exceed stock quantity',
|
||||
saveSuccess: 'Document {msg} saved successfully'
|
||||
saveSuccess: 'Document {msg} saved successfully',
|
||||
lotNo:'lotNo',
|
||||
},
|
||||
//***************盘点单据管理***************
|
||||
checkStockCheck: {
|
||||
@@ -551,6 +564,7 @@ export default {
|
||||
stockManagement: {
|
||||
stockId: 'Stock ID',
|
||||
cargoSpaceId: 'Cargo Space ID',
|
||||
cargoSpaceName: 'Cargo Space Name',
|
||||
stockStatus: 'Stock Status',
|
||||
productStatus: 'Product Status',
|
||||
lotNo: 'Lot No',
|
||||
@@ -599,12 +613,23 @@ export default {
|
||||
addSuccess: 'Added successfully',
|
||||
editSuccess: 'Modified successfully',
|
||||
deleteSuccess: 'Deleted successfully',
|
||||
confirmDelete: 'Are you sure to delete the stock information with ID "{stockIds}"?'
|
||||
confirmDelete: 'Are you sure to delete the stock information with ID "{stockIds}"?',
|
||||
productId:'物料编码',
|
||||
materialDesc:'物料描述',
|
||||
englishDesc:'英文描述',
|
||||
netWeight:'净重',
|
||||
length:'长',
|
||||
width:'宽',
|
||||
height:'高',
|
||||
volume:'体积',
|
||||
cargoSpaceStatus:'货位状态'
|
||||
|
||||
},
|
||||
// *************库存操作记录***************
|
||||
stockRecord: {
|
||||
stockId: 'Stock ID',
|
||||
cargoSpaceId: 'Cargo Space ID',
|
||||
cargoSpaceName: '货位名称',
|
||||
trayCode: 'Tray Code',
|
||||
productId: 'Product ID',
|
||||
productName: 'Product Name',
|
||||
@@ -662,7 +687,8 @@ export default {
|
||||
editSuccess: 'Modified successfully',
|
||||
deleteSuccess: 'Deleted successfully',
|
||||
confirmDelete: 'Are you sure to delete the stock operation record with ID {whGuids}?',
|
||||
fileName: 'record_{time}'
|
||||
fileName: 'record_{time}',
|
||||
createTime: '创建时间',
|
||||
},
|
||||
// **************库存冻结记录**************
|
||||
stockFreeze: {
|
||||
@@ -722,7 +748,8 @@ export default {
|
||||
addSuccess: 'Added successfully',
|
||||
editSuccess: 'Modified successfully',
|
||||
deleteSuccess: 'Deleted successfully',
|
||||
deleteConfirm: 'Are you sure to delete the selected stock freeze records?'
|
||||
deleteConfirm: 'Are you sure to delete the selected stock freeze records?',
|
||||
createTime: '创建时间',
|
||||
},
|
||||
menu: {
|
||||
//收货单据新增
|
||||
@@ -766,6 +793,25 @@ export default {
|
||||
NoticeManagement: 'NoticeManagement',
|
||||
//日志管理
|
||||
LogManagement: 'LogManagement',
|
||||
//操作日志
|
||||
LogManagement_OperationLog: 'OperationLog',
|
||||
//登录日志
|
||||
LogManagement_LoginLog: 'LoginLog',
|
||||
|
||||
//********************系统监控********************
|
||||
SystemMonitor: 'SystemMonitor',
|
||||
// 在线用户
|
||||
SystemMonitor_Online: 'Online',
|
||||
// 定时任务
|
||||
SystemMonitor_ScheduledTask: 'ScheduledTask',
|
||||
// 数据监控
|
||||
SystemMonitor_DataMonitor: 'DataMonitor',
|
||||
//服务监控
|
||||
SystemMonitor_ServiceMonitor: 'ServiceMonitor',
|
||||
//缓存监控
|
||||
SystemMonitor_CacheMonitor: 'CacheMonitor',
|
||||
//缓存列表
|
||||
SystemMonitor_CacheList: 'CacheList',
|
||||
|
||||
// ****************盘点管理******************
|
||||
inventoryManagement: 'inventoryManagement',
|
||||
@@ -1538,6 +1584,274 @@ export default {
|
||||
|
||||
},
|
||||
|
||||
// ***************系统管理:日志管理-操作日志*************
|
||||
// ***************views/monitor/operlog*************
|
||||
systemManagement_LogManagement_Operation:{
|
||||
//--------------数据表标题--------------
|
||||
operId: 'OperId',
|
||||
title: 'Title',
|
||||
businessType: 'BusinessType',
|
||||
operName: 'OperName',
|
||||
operIp: 'OperIp',
|
||||
operLocation: 'OperLocation',
|
||||
status: 'Status',
|
||||
operTime: 'OperTime',
|
||||
costTime: 'CostTime',
|
||||
unitMillisecond: 'ms',
|
||||
operation: 'Operation',
|
||||
details: 'Details',
|
||||
|
||||
//--------------当前页面交互框操作提示--------------
|
||||
placeholderOpenIp: 'Enter openId',
|
||||
placeholderTitle: 'Enter title',
|
||||
placeholderBusinessType: 'Select businessType',
|
||||
placeholderOperName: 'Select operName',
|
||||
placeholderStatus: 'Select status',
|
||||
placeholderOperTime: 'OperationTime',
|
||||
placeholderDateStart: 'DateStart',
|
||||
placeholderDateEnd: 'DateEnd',
|
||||
|
||||
//--------------二级窗口--------------
|
||||
//--------------标题--------------
|
||||
logDetails: 'logDetails',
|
||||
|
||||
//--------------交互框标签--------------
|
||||
noticeContent:"Content",
|
||||
loginInfo: 'Login Info',
|
||||
requestInfo: 'Request Info',
|
||||
requestUrl: 'Request Url',
|
||||
requestMethod: 'Request Method',
|
||||
method:'Method',
|
||||
requestParam: 'Request Params',
|
||||
responseParam: 'Response Param',
|
||||
statusNormal: 'Success',
|
||||
statusFail: 'Fail',
|
||||
errorMsg:'Error Message',
|
||||
|
||||
//--------------交互按钮--------------
|
||||
btnSearch: 'Search',
|
||||
btnReset: 'Reset',
|
||||
btnAdd: 'Add',
|
||||
btnEdit: 'Edit',
|
||||
btnDelete: 'Delete',
|
||||
btnImport: 'Import',
|
||||
btnExport: 'Export',
|
||||
btnSubmit: 'Confirm',
|
||||
btnCancel: 'Cancel',
|
||||
btnClear: 'ClearAll',
|
||||
btnDetails: 'Details',
|
||||
|
||||
//--------------提示文本--------------
|
||||
|
||||
//---handleClean---
|
||||
textDeleteConfirm: 'Confirm that all operation log data entries are cleared?"',
|
||||
|
||||
//--------------操作提示--------------
|
||||
addSuccessInfo: 'Add success',
|
||||
editSuccessInfo: 'Edit success',
|
||||
deleteSuccessInfo: 'Delete success',
|
||||
clearSuccessInfo: 'Clear success',
|
||||
|
||||
//--------------其他--------------
|
||||
lblWidthSearch: '80px',
|
||||
lblWidthDialog: '150px',
|
||||
|
||||
},
|
||||
|
||||
// ***************系统管理:日志管理-登录日志*************
|
||||
// ***************views/monitor/logininfor*************
|
||||
systemManagement_LogManagement_Login:{
|
||||
//--------------数据表标题--------------
|
||||
infoId: 'InfoId',
|
||||
userName: 'UserName',
|
||||
ipAddress: 'IPAddress',
|
||||
loginLocation: 'LoginLocation',
|
||||
operLocation: 'OperLocation',
|
||||
browser: 'Browser',
|
||||
os: 'OperationSystem',
|
||||
status: 'Status',
|
||||
loginTime: 'LoginTime',
|
||||
message: 'Message',
|
||||
|
||||
//--------------当前页面交互框操作提示--------------
|
||||
placeholderIpAddress: 'Enter IPAddress',
|
||||
placeholderUserName: 'Enter UserName',
|
||||
placeholderStatus: 'Select Status',
|
||||
placeholderLoginTime: 'LoginTime',
|
||||
placeholderDateStart: 'DateStart',
|
||||
placeholderDateEnd: 'DateEnd',
|
||||
|
||||
//--------------交互按钮--------------
|
||||
btnSearch: 'Search',
|
||||
btnReset: 'Reset',
|
||||
btnAdd: 'Add',
|
||||
btnEdit: 'Edit',
|
||||
btnDelete: 'Delete',
|
||||
btnImport: 'Import',
|
||||
btnExport: 'Export',
|
||||
btnSubmit: 'Confirm',
|
||||
btnCancel: 'Cancel',
|
||||
btnClear: 'ClearAll',
|
||||
btnDetails: 'Details',
|
||||
btnUnlocked: 'Unlock',
|
||||
|
||||
//--------------提示文本--------------
|
||||
|
||||
//---函数:handleDelete---
|
||||
textDeleteConfirm1: 'Are you sure you want to delete the data item with the infoId of "',
|
||||
textDeleteConfirm2: '"?',
|
||||
|
||||
//---函数:handleUnlock---
|
||||
textUnlockConfirm1: 'Are you sure you want to unlock the data item with the infoId of "',
|
||||
textUnlockConfirm2: '"?',
|
||||
|
||||
//---handleClean---
|
||||
textCleanConfirm: 'Are you sure to clear all login log data items?',
|
||||
|
||||
//--------------操作提示--------------
|
||||
addSuccessInfo: 'Add success',
|
||||
editSuccessInfo: 'Edit success',
|
||||
deleteSuccessInfo: 'Delete success',
|
||||
clearSuccessInfo: 'Clear success',
|
||||
unlockSuccessInfo: 'Unlock success',
|
||||
|
||||
//--------------其他--------------
|
||||
lblWidthSearch: '68px',
|
||||
lblWidthDialog: '100px',
|
||||
|
||||
},
|
||||
|
||||
// ***************系统监控:在线用户*************
|
||||
monitor_Online:{
|
||||
//--------------数据表标题--------------
|
||||
num: 'Id',
|
||||
tokenId: 'TokenId',
|
||||
userName: 'UserName',
|
||||
deptName: 'DeptName',
|
||||
ipAddress: 'Host IP',
|
||||
loginLocation: 'LoginLocation',
|
||||
browser: 'Browser',
|
||||
os: 'Operating System',
|
||||
loginTime: 'LoginTime',
|
||||
message: 'Message',
|
||||
|
||||
//--------------当前页面交互框操作提示--------------
|
||||
placeholderIpAddress: 'Enter Host IP',
|
||||
placeholderUserName: 'Enter UserName',
|
||||
|
||||
//--------------交互按钮--------------
|
||||
btnSearch: 'Search',
|
||||
btnReset: 'Reset',
|
||||
btnForceLogout: 'Force Logout',
|
||||
|
||||
//--------------提示文本--------------
|
||||
//---函数:handleForceLogout---
|
||||
textForceLogoutConfirm1: 'Is the user with the username "',
|
||||
textForceLogoutConfirm2: '"forcefully logged out?',
|
||||
|
||||
//--------------其他--------------
|
||||
lblWidthSearch: '68px',
|
||||
lblWidthDialog: '100px',
|
||||
},
|
||||
|
||||
// ***************系统监控:定时任务*************
|
||||
Monitor_ScheduledTask:{
|
||||
//--------------数据表标题--------------
|
||||
jobId: 'JobId',
|
||||
jobName: 'JobName',
|
||||
jobGroup: 'JobGroup',
|
||||
invokeTarget: 'InvokeTarget',
|
||||
cronExpression: 'CronExpression',
|
||||
status: 'Status',
|
||||
operation: 'Operation',
|
||||
|
||||
//--------------当前页面交互框操作提示--------------
|
||||
placeholderJobName: 'Enter JobName',
|
||||
placeholderJobGroup: 'Select JobGroup',
|
||||
|
||||
//---------------二级窗口操作提示------------------
|
||||
placeholderInvokeTarget: 'Enter InvokeTarget',
|
||||
placeholderCronExpression: 'Enter CronExpression',
|
||||
|
||||
//--------------交互按钮--------------
|
||||
btnSearch: 'Search',
|
||||
btnReset: 'Reset',
|
||||
btnAdd: 'Add',
|
||||
btnEdit: 'Edit',
|
||||
btnDelete: 'Delete',
|
||||
btnImport: 'Import',
|
||||
btnExport: 'Export',
|
||||
btnSubmit: 'Confirm',
|
||||
btnCancel: 'Cancel',
|
||||
btnMore: 'More',
|
||||
btnLog: 'Log',
|
||||
btnGenerateExpression: 'GenerateExpression',
|
||||
|
||||
//---------------更多--------------
|
||||
btnExceOnce: 'Execute Once',
|
||||
btnJobDetails: 'Job Details',
|
||||
btnJobLog: 'Job Log',
|
||||
|
||||
//--------------提示文本--------------
|
||||
//---二级窗口标题---
|
||||
titleAddJob: 'Add Job',
|
||||
titleEditJob: 'Edit Job',
|
||||
|
||||
//---标签---
|
||||
nextValidTime:'Next Valid Time',
|
||||
execStrategy:'Execution Strategy',
|
||||
allowParallel:'Allow Parallel',
|
||||
createTime:'CreateTime',
|
||||
|
||||
//---二级窗口---
|
||||
textInvokeMethod: 'Invoke Method',
|
||||
textInvokeMethodTip1: "Bean call example:ryTask.ryParams('ry')",
|
||||
textInvokeMethodTip2: "Class call example:com.ruoyi.quartz.task.RyTask.ryParams('ry')",
|
||||
textInvokeMethodTip3: "Parameter: string, boolean, long integer, floating point, integer",
|
||||
|
||||
textJobStatusNormal: 'Normal',
|
||||
textJobStatusPause: 'Pause',
|
||||
|
||||
textDefaultStrategy: 'Default',
|
||||
textExecStrategyTip1: 'Immediately',
|
||||
textExecStrategyTip2: 'Once',
|
||||
textExecStrategyTip3: 'Never',
|
||||
|
||||
textIsParallelTip1: 'Enable',
|
||||
textIsParallelTip2: 'Disable',
|
||||
|
||||
//---函数:handleDelete---
|
||||
textEnable: 'Enable',
|
||||
textDisable: 'Disable',
|
||||
textChangeConfirm1: 'Are you sure you want to enable "',
|
||||
textChangeConfirm2: '" job?',
|
||||
textSuccess: 'Success',
|
||||
|
||||
//---函数:handleRun---
|
||||
textExecConfirm1: 'Are you sure you want to perform a scheduling task numbered "',
|
||||
textExecConfirm2: '" immediately?',
|
||||
|
||||
//---函数:handleDelete---
|
||||
textDeleteConfirm1: 'Sure you want to delete the data item with timed task number "',
|
||||
textDeleteConfirm2: '"?',
|
||||
|
||||
//--------------操作提示--------------
|
||||
addSuccessInfo: 'Add success',
|
||||
editSuccessInfo: 'Edit success',
|
||||
deleteSuccessInfo: 'Delete success',
|
||||
clearSuccessInfo: 'Clear success',
|
||||
unlockSuccessInfo: 'Unlock success',
|
||||
execSuccessInfo: 'Exec success',
|
||||
|
||||
//--------------校验提示--------------
|
||||
checkJobNameIsNull: 'JobName cannot be null',
|
||||
checkInvokeTargetIsNull: 'InvokeTarget cannot be null',
|
||||
checkCronExpressionIsNull: 'CronExpression cannot be null',
|
||||
|
||||
//--------------其他--------------
|
||||
lblWidthSearch: '68px',
|
||||
lblWidthDialog: '100px',
|
||||
},
|
||||
|
||||
|
||||
// ***************出库作业流水查询*************
|
||||
|
||||
Reference in New Issue
Block a user