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
This commit is contained in:
猫猫guowen
2025-06-10 11:03:56 +08:00
parent 8d46a23573 a58ee8f132
commit b4280568d9
60 changed files with 2437 additions and 1339 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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',
},
// ***************出库作业流水查询*************

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

@@ -117,7 +117,11 @@ export default {
packingMethod: '包装方式',
quantity: '计划数量',
stockStatus: '单据状态',
operate: '操作'
operate: '操作',
netWeight: '净重',
totalPrice: '总价格',
totalNetWeight: '总净重',
grossWeight: '毛重',
},
// ***************入库单据管理*************
inStockin: {
@@ -179,7 +183,16 @@ export default {
selectStartTime: '请选择开始时间',
selectFinishTime: '请选择结束时间',
inputEntranceId: '请输入入口ID',
inputExitId: '请输入出口ID'
inputExitId: '请输入出口ID',
netWeight: '净重',
totalPrice: '确定',
totalNetWeight: '总净重',
grossWeight: '毛重',
materialDesc: '物料描述',
englishDesc: '英文描述',
cartonNo: '箱号',
packingMethod: '包装方式',
},
// ***************新建出库单据**************
addOutStockout: {
@@ -345,7 +358,8 @@ export default {
selectMaterialRequired: '请选择物资',
materialExistWarning: '所选物资已存在，请重新选择',
quantityExceedError: '数量不能大于库存数量',
saveSuccess: '单据{msg}保存成功'
saveSuccess: '单据{msg}保存成功',
lotNo:'批次号',
},
//***************盘点单据管理***************
checkStockCheck: {
@@ -362,7 +376,7 @@ export default {
invalidate: '单据作废',
review: '单据审核',
confirm: '单据确认',
warehouseId: '仓库ID',
warehouseId: '仓库',
stockSource: '单据来源',
departmentNo: '部门编码',
createManId: '创建人',
@@ -554,6 +568,7 @@ export default {
stockManagement: {
stockId: '库存id',
cargoSpaceId: '货位id',
cargoSpaceName: '货位名称',
stockStatus: '库存状态',
productStatus: '物料状态',
lotNo: '批次号',
@@ -564,11 +579,12 @@ export default {
jobId: '作业ID',
trayCode: '托盘条码',
outQuantity: '出库数量',
stockinDetailId: '入库子单id',
stockinDetailId: '入库子单',
stockinId: '入库主单',
inType: '入库类型',
inClassId: '入库班组ID',
warehouseId: '仓库',
warehouseName: 'WarehouseName',
stackingId: '垛型ID',
operation: '操作',
add: '新增',
@@ -591,7 +607,7 @@ export default {
inputJobId: '请输入作业ID',
inputTrayCode: '请输入托盘条码',
inputOutQuantity: '请输入出库数量',
inputStockinDetailId: '请输入入库子单id',
inputStockinDetailId: '请输入入库子单',
inputStockinId: '请输入入库主单',
inputInClassId: '请输入入库班组ID',
inputWarehouseId: '请输入仓库',
@@ -602,12 +618,25 @@ export default {
addSuccess: '新增成功',
editSuccess: '修改成功',
deleteSuccess: '删除成功',
confirmDelete: '是否确认删除库存信息编号为"{stockIds}"的数据项？'
confirmDelete: '是否确认删除库存信息编号为"{stockIds}"的数据项？',
materialDesc:'物料描述',
materialInDesc:'物料描述',
englishDesc:'英文描述',
netWeight:'净重',
length:'长',
width:'宽',
height:'高',
volume:'体积',
productId:'物料编码',
cargoSpaceStatus: '货位状态'
},
// *************库存操作记录***************
stockRecord: {
stockId: '库存编码',
cargoSpaceId: '货位编码',
cargoSpaceName: '货位名称',
trayCode: '托盘条码',
productId: '物品编码',
productName: '物品名称',
@@ -665,7 +694,8 @@ export default {
editSuccess: '修改成功',
deleteSuccess: '删除成功',
confirmDelete: '您确定要删除ID为' + '{whGuids}' + '的操作记录吗？',
fileName: '记录{time}'
fileName: '记录{time}',
createTime: '创建时间',
},
// **************库存冻结记录**************
stockFreeze: {
@@ -725,7 +755,11 @@ export default {
addSuccess: '新增成功',
editSuccess: '修改成功',
deleteSuccess: '删除成功',
deleteConfirm: '是否确认删除所选库存冻结记录？'
deleteConfirm: '是否确认删除所选库存冻结记录？',
createTime: '创建时间',
oldStatus: '原状态',
currStatus: '新状态',
cargoSpaceName: '货位名称',
},
menu: {
@@ -750,25 +784,47 @@ export default {
outboundTaskManagement: '出库作业管理',
//********************系统管理********************
SystemManagement: '系统管理',
//用户管理
UserManagement: '用户管理',
//角色管理
RoleManagement: '角色管理',
//菜单管理
MenuManagement: '菜单管理',
//部门管理
DepartmentManagement: '部门管理',
//岗位管理
PostManagement: '岗位管理',
//字典管理
DictionaryManagement: '字典管理',
//参数管理
ConfigManagement: '参数管理',
//通知公告
NoticeManagement: '通知公告',
//日志管理
LogManagement: '日志管理',
SystemManagement: '系统管理',
//用户管理
UserManagement: '用户管理',
//角色管理
RoleManagement: '角色管理',
//菜单管理
MenuManagement: '菜单管理',
//部门管理
DepartmentManagement: '部门管理',
//岗位管理
PostManagement: '岗位管理',
//字典管理
DictionaryManagement: '字典管理',
//参数管理
ConfigManagement: '参数管理',
//通知公告
NoticeManagement: '通知公告',
//日志管理
LogManagement: '日志管理',
//操作日志
LogManagement_OperationLog: '操作日志',
//登录日志
LogManagement_LoginLog: '操作日志',
//********************系统监控********************
SystemMonitor: '系统监控',
// 在线用户
SystemMonitor_Online: '在线用户',
// 定时任务
SystemMonitor_ScheduledTask: '定时任务',
// 数据监控
SystemMonitor_DataMonitor: '数据监控',
//服务监控
SystemMonitor_ServiceMonitor: '服务监控',
//缓存监控
SystemMonitor_CacheMonitor: '缓存监控',
//缓存列表
SystemMonitor_CacheList: '缓存列表',
// ****************盘点管理******************
inventoryManagement: '盘点管理',
@@ -1500,6 +1556,14 @@ export default {
createTime: '创建时间',
operation: '人工操作',
//--------------当前页面交互框操作提示--------------
placeholderNoticeTitle: '请输入公告标题',
placeholderCreateBy: '请输入操作人员',
placeholderNoticeType: '选择公告类型',
placeholderCreateTime: '创建时间',
placeholderDateStart: '开始时间',
placeholderDateEnd: '结束时间',
//--------------二级窗口--------------
//--------------标题--------------
addNoticeItem: '新增公告',
@@ -1508,17 +1572,9 @@ export default {
//--------------交互框标签--------------
noticeContent:"公告内容",
//--------------当前页面交互框操作提示--------------
placeholderNoticeTitle: '请输入公告标题',
placeholderCreateBy: '请输入操作人员',
placeholderNoticeType: '选择公告类型',
placeholderCreateTime: '创建时间',
placeholderDateStart: '开始时间',
placeholderDateEnd: '结束时间',
//--------------二级窗口操作提示--------------
placeholderRemark: '请输入内容',
placeholderNoticeContent: '请输入内容',
//--------------二级窗口操作提示--------------
placeholderRemark: '请输入内容',
placeholderNoticeContent: '请输入内容',
//--------------交互按钮--------------
btnSearch: '搜索',
@@ -1555,6 +1611,298 @@ export default {
},
// ***************系统管理：日志管理-操作日志*************
// ***************views/monitor/operlog*************
systemManagement_LogManagement_Operation:{
//--------------数据表标题--------------
operId: '日志编号',
title: '系统模块',
businessType: '操作类型',
operName: '操作人员',
operIp: '操作地址',
operLocation: '操作地点',
status: '操作状态',
operTime: '操作日期',
costTime: '消耗时间',
unitMillisecond: '毫秒',
operation: '消耗时间',
details: '明细',
//--------------当前页面交互框操作提示--------------
placeholderOpenIp: '请输入日志编号',
placeholderTitle: '请输入系统模块',
placeholderBusinessType: '请选择公告类型',
placeholderOperName: '请选择操作人员',
placeholderStatus: '请选择操作状态',
placeholderOperTime: '操作日期',
placeholderDateStart: '开始时间',
placeholderDateEnd: '结束时间',
//--------------二级窗口--------------
//--------------标题--------------
logDetails: '日志明细',
//--------------交互框标签--------------
noticeContent:"公告内容",
loginInfo: '登录信息',
requestInfo: '请求信息',
requestUrl: '请求地址',
requestMethod: '请求方式',
method:'方法',
requestParam: '请求参数',
responseParam: '响应参数',
statusNormal: '响应正常',
statusFail: '响应失败',
errorMsg:'异常信息',
//--------------交互按钮--------------
btnSearch: '搜索',
btnReset: '重置',
btnAdd: '新增',
btnEdit: '修改',
btnDelete: '删除',
btnImport: '导入',
btnExport: '导出',
btnSubmit: '确定',
btnCancel: '取消',
btnClear: '清空',
btnDetails: '明细',
//--------------提示文本--------------
//---handleClean---
textDeleteConfirm: '是否确认清空所有操作日志数据项？"',
//--------------操作提示--------------
addSuccessInfo: '新增成功',
editSuccessInfo: '编辑成功',
deleteSuccessInfo: '删除成功',
clearSuccessInfo: '清空成功',
//--------------其他--------------
lblWidthSearch: '68px',
lblWidthDialog: '100px',
},
// ***************系统管理：日志管理-登录日志*************
// ***************views/monitor/logininfor*************
systemManagement_LogManagement_Login:{
//--------------数据表标题--------------
infoId: '访问编号',
userName: '用户名称',
ipAddress: '登录地址',
loginLocation: '登录地点',
operLocation: '操作地点',
browser: '浏览器',
os: '操作系统',
status: '登录状态',
loginTime: '登录日期',
message: '操作信息',
//--------------当前页面交互框操作提示--------------
placeholderIpAddress: '请输入登录地址',
placeholderUserName: '请输入用户名称',
placeholderStatus: '请选择登录状态',
placeholderLoginTime: '登录时间',
placeholderDateStart: '开始时间',
placeholderDateEnd: '结束时间',
//--------------交互按钮--------------
btnSearch: '搜索',
btnReset: '重置',
btnAdd: '新增',
btnEdit: '修改',
btnDelete: '删除',
btnImport: '导入',
btnExport: '导出',
btnSubmit: '确定',
btnCancel: '取消',
btnClear: '清空',
btnDetails: '明细',
btnUnlocked: '解锁',
//--------------提示文本--------------
//---函数：handleDelete---
textDeleteConfirm1: '是否确认删除访问编号为"',
textDeleteConfirm2: '"的数据项？',
//---函数：handleUnlock---
textUnlockConfirm1: '是否确认解锁访问编号为"',
textUnlockConfirm2: '"的数据项？',
//---函数：handleClean---
textCleanConfirm: '是否确认清空所有登录日志数据项？',
//--------------操作提示--------------
addSuccessInfo: '新增成功',
editSuccessInfo: '编辑成功',
deleteSuccessInfo: '删除成功',
clearSuccessInfo: '清空成功',
unlockSuccessInfo: '解锁成功',
//--------------其他--------------
lblWidthSearch: '68px',
lblWidthDialog: '100px',
},
// ***************系统监控：在线用户*************
monitor_Online:{
//--------------数据表标题--------------
num: '序号',
tokenId: '会话编号',
userName: '登录名称',
deptName: '部门名称',
ipAddress: '主机',
loginLocation: '登录地点',
browser: '浏览器',
os: '操作系统',
loginTime: '登录日期',
message: '操作信息',
//--------------当前页面交互框操作提示--------------
placeholderIpAddress: '请输入登录地址',
placeholderUserName: '请输入用户名称',
//--------------交互按钮--------------
btnSearch: '搜索',
btnReset: '重置',
btnForceLogout: '强制退出',
//--------------提示文本--------------
//---函数：handleForceLogout---
textForceLogoutConfirm1: '是否强制退出用户名为"',
textForceLogoutConfirm2: '"的用户？',
//--------------其他--------------
lblWidthSearch: '68px',
lblWidthDialog: '100px',
},
// ***************系统监控：定时任务*************
Monitor_ScheduledTask:{
//--------------数据表标题--------------
jobId: '任务编号',
jobName: '任务名称',
jobGroup: '任务组名',
invokeTarget: '调用目标字符串',
cronExpression: 'cron执行表达式',
status: '状态',
operation: '操作',
//--------------当前页面交互框操作提示--------------
placeholderJobName: '请输入任务名称',
placeholderJobGroup: '请选择任务组名',
//---------------二级窗口操作提示------------------
placeholderInvokeTarget: '请输入调用目标字符串',
placeholderCronExpression: '请输入Cron执行表达式',
//--------------交互按钮--------------
btnSearch: '搜索',
btnReset: '重置',
btnAdd: '新增',
btnEdit: '修改',
btnDelete: '删除',
btnImport: '导入',
btnExport: '导出',
btnSubmit: '确定',
btnCancel: '取消',
btnMore: '更多',
btnLog: '日志',
btnGenerateExpression: '生成表达式',
btnExceOnce: '执行一次',
btnJobDetails: '任务详情',
btnJobLog: '调度日志',
//--------------提示文本--------------
//---二级窗口标题---
titleAddJob: '添加任务',
titleEditJob: '修改任务',
//---标签---
nextValidTime:'下次执行时间',
execStrategy:'执行策略',
allowParallel:'是否并发',
createTime:'创建时间',
//---二级窗口---
textInvokeMethod: '调用方法',
textInvokeMethodTip1: "Bean调用示例：ryTask.ryParams('ry')",
textInvokeMethodTip2: "Class类调用示例：com.ruoyi.quartz.task.RyTask.ryParams('ry')",
textInvokeMethodTip3: "参数说明：支持字符串，布尔类型，长整型，浮点型，整型",
textJobStatusNormal: '正常',
textJobStatusPause: '暂停',
textDefaultStrategy: '默认策略',
textExecStrategyTip1: '立即执行',
textExecStrategyTip2: '执行一次',
textExecStrategyTip3: '放弃执行',
textIsParallelTip1: '允许',
textIsParallelTip2: '禁止',
//---函数：handleStatusChange---
textEnable: '启用',
textDisable: '停用',
textChangeConfirm1: '确认要"',
textChangeConfirm2: '"任务吗？',
textSuccess: '成功',
//---函数：handleRun---
textExecConfirm1: '确认要立即执行一次"',
textExecConfirm2: '"任务吗？',
//---函数：handleDelete---
textDeleteConfirm1: '是否确认删除定时任务编号为"',
textDeleteConfirm2: '"的数据项？',
//--------------操作提示--------------
addSuccessInfo: '新增成功',
editSuccessInfo: '编辑成功',
deleteSuccessInfo: '删除成功',
clearSuccessInfo: '清空成功',
unlockSuccessInfo: '解锁成功',
execSuccessInfo: '执行成功',
//--------------校验提示--------------
checkJobNameIsNull: '任务名称不能为空',
checkInvokeTargetIsNull: '调用目标字符串不能为空',
checkCronExpressionIsNull: 'cron执行表达式不能为空',
//--------------其他--------------
lblWidthSearch: '68px',
lblWidthDialog: '100px',
},
// ***************系统监控：服务监控***************
Monitor_Service:{
Property: '属性',
Value: '值',
RAM: '内存',
cores: '核心数',
userUsageRate: '用户使用率',
systemUsageRate: '系统使用率',
idleRate: '当先空闲率',
swap: 'Swap',
os: 'OS',
host: 'Host',
name: 'Name',
version: 'Version',
arch: 'Arch',
time: 'Time',
ip: 'IP',
mac: 'MAC',
cpu_cores: 'CPU Cores',
},
// ***************出库作业流水查询*************
searchViewOutJobFlow: {

12
ruoyi-ui/src/views/bas/BasProduct/index.vue
View File

@@ -59,7 +59,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>-->
<el-form-item label="箱号" prop="spare3">
<!-- <el-form-item label="箱号" prop="spare3">
<el-input
v-model="queryParams.spare3"
placeholder="请输入箱号"
@@ -74,7 +74,7 @@
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-form-item>-->
<el-form-item label="价格" prop="price">
<el-input
v-model="queryParams.price"
@@ -207,8 +207,8 @@
<el-table-column label="英文描述" align="center" prop="spare1"/>
<el-table-column label="单位" align="center" prop="unit" />
<el-table-column label="单件净重KG" align="center" prop="spare2" />
<el-table-column label="箱号" align="center" prop="spare3" />
<el-table-column label="包装方式" align="center" prop="spare4" />
<!-- <el-table-column label="箱号" align="center" prop="spare3" />-->
<!-- <el-table-column label="包装方式" align="center" prop="spare4" />-->
<el-table-column label="长MM" align="center" prop="spare5" />
<el-table-column label="宽MM" align="center" prop="spare6" />
<el-table-column label="高MM" align="center" prop="spare7" />
@@ -263,12 +263,12 @@
<el-form-item label="单件净重KG" prop="spare2">
<el-input v-model="form.spare2" placeholder="请输入单件净重" />
</el-form-item>
<el-form-item label="箱号" prop="spare3">
<!-- <el-form-item label="箱号" prop="spare3">
<el-input v-model="form.spare3" placeholder="请输入箱号" />
</el-form-item>
<el-form-item label="包装方式" prop="spare4">
<el-input v-model="form.spare4" placeholder="请输入包装方式" />
</el-form-item>
</el-form-item>-->
<el-form-item label="长MM" prop="spare5">
<el-input v-model="form.spare5" placeholder="请输入长度" />
</el-form-item>

36
ruoyi-ui/src/views/check/create/index.vue
View File

@@ -2,7 +2,7 @@
<div class="app-container">
<!-- 主表信息录入 -->
<el-form :model="formData" ref="formRef" size="small" :inline="true" label-width="68px" :rules="rules">
<el-form-item :label="$t('checkCreate.warehouse')" prop="warehouseId" required> <!-- 仓库 -->
<el-form-item :label="$t('checkCreate.warehouse')" prop="warehouseId" required>
<el-select v-model="formData.warehouseId" :placeholder="$t('checkCreate.selectWarehouse')" clearable>
<el-option
v-for="dict in warehouseOptions"
@@ -12,13 +12,13 @@
/>
</el-select>
</el-form-item>
<el-form-item :label="$t('checkCreate.customer')" prop="customerNo" required> <!-- 客户 -->
<!-- <el-form-item :label="$t('checkCreate.customer')" prop="customerNo" required> &lt;!&ndash; 客户 &ndash;&gt;
<el-input
v-model="formData.customerNo"
:placeholder="$t('checkCreate.inputCustomerNo')"
clearable
/>
</el-form-item>
</el-form-item>-->
<el-form-item :label="$t('checkCreate.documentType')" prop="checkType" required> <!-- 单据类型 -->
<el-select v-model="formData.checkType" :placeholder="$t('checkCreate.selectDocumentType')" clearable>
<el-option
@@ -31,12 +31,12 @@
</el-form-item>
<el-form-item>
<el-button type="warning" icon="el-icon-refresh" size="mini" @click="reset">{{ $t('checkCreate.reset') }}</el-button> <!-- 重置 -->
<el-button type="success" icon="el-icon-check" size="mini" @click="handleSave">{{ $t('checkCreate.saveDocument') }}</el-button> <!-- 保存单据 -->
<el-button type="success" icon="el-icon-check" size="mini" @click="handleSave" v-hasPermi="['check:stockCheck:saveBill']" >{{ $t('checkCreate.saveDocument') }}</el-button> <!-- 保存单据 -->
</el-form-item>
</el-form>
<div class="mb8">
<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleSelectMaterials">{{ $t('checkCreate.selectMaterial') }}</el-button> <!-- 选择物资 -->
<el-button type="primary" icon="el-icon-plus" size="mini" v-hasPermi="['check:productAndStock:list']" @click="handleSelectMaterials" >{{ $t('checkCreate.selectMaterial') }}</el-button> <!-- 选择物资 -->
<el-button type="info" icon="el-icon-refresh-right" size="mini" @click="handleReload">{{ $t('checkCreate.recreateDocument') }}</el-button> <!-- 重新建单 -->
</div>
@@ -54,6 +54,7 @@
<el-input-number v-model="scope.row.quantity" :min="1" size="mini" @change="handleQuantityChange(scope.row)" />
</template>
</el-table-column>
<el-table-column :label="$t('checkCreate.warehouse')" align="center" prop="warehouseName" /> <!-- 物资名称 -->
<el-table-column :label="$t('checkCreate.operation')" align="center" class-name="small-padding fixed-width"> <!-- 操作 -->
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.$index)">{{ $t('checkCreate.delete') }}</el-button> <!-- 删除 -->
@@ -88,14 +89,16 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="仓库" prop="warehouseId">
<el-input
v-model="queryParams.warehouseId"
placeholder="请输入仓库"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<el-form-item label="仓库" prop="warehouseId">
<el-select v-model="queryParams.warehouseId" :placeholder="$t('checkCreate.selectWarehouse')" clearable>
<el-option
v-for="dict in warehouseOptions"
:key="dict.warehouseId"
:label="dict.warehouseName"
:value="dict.warehouseId"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{ $t('checkCreate.search') }}</el-button> <!-- 搜索 -->
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('checkCreate.reset') }}</el-button> <!-- 重置 -->
@@ -107,6 +110,9 @@
<el-table-column :label="$t('checkCreate.materialCode')" align="center" prop="productId" /> <!-- 物资编码 -->
<el-table-column :label="$t('checkCreate.materialName')" align="center" prop="productName" /> <!-- 物资名称 -->
<el-table-column :label="$t('checkCreate.quantity')" align="center" prop="quantity" /> <!-- 数量 -->
<el-table-column :label="$t('checkCreate.lotNo')" align="center" prop="lotNo" /> <!-- 物资名称 -->
<el-table-column :label="$t('checkCreate.warehouse')" align="center" prop="warehouseName" /> <!-- 物资名称 -->
</el-table>
<div slot="footer" class="dialog-footer">
@@ -223,7 +229,9 @@
quantity: item.quantity,
quantityOrignal: item.quantity,
lotNo: item.lotNo,
onlyIdentity: item.onlyIdentity
onlyIdentity: item.onlyIdentity,
warehouseId: item.warehouseId,
warehouseName: item.warehouseName
}))
);
this.materialDialog = false;

4
ruoyi-ui/src/views/check/job/in/index.vue
View File

@@ -216,7 +216,7 @@
size="mini"
:disabled="multiple"
@click="handleManualVoid"
v-hasPermi="['check:job:in:void']"
v-hasPermi="['job:checkMydoJob:manualInvalidation']"
>{{$t('checkJobIn.manualVoid')}}</el-button> <!--手动作废-->
</el-col>
<el-col :span="1.5">
@@ -227,7 +227,7 @@
size="mini"
:disabled="multiple"
@click="handleManualFinish"
v-hasPermi="['check:job:in:finish']"
v-hasPermi="['job:checkMydoJob:manualCompleted']"
>{{$t('checkJobIn.manualFinish')}}</el-button> <!--手动完成-->
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>

14
ruoyi-ui/src/views/check/job/out/index.vue
View File

@@ -216,7 +216,7 @@
icon="el-icon-edit"
size="mini"
@click="handleCompletedManually({type: 'invalid'})"
v-hasPermi="['job:mydoJob:CompletedManually']"
v-hasPermi="['job:checkMydoJob:OuthandFinish']"
>{{$t('checkJobOut.manualInvalid')}}</el-button> <!-- 手动作废 -->
</el-col>
<el-col :span="1.5">
@@ -226,7 +226,7 @@
icon="el-icon-edit"
size="mini"
@click="handleCompletedManually({type: 'completed'})"
v-hasPermi="['job:mydoJob:CompletedManually']"
v-hasPermi="['job:job:checkMydoJob:OuthandInvalidation']"
>{{$t('checkJobOut.manualFinish')}}</el-button> <!-- 手动完成 -->
</el-col>
<!-- <el-col :span="1.5">
@@ -297,11 +297,13 @@
size="mini"
type="text"
@click="handleManualFinish(scope.row)"
v-hasPermi="['job:checkMydoJob:OuthandFinish']"
>{{$t('checkJobOut.manualFinish')}}</el-button> <!-- 手动完成 -->
<el-button
size="mini"
type="text"
@click="handleManualInvalid(scope.row)"
v-hasPermi="['job:checkMydoJob:OuthandInvalidation']"
>{{$t('checkJobOut.manualInvalid')}}</el-button> <!-- 手动作废 -->
</template>
</el-table-column>
@@ -338,14 +340,6 @@
</template>
</el-table-column>
<el-table-column :label="$t('checkJobOut.supplierId')" align="center" prop="supplierId" /> <!-- 供应商ID -->
<!-- <el-table-column label="库存数量" align="center" prop="stockQuantity" />
<!-- <el-table-column label="出库数量" align="center" prop="outQuantity" />
<!-- <el-table-column label="整层数量" align="center" prop="layerQuantity" />
<!-- <el-table-column label="出库层数量" align="center" prop="outLayerQuantity" />
<!-- <el-table-column label="回流数量" align="center" prop="giveNum" />
<!-- <el-table-column label="追溯入库单ID" align="center" prop="stockinId" />
<!-- <el-table-column label="垛型ID" align="center" prop="stackingId" />
<!-- <el-table-column label="出库口ID" align="center" prop="exitId" />-->
<el-table-column label="生产日期" align="center" prop="printDate" />
<!-- <el-table-column label="客户ID" align="center" prop="customerId" />-->
<el-table-column label="供应商ID" align="center" prop="supplierId" />

7
ruoyi-ui/src/views/check/stockCheck/index.vue
View File

@@ -167,6 +167,7 @@
plain
icon="el-icon-plus"
size="mini"
:disabled="single"
@click="handleReview"
v-hasPermi="['check:stockCheck:edit']"
>{{$t('checkStockCheck.review')}}</el-button> <!-- 单据审核 -->
@@ -201,7 +202,7 @@
<dict-tag :options="dict.type.check_bill_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column :label="$t('checkStockCheck.warehouseId')" align="center" prop="warehouseId" /> <!-- 仓库ID -->
<el-table-column :label="$t('checkStockCheck.warehouseId')" align="center" prop="warehouseName" /> <!-- 仓库ID -->
<el-table-column :label="$t('checkStockCheck.stockSource')" align="center" prop="stockSource" /> <!-- 单据来源 -->
<el-table-column :label="$t('checkStockCheck.departmentNo')" align="center" prop="departmentNo" /> <!-- 部门编码 -->
<el-table-column :label="$t('checkStockCheck.createManId')" align="center" prop="createManId" /> <!-- 创建人 -->
@@ -227,8 +228,8 @@
<el-table-column :label="$t('checkStockCheck.productId')" align="center" prop="productId"/> <!-- 物料编码 -->
<el-table-column :label="$t('checkStockCheck.materialDesc')" align="center" prop="extraField.materialDesc"/> <!-- 物料描述 -->
<el-table-column :label="$t('checkStockCheck.englishDesc')" align="center" prop="extraField.englishDesc"/> <!-- 英文描述 -->
<el-table-column :label="$t('checkStockCheck.cartonNo')" align="center" prop="extraField.cartonNo"/> <!-- 箱号 -->
<el-table-column :label="$t('checkStockCheck.packingMethod')" align="center" prop="extraField.packingMethod"/> <!-- 包装方式 -->
<!-- <el-table-column :label="$t('checkStockCheck.cartonNo')" align="center" prop="extraField.cartonNo"/> &lt;!&ndash; 箱号 &ndash;&gt;-->
<!-- <el-table-column :label="$t('checkStockCheck.packingMethod')" align="center" prop="extraField.packingMethod"/> &lt;!&ndash; 包装方式 &ndash;&gt;-->
<el-table-column :label="$t('checkStockCheck.quantity')" align="center" prop="quantity"/> <!-- 计划数量 -->
<el-table-column :label="$t('checkStockCheck.scanNum')" align="center" prop="scanNum"/> <!-- 扫码数量 -->
<el-table-column :label="$t('checkStockCheck.assignNum')" align="center" prop="assignNum"/> <!-- 实际数量 -->

20
ruoyi-ui/src/views/in/job/index.vue
View File

@@ -305,8 +305,8 @@
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('inJob.jobDetailId')" align="center" prop="jobDetailId" />
<el-table-column :label="$t('inJob.jobId')" align="center" prop="jobId" /> // 任务ID
<el-table-column :label="$t('inJob.stockId')" align="center" prop="stockId" /> // 库存ID
<!-- <el-table-column :label="$t('inJob.jobId')" align="center" prop="jobId" /> // 任务ID-->
<!-- <el-table-column :label="$t('inJob.stockId')" align="center" prop="stockId" /> // 库存ID-->
<el-table-column :label="$t('inJob.lotNo')" align="center" prop="lotNo" /> // 批次号
<el-table-column :label="$t('inJob.inDate')" align="center" prop="inDate" width="180"> // 入库时间
<template slot-scope="scope">
@@ -315,12 +315,20 @@
</el-table-column>
<el-table-column :label="$t('inJob.inOrOutId')" align="center" prop="inOrOutId" /> // 单据ID
<el-table-column :label="$t('inJob.inOrOutDId')" align="center" prop="inOrOutDId" /> // 子单据ID
<el-table-column :label="$t('inJob.productGuid')" align="center" prop="productGuid" /> // 物料GUID
<!-- <el-table-column :label="$t('inJob.productGuid')" align="center" prop="productGuid" /> // 物料GUID-->
<el-table-column :label="$t('inJob.productId')" align="center" prop="productId" /> // 物料编码
<el-table-column :label="$t('inJob.stockStatus')" align="center" prop="stockStatus" /> // 库存状态
<el-table-column :label="$t('inJob.materialDesc')" align="center" prop="extraField.materialDesc" /> // 物料描述
<el-table-column :label="$t('inJob.englishDesc')" align="center" prop="extraField.englishDesc" /> // 英文描述
<el-table-column :label="$t('inJob.cartonNo')" align="center" prop="extraField.cartonNo" /> // 箱号
<el-table-column :label="$t('inJob.packingMethod')" align="center" prop="extraField.packingMethod" /> // 包装方式
<el-table-column :label="$t('inJob.netWeight')" align="center" prop="extraField.netWeight" /> // 净重
<el-table-column :label="$t('inJob.totalNetWeight')" align="center" prop="extraField.totalNetWeight" /> // 总净重
<el-table-column :label="$t('inJob.grossWeight')" align="center" prop="extraField.grossWeight" /> // 毛重
<!-- <el-table-column :label="$t('inJob.stockStatus')" align="center" prop="stockStatus" /> // 库存状态-->
<el-table-column :label="$t('inJob.inQuantity')" align="center" prop="inQuantity" /> // 入库数量
<el-table-column :label="$t('inJob.printDate')" align="center" prop="printDate" /> // 生产日期
<el-table-column :label="$t('inJob.supplierId')" align="center" prop="supplierId" /> // 供应商ID
<!-- <el-table-column :label="$t('inJob.printDate')" align="center" prop="printDate" /> // 生产日期-->
<!-- <el-table-column :label="$t('inJob.supplierId')" align="center" prop="supplierId" /> // 供应商ID-->
<!-- <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" />

6
ruoyi-ui/src/views/in/receive/add/index.vue
View File

@@ -162,8 +162,8 @@
<el-table-column :label="$t('receiveStockinAdd.spare1')" align="center" prop="spare1"/><!--英文描述-->
<el-table-column :label="$t('receiveStockinAdd.unit')" align="center" prop="unit" /><!--单位-->
<el-table-column :label="$t('receiveStockinAdd.spare2')" align="center" prop="spare2" /><!--单件净重KG-->
<el-table-column :label="$t('receiveStockinAdd.spare3')" align="center" prop="spare3" /><!--箱号-->
<el-table-column :label="$t('receiveStockinAdd.spare4')" align="center" prop="spare4" /><!--包装方式-->
<!-- <el-table-column :label="$t('receiveStockinAdd.spare3')" align="center" prop="spare3" />&lt;!&ndash;箱号&ndash;&gt;-->
<!-- <el-table-column :label="$t('receiveStockinAdd.spare4')" align="center" prop="spare4" />&lt;!&ndash;包装方式&ndash;&gt;-->
<el-table-column :label="$t('receiveStockinAdd.spare5')" align="center" prop="spare5" /><!--长MM-->
<el-table-column :label="$t('receiveStockinAdd.spare6')" align="center" prop="spare6" /><!--宽MM-->
<el-table-column :label="$t('receiveStockinAdd.spare7')" align="center" prop="spare7" /><!--高MM-->
@@ -436,7 +436,7 @@ export default {
addStockin(data).then(() => {
this.$modal.msgSuccess(this.$t('receiveStockinAdd.addSuccess'));
// 重置表单数据
cancelPri()
this.cancelPri();
});
}
});

13
ruoyi-ui/src/views/in/receive/index.vue
View File

@@ -231,11 +231,10 @@
<!-- <el-table-column label="GUID" align="center" prop="stockinGuid" /> -->
<el-table-column :label="$t('inReceiveStockin.stockinId')" align="center" prop="stockinId"/><!--入库订单-->
<el-table-column :label="$t('inReceiveStockin.inType')" align="center" prop="inType"/><!--入库类型-->
<el-table-column :label="$t('inReceiveStockin.createDate')" align="center" prop="createDate"/><!--建立时间-->
<el-table-column :label="$t('inReceiveStockin.createManName')" align="center" prop="createManName"/><!--创建人-->
<el-table-column :label="$t('inReceiveStockin.status')" align="center" prop="status"><!--单据状态-->
<template slot-scope="scope">
<dict-tag :options="statusOptions" :value="scope.row.status"/>
<dict-tag :options="dict.type.receive_bill_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column :label="$t('inReceiveStockin.warehouseName')" align="center" prop="warehouseName"/><!--仓库-->
@@ -269,6 +268,8 @@
>删除</el-button>
</template>
</el-table-column> -->
<el-table-column :label="$t('inReceiveStockin.createManName')" align="center" prop="createManName"/><!--创建人-->
<el-table-column :label="$t('inReceiveStockin.createDate')" align="center" prop="createDate"/><!--建立时间-->
</el-table>
<pagination
@@ -316,6 +317,10 @@
<el-table-column :label="$t('inReceiveStockin.englishDesc')" align="center" prop="extraField.englishDesc"/><!--英文描述-->
<el-table-column :label="$t('inReceiveStockin.cartonNo')" align="center" prop="extraField.cartonNo"/><!--箱号-->
<el-table-column :label="$t('inReceiveStockin.packingMethod')" align="center" prop="extraField.packingMethod"/><!--包装方式-->
<!-- <el-table-column :label="$t('inReceiveStockin.grossWeight')" align="center" prop="extraField.grossWeight"/>&lt;!&ndash;毛重&ndash;&gt;-->
<el-table-column :label="$t('inReceiveStockin.netWeight')" align="center" prop="extraField.netWeight"/><!--净重-->
<!-- <el-table-column :label="$t('inReceiveStockin.totalPrice')" align="center" prop="extraField.totalPrice"/>&lt;!&ndash;总价格&ndash;&gt;-->
<!-- <el-table-column :label="$t('inReceiveStockin.totalNetWeight')" align="center" prop="extraField.totalNetWeight"/>&lt;!&ndash;总净重&ndash;&gt;-->
<el-table-column :label="$t('inReceiveStockin.quantity')" width="120" align="center"><!--计划数量-->
<template slot-scope="scope">
<el-input-number
@@ -337,7 +342,7 @@
<!-- <el-table-column label="入库日期" align="center" prop="printDate"/>-->
<el-table-column :label="$t('inReceiveStockin.stockStatus')" align="center" prop="stockStatus"><!--单据状态-->
<template slot-scope="scope">
<dict-tag :options="statusOptions" :value="scope.row.stockStatus"/>
<dict-tag :options="dict.type.receive_bill_status" :value="scope.row.stockStatus"/>
</template>
</el-table-column>
<!-- <el-table-column label="供应商编码" align="center" prop="supplierId"/>-->

9
ruoyi-ui/src/views/in/stockIn/index.vue
View File

@@ -258,15 +258,12 @@
<dict-tag :options="dict.type.in_bill_type" :value="scope.row.inType"/>
</template>
</el-table-column>
<el-table-column :label="$t('inReceiveStockin.createDate')" align="center" prop="createDate"/><!--建立时间-->
<el-table-column :label="$t('inReceiveStockin.createManName')" align="center" prop="createManName"/><!--创建人-->
<el-table-column :label="$t('inReceiveStockin.status')" align="center" prop="status"><!--单据状态-->
<template slot-scope="scope">
<dict-tag :options="dict.type.in_bill_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column :label="$t('inReceiveStockin.warehouseName')" align="center" prop="warehouseName"/><!--仓库-->
<el-table-column :label="$t('inStockin.finishDate')" align="center" prop="finishDate"/><!--完成日期-->
<el-table-column :label="$t('inReceiveStockin.stockSource')" align="center" prop="stockSource"><!--单据来源-->
<template slot-scope="scope">
<dict-tag :options="dict.type.bill_resource" :value="scope.row.stockSource"/>
@@ -274,6 +271,9 @@
</el-table-column>
<el-table-column :label="$t('inReceiveStockin.departmentName')" align="center" prop="departmentName"/><!--部门-->
<el-table-column :label="$t('inReceiveStockin.supplierName')" align="center" prop="supplierName"/><!--供应商-->
<el-table-column :label="$t('inReceiveStockin.createManName')" align="center" prop="createManName"/><!--创建人-->
<el-table-column :label="$t('inReceiveStockin.createDate')" align="center" prop="createDate"/><!--建立时间-->
<el-table-column :label="$t('inStockin.finishDate')" align="center" prop="finishDate"/><!--完成日期-->
</el-table>
<pagination
@@ -294,6 +294,9 @@
<el-table-column :label="$t('inReceiveStockin.englishDesc')" align="center" prop="extraField.englishDesc"/><!--英文描述-->
<el-table-column :label="$t('inReceiveStockin.cartonNo')" align="center" prop="extraField.cartonNo"/><!--箱号-->
<el-table-column :label="$t('inReceiveStockin.packingMethod')" align="center" prop="extraField.packingMethod"/><!--包装方式-->
<el-table-column :label="$t('inReceiveStockin.netWeight')" align="center" prop="extraField.netWeight" /> // 净重
<!-- <el-table-column :label="$t('inReceiveStockin.totalNetWeight')" align="center" prop="extraField.totalNetWeight" /> // 总净重-->
<!-- <el-table-column :label="$t('inReceiveStockin.grossWeight')" align="center" prop="extraField.grossWeight" /> // 毛重-->
<el-table-column :label="$t('inReceiveStockin.quantity')" align="center" prop="quantity"/><!--计划数量-->
<el-table-column :label="$t('inStockin.scanNum')" align="center" prop="scanNum"/><!--扫码数量-->
<el-table-column :label="$t('inStockin.assignNum')" align="center" prop="assignNum"/><!--实际数量-->

424
ruoyi-ui/src/views/monitor/job/index.vue
View File

@@ -1,16 +1,19 @@
<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="jobName">
<!-- 查询表单 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" :label-width="$t('Monitor_ScheduledTask.lblWidthSearch')">
<!-- 任务名称 -->
<el-form-item :label="$t('Monitor_ScheduledTask.jobName')" prop="jobName">
<el-input
v-model="queryParams.jobName"
placeholder="请输入任务名称"
:placeholder="$t('Monitor_ScheduledTask.placeholderJobName')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="任务组名" prop="jobGroup">
<el-select v-model="queryParams.jobGroup" placeholder="请选择任务组名" clearable>
<!-- 任务组名 -->
<el-form-item :label="$t('Monitor_ScheduledTask.jobGroup')" prop="jobGroup">
<el-select v-model="queryParams.jobGroup" :placeholder="$t('Monitor_ScheduledTask.placeholderJobGroup')" clearable>
<el-option
v-for="dict in dict.type.sys_job_group"
:key="dict.value"
@@ -19,8 +22,9 @@
/>
</el-select>
</el-form-item>
<el-form-item label="任务状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择任务状态" clearable>
<!-- 任务状态 -->
<el-form-item :label="$t('Monitor_ScheduledTask.status')" prop="status">
<el-select v-model="queryParams.status" :placeholder="$t('Monitor_ScheduledTask.status')" clearable>
<el-option
v-for="dict in dict.type.sys_job_status"
:key="dict.value"
@@ -30,13 +34,16 @@
</el-select>
</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('Monitor_ScheduledTask.btnSearch') }}</el-button>
<!-- 【重置】按钮 -->
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('Monitor_ScheduledTask.btnReset') }}</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<!-- 【新增】按钮 -->
<el-button
type="primary"
plain
@@ -44,9 +51,10 @@
size="mini"
@click="handleAdd"
v-hasPermi="['monitor:job:add']"
>新增</el-button>
>{{ $t('Monitor_ScheduledTask.btnAdd') }}</el-button>
</el-col>
<el-col :span="1.5">
<!-- 【修改】按钮 -->
<el-button
type="success"
plain
@@ -55,9 +63,10 @@
:disabled="single"
@click="handleUpdate"
v-hasPermi="['monitor:job:edit']"
>修改</el-button>
>{{ $t('Monitor_ScheduledTask.btnEdit') }}</el-button>
</el-col>
<el-col :span="1.5">
<!-- 【删除】按钮 -->
<el-button
type="danger"
plain
@@ -66,9 +75,10 @@
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['monitor:job:remove']"
>删除</el-button>
>{{ $t('Monitor_ScheduledTask.btnDelete') }}</el-button>
</el-col>
<el-col :span="1.5">
<!-- 【导出】按钮 -->
<el-button
type="warning"
plain
@@ -76,9 +86,10 @@
size="mini"
@click="handleExport"
v-hasPermi="['monitor:job:export']"
>导出</el-button>
>{{ $t('Monitor_ScheduledTask.btnExport') }}</el-button>
</el-col>
<el-col :span="1.5">
<!-- 【日志】按钮 -->
<el-button
type="info"
plain
@@ -86,23 +97,29 @@
size="mini"
@click="handleJobLog"
v-hasPermi="['monitor:job:query']"
>日志</el-button>
>{{ $t('Monitor_ScheduledTask.btnJobLog') }}</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="jobList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="任务编号" width="100" align="center" prop="jobId" />
<el-table-column label="任务名称" align="center" prop="jobName" :show-overflow-tooltip="true" />
<el-table-column label="任务组名" align="center" prop="jobGroup">
<!-- 任务编号 -->
<el-table-column :label="$t('Monitor_ScheduledTask.jobId')" width="100" align="center" prop="jobId" />
<!-- 任务名称 -->
<el-table-column :label="$t('Monitor_ScheduledTask.jobName')" align="center" prop="jobName" :show-overflow-tooltip="true" />
<!-- 任务组名 -->
<el-table-column :label="$t('Monitor_ScheduledTask.jobGroup')" align="center" prop="jobGroup">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_job_group" :value="scope.row.jobGroup"/>
</template>
</el-table-column>
<el-table-column label="调用目标字符串" align="center" prop="invokeTarget" :show-overflow-tooltip="true" />
<el-table-column label="cron执行表达式" align="center" prop="cronExpression" :show-overflow-tooltip="true" />
<el-table-column label="状态" align="center">
<!-- 调用目标字符串 -->
<el-table-column :label="$t('Monitor_ScheduledTask.invokeTarget')" align="center" prop="invokeTarget" :show-overflow-tooltip="true" />
<!-- cron执行表达式 -->
<el-table-column :label="$t('Monitor_ScheduledTask.cronExpression')" align="center" prop="cronExpression" :show-overflow-tooltip="true" />
<!-- 状态 -->
<el-table-column :label="$t('Monitor_ScheduledTask.status')" align="center">
<template slot-scope="scope">
<el-switch
v-model="scope.row.status"
@@ -112,31 +129,37 @@
></el-switch>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column :label="$t('Monitor_ScheduledTask.operation')" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<!-- 【操作】按钮 -->
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['monitor:job:edit']"
>修改</el-button>
>{{ $t('Monitor_ScheduledTask.btnEdit') }}</el-button>
<!-- 【删除】按钮 -->
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['monitor:job:remove']"
>删除</el-button>
>{{ $t('Monitor_ScheduledTask.btnDelete') }}</el-button>
<el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['monitor:job:changeStatus', 'monitor:job:query']">
<el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
<!-- 更多 -->
<el-button size="mini" type="text" icon="el-icon-d-arrow-right">{{ $t('Monitor_ScheduledTask.btnMore') }}</el-button>
<el-dropdown-menu slot="dropdown">
<!-- 执行一次 -->
<el-dropdown-item command="handleRun" icon="el-icon-caret-right"
v-hasPermi="['monitor:job:changeStatus']">执行一次</el-dropdown-item>
v-hasPermi="['monitor:job:changeStatus']">{{ $t('Monitor_ScheduledTask.btnExceOnce') }}</el-dropdown-item>
<!-- 任务详细 -->
<el-dropdown-item command="handleView" icon="el-icon-view"
v-hasPermi="['monitor:job:query']">任务详细</el-dropdown-item>
v-hasPermi="['monitor:job:query']">{{ $t('Monitor_ScheduledTask.btnJobDetails') }}</el-dropdown-item>
<!-- 调度日志 -->
<el-dropdown-item command="handleJobLog" icon="el-icon-s-operation"
v-hasPermi="['monitor:job:query']">调度日志</el-dropdown-item>
v-hasPermi="['monitor:job:query']">{{ $t('Monitor_ScheduledTask.btnJobLog') }}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</template>
@@ -152,141 +175,180 @@
/>
<!-- 添加或修改定时任务对话框 -->
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
<el-col :span="12">
<el-form-item label="任务名称" prop="jobName">
<el-input v-model="form.jobName" placeholder="请输入任务名称" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="任务分组" prop="jobGroup">
<el-select v-model="form.jobGroup" placeholder="请选择任务分组">
<el-option
v-for="dict in dict.type.sys_job_group"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item prop="invokeTarget">
<span slot="label">
调用方法
<el-tooltip placement="top">
<div slot="content">
Bean调用示例：ryTask.ryParams('ry')
<br />Class类调用示例：com.ruoyi.quartz.task.RyTask.ryParams('ry')
<br />参数说明：支持字符串，布尔类型，长整型，浮点型，整型
</div>
<i class="el-icon-question"></i>
</el-tooltip>
</span>
<el-input v-model="form.invokeTarget" placeholder="请输入调用目标字符串" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="cron表达式" prop="cronExpression">
<el-input v-model="form.cronExpression" placeholder="请输入cron执行表达式">
<template slot="append">
<el-button type="primary" @click="handleShowCron">
生成表达式
<i class="el-icon-time el-icon--right"></i>
</el-button>
</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="24" v-if="form.jobId !== undefined">
<el-form-item label="状态">
<el-radio-group v-model="form.status">
<el-radio
v-for="dict in dict.type.sys_job_status"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="执行策略" prop="misfirePolicy">
<el-radio-group v-model="form.misfirePolicy" size="small">
<el-radio-button label="1">立即执行</el-radio-button>
<el-radio-button label="2">执行一次</el-radio-button>
<el-radio-button label="3">放弃执行</el-radio-button>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否并发" prop="concurrent">
<el-radio-group v-model="form.concurrent" size="small">
<el-radio-button label="0">允许</el-radio-button>
<el-radio-button label="1">禁止</el-radio-button>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" :label-width="$t('Monitor_ScheduledTask.lblWidthDialog')">
<el-row>
<el-col :span="12">
<!-- 任务名称 -->
<el-form-item :label="$t('Monitor_ScheduledTask.jobName')" prop="jobName">
<el-input v-model="form.jobName" :placeholder="$t('Monitor_ScheduledTask.placeholderJobName')" />
</el-form-item>
</el-col>
<el-col :span="12">
<!-- 任务组名 -->
<el-form-item :label="$t('Monitor_ScheduledTask.jobGroup')" prop="jobGroup">
<el-select v-model="form.jobGroup" :placeholder="$t('Monitor_ScheduledTask.placeholderJobGroup')">
<el-option
v-for="dict in dict.type.sys_job_group"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item prop="invokeTarget">
<span slot="label">
<!-- 调用方法 -->
{{ $t('Monitor_ScheduledTask.textInvokeMethod') }}
<el-tooltip placement="top">
<div slot="content">
<!-- Bean调用示例：ryTask.ryParams('ry') -->
{{ $t('Monitor_ScheduledTask.textInvokeMethodTip1') }}<br/>
<!-- Class类调用示例：com.ruoyi.quartz.task.RyTask.ryParams('ry') -->
{{ $t('Monitor_ScheduledTask.textInvokeMethodTip2') }}<br/>
<!-- 参数说明：支持字符串，布尔类型，长整型，浮点型，整型 -->
{{ $t('Monitor_ScheduledTask.textInvokeMethodTip3') }}
</div>
<i class="el-icon-question"></i>
</el-tooltip>
</span>
<el-input v-model="form.invokeTarget" :placeholder="$t('Monitor_ScheduledTask.placeholderInvokeTarget')" />
</el-form-item>
</el-col>
<el-col :span="24">
<!-- cron执行表达式 -->
<el-form-item :label="$t('Monitor_ScheduledTask.cronExpression')" prop="cronExpression">
<el-input v-model="form.cronExpression" :placeholder="$t('Monitor_ScheduledTask.placeholderCronExpression')">
<template slot="append">
<el-button type="primary" @click="handleShowCron">
<!-- 生成表达式 -->
{{ $t('Monitor_ScheduledTask.btnGenerateExpression') }}
<i class="el-icon-time el-icon--right"></i>
</el-button>
</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="24" v-if="form.jobId !== undefined">
<!-- 状态 -->
<el-form-item :label="$t('Monitor_ScheduledTask.status')">
<el-radio-group v-model="form.status">
<el-radio
v-for="dict in dict.type.sys_job_status"
:key="dict.value"
:label="dict.value"
>{{ dict.label }}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<!-- 执行策略 -->
<el-form-item :label="$t('Monitor_ScheduledTask.execStrategy')" prop="misfirePolicy">
<el-radio-group v-model="form.misfirePolicy" size="small">
<!-- 立即执行 -->
<el-radio-button label="1">{{ $t('Monitor_ScheduledTask.textExecStrategyTip1') }}</el-radio-button>
<!-- 执行一次 -->
<el-radio-button label="2">{{ $t('Monitor_ScheduledTask.textExecStrategyTip2') }}</el-radio-button>
<!-- 放弃执行 -->
<el-radio-button label="3">{{ $t('Monitor_ScheduledTask.textExecStrategyTip3') }}</el-radio-button>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<!-- 是否并发 -->
<el-form-item :label="$t('Monitor_ScheduledTask.allowParallel')" prop="concurrent">
<el-radio-group v-model="form.concurrent" size="small">
<!-- 允许 -->
<el-radio-button label="0">{{ $t('Monitor_ScheduledTask.textIsParallelTip1') }}</el-radio-button>
<!-- 禁止 -->
<el-radio-button label="1">{{ $t('Monitor_ScheduledTask.textIsParallelTip2') }}</el-radio-button>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<!-- 【确定】按钮 -->
<el-button type="primary" @click="submitForm">{{ $t('Monitor_ScheduledTask.btnSubmit') }}</el-button>
<!-- 【取消】按钮 -->
<el-button @click="cancel">{{ $t('Monitor_ScheduledTask.btnCancel') }}</el-button>
</div>
</el-dialog>
<el-dialog title="Cron表达式生成器" :visible.sync="openCron" append-to-body destroy-on-close class="scrollbar">
<crontab @hide="openCron=false" @fill="crontabFill" :expression="expression"></crontab>
</el-dialog>
<!-- Cron表达式生成器 -->
<el-dialog
:title="$t('Monitor_ScheduledTask.btnGenerateExpression')"
:visible.sync="openCron"
append-to-body
destroy-on-close
class="scrollbar">
<crontab @hide="openCron=false" @fill="crontabFill" :expression="expression"></crontab>
</el-dialog>
<!-- 任务日志详细 -->
<el-dialog title="任务详细" :visible.sync="openView" width="700px" append-to-body>
<el-form ref="form" :model="form" label-width="120px" size="mini">
<el-row>
<el-col :span="12">
<el-form-item label="任务编号：">{{ form.jobId }}</el-form-item>
<el-form-item label="任务名称：">{{ form.jobName }}</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="任务分组：">{{ jobGroupFormat(form) }}</el-form-item>
<el-form-item label="创建时间：">{{ form.createTime }}</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="cron表达式：">{{ form.cronExpression }}</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="下次执行时间：">{{ parseTime(form.nextValidTime) }}</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="调用目标方法：">{{ form.invokeTarget }}</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="任务状态：">
<div v-if="form.status == 0">正常</div>
<div v-else-if="form.status == 1">暂停</div>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否并发：">
<div v-if="form.concurrent == 0">允许</div>
<div v-else-if="form.concurrent == 1">禁止</div>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="执行策略：">
<div v-if="form.misfirePolicy == 0">默认策略</div>
<div v-else-if="form.misfirePolicy == 1">立即执行</div>
<div v-else-if="form.misfirePolicy == 2">执行一次</div>
<div v-else-if="form.misfirePolicy == 3">放弃执行</div>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="openView = false">关 闭</el-button>
</div>
</el-dialog>
<!-- 任务日志详细 -->
<el-dialog
:title="$t('Monitor_ScheduledTask.btnJobDetails')"
:visible.sync="openView"
width="700px"
append-to-body>
<el-form ref="form" :model="form" :label-width="$t('Monitor_ScheduledTask.lblWidthDialog')" size="mini">
<el-row>
<el-col :span="12">
<!-- 任务编号： -->
<el-form-item :label="$t('Monitor_ScheduledTask.jobId')">{{ form.jobId }}</el-form-item>
<!-- 任务名称： -->
<el-form-item :label="$t('Monitor_ScheduledTask.jobName')">{{ form.jobName }}</el-form-item>
</el-col>
<el-col :span="12">
<!-- 任务分组： -->
<el-form-item :label="$t('Monitor_ScheduledTask.jobGroup')">{{ jobGroupFormat(form) }}</el-form-item>
<!-- 创建时间： -->
<el-form-item :label="$t('Monitor_ScheduledTask.jobGroup' + ':')">{{ form.createTime }}</el-form-item>
</el-col>
<el-col :span="12">
<!-- cron表达式： -->
<el-form-item :label="$t('Monitor_ScheduledTask.cronExpression')">{{ form.cronExpression }}</el-form-item>
</el-col>
<el-col :span="12">
<!-- 下次执行时间： -->
<el-form-item :label="$t('Monitor_ScheduledTask.nextValidTime')">{{ parseTime(form.nextValidTime) }}</el-form-item>
</el-col>
<el-col :span="24">
<!-- 调用目标方法： -->
<el-form-item :label="$t('Monitor_ScheduledTask.invokeTarget')">{{ form.invokeTarget }}</el-form-item>
</el-col>
<el-col :span="12">
<!-- 任务状态： -->
<el-form-item :label="$t('Monitor_ScheduledTask.status')">
<div v-if="form.status == 0">{{ $t('Monitor_ScheduledTask.textJobStatusNormal') }}</div>
<div v-else-if="form.status == 1">{{ $t('Monitor_ScheduledTask.textJobStatusPause') }}</div>
</el-form-item>
</el-col>
<el-col :span="12">
<!-- 是否并发： -->
<el-form-item :label="$t('Monitor_ScheduledTask.allowParallel')">
<div v-if="form.concurrent == 0">{{ $t('Monitor_ScheduledTask.textIsParallelTip1') }}</div>
<div v-else-if="form.concurrent == 1">{{ $t('Monitor_ScheduledTask.textIsParallelTip2') }}</div>
</el-form-item>
</el-col>
<el-col :span="12">
<!-- 执行策略： -->
<el-form-item :label="$t('Monitor_ScheduledTask.execStrategy')">
<div v-if="form.misfirePolicy == 0">{{ $t('Monitor_ScheduledTask.textDefaultStrategy') }}</div>
<div v-else-if="form.misfirePolicy == 1">{{ $t('Monitor_ScheduledTask.textExecStrategyTip1') }}</div>
<div v-else-if="form.misfirePolicy == 2">{{ $t('Monitor_ScheduledTask.textExecStrategyTip2') }}</div>
<div v-else-if="form.misfirePolicy == 3">{{ $t('Monitor_ScheduledTask.textExecStrategyTip3') }}</div>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<!-- 【关闭】按钮 -->
<el-button @click="openView = false">{{ $t('Monitor_ScheduledTask.btnSubmit') }}</el-button>
</div>
</el-dialog>
</div>
</template>
@@ -337,13 +399,16 @@ export default {
// 表单校验
rules: {
jobName: [
{ required: true, message: "任务名称不能为空", trigger: "blur" }
// 任务名称不能为空
{ required: true, message: this.$t('Monitor_ScheduledTask.checkJobNameIsNull'), trigger: "blur" }
],
invokeTarget: [
{ required: true, message: "调用目标字符串不能为空", trigger: "blur" }
// 调用目标字符串不能为空
{ required: true, message: this.$t('Monitor_ScheduledTask.checkInvokeTargetIsNull'), trigger: "blur" }
],
cronExpression: [
{ required: true, message: "cron执行表达式不能为空", trigger: "blur" }
// cron执行表达式不能为空
{ required: true, message: this.$t('Monitor_ScheduledTask.checkCronExpressionIsNull'), trigger: "blur" }
]
}
}
@@ -418,21 +483,26 @@ export default {
},
// 任务状态修改
handleStatusChange(row) {
let text = row.status === "0" ? "启用" : "停用"
this.$modal.confirm('确认要"' + text + '""' + row.jobName + '"任务吗？').then(function() {
// 启用/停用
let text = row.status === "0" ? this.$t('Monitor_ScheduledTask.textEnable') : this.$t('Monitor_ScheduledTask.textDisable')
// 提示信息：确认要"启用/停用" + "任务名称" + 任务吗？
this.$modal.confirm(this.$t('Monitor_ScheduledTask.textChangeConfirm1') + text + '""' + row.jobName + this.$t('Monitor_ScheduledTask.textChangeConfirm2')).then(function() {
return changeJobStatus(row.jobId, row.status)
}).then(() => {
this.$modal.msgSuccess(text + "成功")
// 提示信息："启用/停用" + 成功
this.$modal.msgSuccess(text + this.$t('Monitor_ScheduledTask.textSuccess'))
}).catch(function() {
row.status = row.status === "0" ? "1" : "0"
})
},
/* 立即执行一次 */
handleRun(row) {
this.$modal.confirm('确认要立即执行一次"' + row.jobName + '"任务吗？').then(function() {
// 提示信息：确认要立即执行一次"{jobName}"任务吗？
this.$modal.confirm(this.$t('Monitor_ScheduledTask.textExecConfirm1') + row.jobName + this.$t('Monitor_ScheduledTask.textExecConfirm2')).then(function() {
return runJob(row.jobId, row.jobGroup)
}).then(() => {
this.$modal.msgSuccess("执行成功")
// 提示信息：执行成功
this.$modal.msgSuccess(this.$t('Monitor_ScheduledTask.execSuccessInfo'))
}).catch(() => {})
},
/** 任务详细信息 */
@@ -460,7 +530,8 @@ export default {
handleAdd() {
this.reset()
this.open = true
this.title = "添加任务"
// 标题：添加任务
this.title = this.$t('Monitor_ScheduledTask.btnAddTitle')
},
/** 修改按钮操作 */
handleUpdate(row) {
@@ -469,7 +540,8 @@ export default {
getJob(jobId).then(response => {
this.form = response.data
this.open = true
this.title = "修改任务"
// 标题：修改任务
this.title = this.$t('Monitor_ScheduledTask.btnEditTitle')
})
},
/** 提交按钮 */
@@ -478,13 +550,15 @@ export default {
if (valid) {
if (this.form.jobId != undefined) {
updateJob(this.form).then(response => {
this.$modal.msgSuccess("修改成功")
// 提示信息：修改成功
this.$modal.msgSuccess(this.$t('Monitor_ScheduledTask.editSuccessInfo'))
this.open = false
this.getList()
})
} else {
addJob(this.form).then(response => {
this.$modal.msgSuccess("新增成功")
// 提示信息：新增成功
this.$modal.msgSuccess(this.$t('Monitor_ScheduledTask.addSuccessInfo'))
this.open = false
this.getList()
})
@@ -495,11 +569,13 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const jobIds = row.jobId || this.ids
this.$modal.confirm('是否确认删除定时任务编号为"' + jobIds + '"的数据项？').then(function() {
// 提示信息：是否确认删除入库作业流水编号为"' + jobIds + '"的数据项？
this.$modal.confirm(this.$t('Monitor_ScheduledTask.textDeleteConfirm1') + jobIds + this.$t('Monitor_ScheduledTask.textDeleteConfirm1')).then(function() {
return delJob(jobIds)
}).then(() => {
this.getList()
this.$modal.msgSuccess("删除成功")
// 提示信息：删除成功
this.$modal.msgSuccess(this.$t('Monitor_ScheduledTask.deleteSuccessInfo'))
}).catch(() => {})
},
/** 导出按钮操作 */

93
ruoyi-ui/src/views/monitor/logininfor/index.vue
View File

@@ -1,28 +1,31 @@
<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="ipaddr">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" :label-width="$t('systemManagement_LogManagement_Login.other_labelWidthSearch')">
<!-- 登陆地址 -->
<el-form-item :label="$t('systemManagement_LogManagement_Login.ipAddress')" prop="ipaddr">
<el-input
v-model="queryParams.ipaddr"
placeholder="请输入登录地址"
:placeholder="$t('systemManagement_LogManagement_Login.placeholderIpAddress')"
clearable
style="width: 240px;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="用户名称" prop="userName">
<!-- 用户名称 -->
<el-form-item :label="$t('systemManagement_LogManagement_Login.userName')" prop="userName">
<el-input
v-model="queryParams.userName"
placeholder="请输入用户名称"
:placeholder="$t('systemManagement_LogManagement_Login.placeholderUserName')"
clearable
style="width: 240px;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="状态" prop="status">
<!-- 状态 -->
<el-form-item :label="$t('systemManagement_LogManagement_Login.status')" prop="status">
<el-select
v-model="queryParams.status"
placeholder="登录状态"
:placeholder="$t('systemManagement_LogManagement_Login.placeholderStatus')"
clearable
style="width: 240px"
>
@@ -34,26 +37,30 @@
/>
</el-select>
</el-form-item>
<el-form-item label="登录时间">
<!-- 登陆时间 -->
<el-form-item :label="$t('systemManagement_LogManagement_Login.loginTime')">
<el-date-picker
v-model="dateRange"
style="width: 240px"
value-format="yyyy-MM-dd HH:mm:ss"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
:start-placeholder="$t('systemManagement_LogManagement_Login.placeholderDateStart')"
:end-placeholder="$t('systemManagement_LogManagement_Login.placeholderDateEnd')"
:default-time="['00:00:00', '23:59:59']"
></el-date-picker>
</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('systemManagement_LogManagement_Login.btnSearch') }}</el-button>
<!-- 【重置】按钮 -->
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('systemManagement_LogManagement_Login.btnReset') }}</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<!-- 【删除】按钮 -->
<el-button
type="danger"
plain
@@ -62,9 +69,10 @@
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['monitor:logininfor:remove']"
>删除</el-button>
>{{ $t('systemManagement_LogManagement_Login.btnDelete') }}</el-button>
</el-col>
<el-col :span="1.5">
<!-- 【清空】按钮 -->
<el-button
type="danger"
plain
@@ -72,9 +80,10 @@
size="mini"
@click="handleClean"
v-hasPermi="['monitor:logininfor:remove']"
>清空</el-button>
>{{ $t('systemManagement_LogManagement_Login.btnClear') }}</el-button>
</el-col>
<el-col :span="1.5">
<!-- 【解锁】按钮 -->
<el-button
type="primary"
plain
@@ -83,9 +92,10 @@
:disabled="single"
@click="handleUnlock"
v-hasPermi="['monitor:logininfor:unlock']"
>解锁</el-button>
>{{ $t('systemManagement_LogManagement_Login.btnUnlocked') }}</el-button>
</el-col>
<el-col :span="1.5">
<!-- 【导出】按钮 -->
<el-button
type="warning"
plain
@@ -93,26 +103,35 @@
size="mini"
@click="handleExport"
v-hasPermi="['monitor:logininfor:export']"
>导出</el-button>
>{{ $t('systemManagement_LogManagement_Login.btnExport') }}</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="访问编号" align="center" prop="infoId" />
<el-table-column label="用户名称" align="center" prop="userName" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']" />
<el-table-column label="登录地址" align="center" prop="ipaddr" width="130" :show-overflow-tooltip="true" />
<el-table-column label="登录地点" align="center" prop="loginLocation" :show-overflow-tooltip="true" />
<el-table-column label="浏览器" align="center" prop="browser" :show-overflow-tooltip="true" />
<el-table-column label="操作系统" align="center" prop="os" />
<el-table-column label="登录状态" align="center" prop="status">
<!-- 访问编号 -->
<el-table-column :label="$t('systemManagement_LogManagement_Login.infoId')" align="center" prop="infoId" />
<!-- 用户名称 -->
<el-table-column :label="$t('systemManagement_LogManagement_Login.userName')" align="center" prop="userName" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']" />
<!-- 登陆地址 -->
<el-table-column :label="$t('systemManagement_LogManagement_Login.ipAddress')" align="center" prop="ipaddr" width="130" :show-overflow-tooltip="true" />
<!-- 登陆地点 -->
<el-table-column :label="$t('systemManagement_LogManagement_Login.loginLocation')" align="center" prop="loginLocation" :show-overflow-tooltip="true" />
<!-- 浏览器 -->
<el-table-column :label="$t('systemManagement_LogManagement_Login.browser')" align="center" prop="browser" :show-overflow-tooltip="true" />
<!-- 操作系统 -->
<el-table-column :label="$t('systemManagement_LogManagement_Login.os')" align="center" prop="os" />
<!-- 登录状态 -->
<el-table-column :label="$t('systemManagement_LogManagement_Login.status')" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_common_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="操作信息" align="center" prop="msg" :show-overflow-tooltip="true" />
<el-table-column label="登录日期" align="center" prop="loginTime" sortable="custom" :sort-orders="['descending', 'ascending']" width="180">
<!-- 操作信息 -->
<el-table-column :label="$t('systemManagement_LogManagement_Login.message')" align="center" prop="msg" :show-overflow-tooltip="true" />
<!-- 登录时间 -->
<el-table-column :label="$t('systemManagement_LogManagement_Login.loginTime')" align="center" prop="loginTime" sortable="custom" :sort-orders="['descending', 'ascending']" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.loginTime) }}</span>
</template>
@@ -196,9 +215,9 @@ export default {
/** 多选框选中数据 */
handleSelectionChange(selection) {
this.ids = selection.map(item => item.infoId)
this.single = selection.length!=1
this.single = selection.length !== 1
this.multiple = !selection.length
this.selectName = selection.map(item => item.userName)
this.selectName = selection.map(item => item.userName).join(',') // 多个用户逗号拼接
},
/** 排序触发事件 */
handleSortChange(column, prop, order) {
@@ -209,29 +228,37 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const infoIds = row.infoId || this.ids
this.$modal.confirm('是否确认删除访问编号为"' + infoIds + '"的数据项？').then(function() {
// 提示信息：是否确认删除登录编号为" + infoIds + "的数据项？
const confirmText = this.$t('systemManagement_LogManagement_Login.textDeleteConfirm1') + infoIds + this.$t('systemManagement_LogManagement_Login.confirmdeleteConfirm2')
this.$modal.confirm(confirmText).then(() => {
return delLogininfor(infoIds)
}).then(() => {
this.getList()
this.$modal.msgSuccess("删除成功")
// 提示信息：删除成功
this.$modal.msgSuccess(this.$t('systemManagement_LogManagement_Login.deleteSuccess'))
}).catch(() => {})
},
/** 清空按钮操作 */
handleClean() {
this.$modal.confirm('是否确认清空所有登录日志数据项？').then(function() {
// 提示信息：确认清空所有登录日志数据项吗？
this.$modal.confirm(this.$t('systemManagement_LogManagement_Login.textCleanConfirm')).then(() => {
return cleanLogininfor()
}).then(() => {
this.getList()
this.$modal.msgSuccess("清空成功")
// 提示信息：清空成功
this.$modal.msgSuccess(this.$t('systemManagement_LogManagement_Login.clearSuccess'))
}).catch(() => {})
},
/** 解锁按钮操作 */
handleUnlock() {
const username = this.selectName
this.$modal.confirm('是否确认解锁用户"' + username + '"数据项?').then(function() {
// 提示信息：是否确认解锁用户" + username + "的数据项？
const confirmText = (this.$t('systemManagement_LogManagement_Login.textUnlockConfirm1') + username + this.$t('systemManagement_LogManagement_Login.textUnlockConfirm1')).replace('{username}', username)
this.$modal.confirm(confirmText).then(() => {
return unlockLogininfor(username)
}).then(() => {
this.$modal.msgSuccess("用户" + username + "解锁成功")
// 提示：解锁成功
this.$modal.msgSuccess(this.$t('systemManagement_LogManagement_Login.unlockSuccessInfo').replace('{username}', username))
}).catch(() => {})
},
/** 导出按钮操作 */

67
ruoyi-ui/src/views/monitor/online/index.vue
View File

@@ -1,63 +1,82 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="登录地址" prop="ipaddr">
<!-- 查询表单 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="$t('monitor_Online.lblWidthSearch')">
<!-- 登陆地址 -->
<el-form-item :label="$t('monitor_Online.ipAddress')" prop="ipaddr">
<el-input
v-model="queryParams.ipaddr"
placeholder="请输入登录地址"
:placeholder="$t('monitor_Online.placeholderIpAddress')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="用户名称" prop="userName">
<!-- 用户名称 -->
<el-form-item :label="$t('monitor_Online.userName')" prop="userName">
<el-input
v-model="queryParams.userName"
placeholder="请输入用户名称"
:placeholder="$t('monitor_Online.placeholderUserName')"
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('monitor_Online.btnSearch') }}</el-button>
<!-- 【重置】按钮 -->
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('monitor_Online.btnReset') }}</el-button>
</el-form-item>
</el-form>
<!-- 数据表格 -->
<el-table
v-loading="loading"
:data="list.slice((pageNum-1)*pageSize,pageNum*pageSize)"
:data="list.slice((pageNum-1)*pageSize, pageNum*pageSize)"
style="width: 100%;"
>
<el-table-column label="序号" type="index" align="center">
<!-- 序号 -->
<el-table-column :label="$t('monitor_Online.num')" type="index" align="center">
<template slot-scope="scope">
<span>{{(pageNum - 1) * pageSize + scope.$index + 1}}</span>
</template>
</el-table-column>
<el-table-column label="会话编号" align="center" prop="tokenId" :show-overflow-tooltip="true" />
<el-table-column label="登录名称" align="center" prop="userName" :show-overflow-tooltip="true" />
<el-table-column label="部门名称" align="center" prop="deptName" />
<el-table-column label="主机" align="center" prop="ipaddr" :show-overflow-tooltip="true" />
<el-table-column label="登录地点" align="center" prop="loginLocation" :show-overflow-tooltip="true" />
<el-table-column label="浏览器" align="center" prop="browser" />
<el-table-column label="操作系统" align="center" prop="os" />
<el-table-column label="登录时间" align="center" prop="loginTime" width="180">
<!-- 会话编号 -->
<el-table-column :label="$t('monitor_Online.tokenId')" align="center" prop="tokenId" :show-overflow-tooltip="true" />
<!-- 登录名称 -->
<el-table-column :label="$t('monitor_Online.userName')" align="center" prop="userName" :show-overflow-tooltip="true" />
<!-- 部门名称 -->
<el-table-column :label="$t('monitor_Online.deptName')" align="center" prop="deptName" />
<!-- 主机地址 -->
<el-table-column :label="$t('monitor_Online.ipAddress')" align="center" prop="ipaddr" :show-overflow-tooltip="true" />
<!-- 登录地点 -->
<el-table-column :label="$t('monitor_Online.loginLocation')" align="center" prop="loginLocation" :show-overflow-tooltip="true" />
<!-- 浏览器 -->
<el-table-column :label="$t('monitor_Online.browser')" align="center" prop="browser" />
<!-- 操作系统 -->
<el-table-column :label="$t('monitor_Online.os')" align="center" prop="os" />
<!-- 登录时间 -->
<el-table-column :label="$t('monitor_Online.loginTime')" align="center" prop="loginTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.loginTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<!-- 操作 -->
<el-table-column :label="$t('monitor_Online.btnForceLogout')" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<!-- 【强制退出】按钮 -->
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleForceLogout(scope.row)"
v-hasPermi="['monitor:online:forceLogout']"
>强退</el-button>
>{{ $t('monitor_Online.btnForceLogout') }}</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页组件 -->
<pagination v-show="total>0" :total="total" :page.sync="pageNum" :limit.sync="pageSize" />
</div>
</template>
@@ -88,7 +107,7 @@ export default {
this.getList()
},
methods: {
/** 查询登录日志列表 */
/** 查询在线用户列表 */
getList() {
this.loading = true
list(this.queryParams).then(response => {
@@ -109,14 +128,14 @@ export default {
},
/** 强退按钮操作 */
handleForceLogout(row) {
this.$modal.confirm('是否确认强退名称为"' + row.userName + '"的用户？').then(function() {
const confirmText = this.$t('monitor_Online.textForceLogoutConfirm1') + row.userName + this.$t('monitor_Online.textForceLogoutConfirm2')
this.$modal.confirm(confirmText).then(() => {
return forceLogout(row.tokenId)
}).then(() => {
this.getList()
this.$modal.msgSuccess("强退成功")
this.$modal.msgSuccess(this.$t('monitor_Online.btnForceLogout'))
}).catch(() => {})
}
}
}
</script>
</script>

142
ruoyi-ui/src/views/monitor/operlog/index.vue
View File

@@ -1,37 +1,41 @@
<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="operIp">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" :label-width="lblWidthSearch">
<!-- 操作地址 -->
<el-form-item :label="$t('systemManagement_LogManagement_Operation.operIp')" prop="operIp">
<el-input
v-model="queryParams.operIp"
placeholder="请输入操作地址"
:placeholder="$t('systemManagement_LogManagement_Operation.placeholderOpenIp')"
clearable
style="width: 240px;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="系统模块" prop="title">
<!-- 系统模块 -->
<el-form-item :label="$t('systemManagement_LogManagement_Operation.title')" prop="title">
<el-input
v-model="queryParams.title"
placeholder="请输入系统模块"
:placeholder="$t('systemManagement_LogManagement_Operation.placeholderTitle')"
clearable
style="width: 240px;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="操作人员" prop="operName">
<!-- 操作人员 -->
<el-form-item :label="$t('systemManagement_LogManagement_Operation.operName')" prop="operName" >
<el-input
v-model="queryParams.operName"
placeholder="请输入操作人员"
:placeholder="$t('systemManagement_LogManagement_Operation.placeholderOperName')"
clearable
style="width: 240px;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="类型" prop="businessType">
<!-- 操作类型 -->
<el-form-item :label="$t('systemManagement_LogManagement_Operation.businessType')" prop="businessType" >
<el-select
v-model="queryParams.businessType"
placeholder="操作类型"
:placeholder="$t('systemManagement_LogManagement_Operation.placeholderBusinessType')"
clearable
style="width: 240px"
>
@@ -43,10 +47,11 @@
/>
</el-select>
</el-form-item>
<el-form-item label="状态" prop="status">
<!-- 状态 -->
<el-form-item :label="$t('systemManagement_LogManagement_Operation.status')" prop="status">
<el-select
v-model="queryParams.status"
placeholder="操作状态"
:placeholder="$t('systemManagement_LogManagement_Operation.placeholderStatus')"
clearable
style="width: 240px"
>
@@ -58,26 +63,30 @@
/>
</el-select>
</el-form-item>
<el-form-item label="操作时间">
<!-- 操作时间 -->
<el-form-item :label="$t('systemManagement_LogManagement_Operation.operTime')">
<el-date-picker
v-model="dateRange"
style="width: 240px"
value-format="yyyy-MM-dd HH:mm:ss"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
:start-placeholder="$t('systemManagement_LogManagement_Operation.placeholderDateStart')"
:end-placeholder="$t('systemManagement_LogManagement_Operation.placeholderDateEnd')"
:default-time="['00:00:00', '23:59:59']"
></el-date-picker>
</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('systemManagement_LogManagement_Operation.btnSearch')}}</el-button>
<!-- 【重置】按钮 -->
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{$t('systemManagement_LogManagement_Operation.btnReset')}}</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<!-- 【删除】按钮 -->
<el-button
type="danger"
plain
@@ -86,9 +95,10 @@
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['monitor:operlog:remove']"
>删除</el-button>
>{{$t('systemManagement_LogManagement_Operation.btnDelete')}}</el-button>
</el-col>
<el-col :span="1.5">
<!-- 【清空】按钮 -->
<el-button
type="danger"
plain
@@ -96,9 +106,10 @@
size="mini"
@click="handleClean"
v-hasPermi="['monitor:operlog:remove']"
>清空</el-button>
>{{$t('systemManagement_LogManagement_Operation.btnClear')}}</el-button>
</el-col>
<el-col :span="1.5">
<!-- 【导出】按钮 -->
<el-button
type="warning"
plain
@@ -106,47 +117,58 @@
size="mini"
@click="handleExport"
v-hasPermi="['monitor:operlog:export']"
>导出</el-button>
>{{$t('systemManagement_LogManagement_Operation.btnExport')}}</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
<el-table-column type="selection" width="50" align="center" />
<el-table-column label="日志编号" align="center" prop="operId" />
<el-table-column label="系统模块" align="center" prop="title" :show-overflow-tooltip="true" />
<el-table-column label="操作类型" align="center" prop="businessType">
<!-- 日志编号 -->
<el-table-column :label="$t('systemManagement_LogManagement_Operation.operId')" align="center" prop="operId" />
<!-- 操作模块 -->
<el-table-column :label="$t('systemManagement_LogManagement_Operation.title')" align="center" prop="title" :show-overflow-tooltip="true" />
<!-- 操作类型 -->
<el-table-column :label="$t('systemManagement_LogManagement_Operation.businessType')" align="center" prop="businessType">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_oper_type" :value="scope.row.businessType"/>
</template>
</el-table-column>
<el-table-column label="操作人员" align="center" prop="operName" width="110" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']" />
<el-table-column label="操作地址" align="center" prop="operIp" width="130" :show-overflow-tooltip="true" />
<el-table-column label="操作地点" align="center" prop="operLocation" :show-overflow-tooltip="true" />
<el-table-column label="操作状态" align="center" prop="status">
<!-- 操作人员 -->
<el-table-column :label="$t('systemManagement_LogManagement_Operation.operName')" align="center" prop="operName" width="110" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']" />
<!-- 操作地址 -->
<el-table-column :label="$t('systemManagement_LogManagement_Operation.operIp')" align="center" prop="operIp" width="130" :show-overflow-tooltip="true" />
<!-- 操作地点 -->
<el-table-column :label="$t('systemManagement_LogManagement_Operation.operLocation')" align="center" prop="operLocation" :show-overflow-tooltip="true" />
<!-- 操作状态 -->
<el-table-column :label="$t('systemManagement_LogManagement_Operation.status')" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_common_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="操作日期" align="center" prop="operTime" width="160" sortable="custom" :sort-orders="['descending', 'ascending']">
<!-- 操作日期 -->
<el-table-column :label="$t('systemManagement_LogManagement_Operation.operTime')" align="center" prop="operTime" width="160" sortable="custom" :sort-orders="['descending', 'ascending']">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.operTime) }}</span>
</template>
</el-table-column>
<el-table-column label="消耗时间" align="center" prop="costTime" width="110" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']">
<!-- 消耗时间 -->
<el-table-column :label="$t('systemManagement_LogManagement_Operation.costTime')" align="center" prop="costTime" width="110" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']">
<template slot-scope="scope">
<span>{{ scope.row.costTime }}毫秒</span>
<span>{{ scope.row.costTime }}{{$t('systemManagement_LogManagement_Operation.unitMillisecond')}}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<!-- 操作 -->
<el-table-column :label="$t('systemManagement_LogManagement_Operation.operation')" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<!-- 【详细】按钮 -->
<el-button
size="mini"
type="text"
icon="el-icon-view"
@click="handleView(scope.row,scope.index)"
v-hasPermi="['monitor:operlog:query']"
>详细</el-button>
>{{$t('systemManagement_LogManagement_Operation.btnDetails')}}</el-button>
</template>
</el-table-column>
</el-table>
@@ -160,47 +182,61 @@
/>
<!-- 操作日志详细 -->
<el-dialog title="操作日志详细" :visible.sync="open" width="800px" append-to-body>
<el-form ref="form" :model="form" label-width="100px" size="mini">
<el-dialog :title="$t('systemManagement_LogManagement_Operation.logDetails')" :visible.sync="open" width="800px" append-to-body>
<el-form ref="form" :model="form" label-width="140px" size="mini">
<el-row>
<el-col :span="12">
<el-form-item label="操作模块：">{{ form.title }} / {{ typeFormat(form) }}</el-form-item>
<!-- 操作模块 -->
<el-form-item :label="$t('systemManagement_LogManagement_Operation.title')+'：'">{{ form.title }} / {{ typeFormat(form) }}</el-form-item>
<!-- 登录信息 -->
<el-form-item
label="登录信息："
:label="$t('systemManagement_LogManagement_Operation.loginInfo')+'：'"
>{{ form.operName }} / {{ form.operIp }} / {{ form.operLocation }}</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="请求地址：">{{ form.operUrl }}</el-form-item>
<el-form-item label="请求方式：">{{ form.requestMethod }}</el-form-item>
<!-- 请求地址 -->
<el-form-item :label="$t('systemManagement_LogManagement_Operation.requestUrl')+'：'">{{ form.operUrl }}</el-form-item>
<!-- 请求方式 -->
<el-form-item :label="$t('systemManagement_LogManagement_Operation.requestMethod')+'：'">{{ form.requestMethod }}</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="操作方法：">{{ form.method }}</el-form-item>
<!-- 操作方法 -->
<el-form-item :label="$t('systemManagement_LogManagement_Operation.method')+'：'">{{ form.method }}</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="请求参数：">{{ form.operParam }}</el-form-item>
<!-- 请求参数 -->
<el-form-item :label="$t('systemManagement_LogManagement_Operation.requestParam')+'：'">{{ form.operParam }}</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="返回参数：">{{ form.jsonResult }}</el-form-item>
<!-- 返回参数 -->
<el-form-item :label="$t('systemManagement_LogManagement_Operation.responseParam')+'：'">{{ form.jsonResult }}</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="操作状态：">
<div v-if="form.status === 0">正常</div>
<div v-else-if="form.status === 1">失败</div>
<!-- 操作状态 -->
<el-form-item :label="$t('systemManagement_LogManagement_Operation.status')+'：'">
<!-- 0=正常 -->
<div v-if="form.status === 0">{{$t('systemManagement_LogManagement_Operation.statusNormal')}}</div>
<!-- 1=失败 -->
<div v-else-if="form.status === 1">{{$t('systemManagement_LogManagement_Operation.statusFail')}}</div>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="消耗时间：">{{ form.costTime }}毫秒</el-form-item>
<!-- 消耗时间 -->
<el-form-item :label="$t('systemManagement_LogManagement_Operation.costTime')+'：'">{{ form.costTime }}{{$t('systemManagement_LogManagement_Operation.unitMillisecond')}}</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="操作时间：">{{ parseTime(form.operTime) }}</el-form-item>
<!-- 操作时间 -->
<el-form-item :label="$t('systemManagement_LogManagement_Operation.operTime')+'：'">{{ parseTime(form.operTime) }}</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="异常信息：" v-if="form.status === 1">{{ form.errorMsg }}</el-form-item>
<!-- 异常信息 -->
<el-form-item :label="$t('systemManagement_LogManagement_Operation.errorMsg')+'：'" v-if="form.status === 1">{{ form.errorMsg }}</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="open = false">关 闭</el-button>
<!-- 【关闭】按钮 -->
<el-button @click="open = false">{{$t('systemManagement_LogManagement_Operation.btnSubmit')}}</el-button>
</div>
</el-dialog>
</div>
@@ -253,7 +289,7 @@ export default {
/** 查询登录日志 */
getList() {
this.loading = true
list(this.addDateRange(this.queryParams, this.dateRange)).then( response => {
list(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
this.list = response.rows
this.total = response.total
this.loading = false
@@ -295,20 +331,22 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const operIds = row.operId || this.ids
this.$modal.confirm('是否确认删除日志编号为"' + operIds + '"的数据项？').then(function() {
this.$modal.confirm(
this.$t('systemManagement_LogManagement_Operation.textDeleteConfirm') + '"' + operIds + '"？'
).then(() => {
return delOperlog(operIds)
}).then(() => {
this.getList()
this.$modal.msgSuccess("删除成功")
this.$modal.msgSuccess(this.$t('systemManagement_LogManagement_Operation.deleteSuccessInfo'))
}).catch(() => {})
},
/** 清空按钮操作 */
handleClean() {
this.$modal.confirm('是否确认清空所有操作日志数据项？').then(function() {
this.$modal.confirm(this.$t('systemManagement_LogManagement_Operation.textCleanConfirm')).then(() => {
return cleanOperlog()
}).then(() => {
this.getList()
this.$modal.msgSuccess("清空成功")
this.$modal.msgSuccess(this.$t('systemManagement_LogManagement_Operation.clearSuccessInfo'))
}).catch(() => {})
},
/** 导出按钮操作 */

4
ruoyi-ui/src/views/out/addOutStockout.vue
View File

@@ -31,12 +31,12 @@
</el-form-item>
<el-form-item>
<el-button type="warning" icon="el-icon-refresh" size="mini" @click="reset">{{$t('addOutStockout.reset')}}<!--重置--></el-button>
<el-button type="success" icon="el-icon-check" size="mini" @click="handleSave">{{$t('addOutStockout.saveDocument')}}<!--保存单据--></el-button>
<el-button type="success" icon="el-icon-check" size="mini" @click="handleSave" v-hasPermi="['out:outStockout:saveBill']">{{$t('addOutStockout.saveDocument')}}<!--保存单据--></el-button>
</el-form-item>
</el-form>
<div class="mb8">
<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleSelectMaterials">{{$t('addOutStockout.selectMaterial')}}<!--选择物资--></el-button>
<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleSelectMaterials" v-hasPermi="['out:productAndStock:list']">{{$t('addOutStockout.selectMaterial')}}<!--选择物资--></el-button>
<el-button type="info" icon="el-icon-refresh-right" size="mini" @click="handleReload">{{$t('addOutStockout.recreateDocument')}}<!--重新建单--></el-button>
</div>

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

@@ -115,6 +115,7 @@
icon="el-icon-s-promotion"
size="mini"
@click="handleAutoAllot"
v-hasPermi="['out:outStockout:autoAllot']"
>{{$t('outStockoutManage.autoAllot')}}</el-button> <!-- 自动分配 -->
</el-col>
<el-col :span="1.5">
@@ -124,6 +125,7 @@
icon="el-icon-s-tools"
size="mini"
@click="handleManualAllot"
v-hasPermi="['out:outStockout:manualAllot']"
>{{$t('outStockoutManage.manualAllot')}}</el-button> <!-- 手动分配 -->
</el-col>
</el-row>

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

@@ -1,14 +1,14 @@
<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="$t('stockFreeze.stockId')" prop="stockId"> <!-- 库存编码 -->
<el-input
v-model="queryParams.stockId"
:placeholder="$t('stockFreeze.inputStockId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item :label="$t('stockFreeze.stockId')" prop="stockId"> &lt;!&ndash; 库存编码 &ndash;&gt;-->
<!-- <el-input-->
<!-- v-model="queryParams.stockId"-->
<!-- :placeholder="$t('stockFreeze.inputStockId')"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item :label="$t('stockFreeze.cargoSpaceId')" prop="cargoSpaceId"> <!-- 货位编码 -->
<el-input
v-model="queryParams.cargoSpaceId"
@@ -25,14 +25,14 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('stockFreeze.productId')" prop="productId"> <!-- 物品编码 -->
<!-- <el-form-item :label="$t('stockFreeze.productId')" prop="productId"> &lt;!&ndash; 物品编码 &ndash;&gt;
<el-input
v-model="queryParams.productId"
:placeholder="$t('stockFreeze.inputProductId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-form-item>-->
<el-form-item :label="$t('stockFreeze.productName')" prop="productName"> <!-- 物品名称 -->
<el-input
v-model="queryParams.productName"
@@ -41,78 +41,80 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('stockFreeze.printDate')" prop="printDate"> <!-- 生产日期 -->
<!-- <el-form-item :label="$t('stockFreeze.printDate')" prop="printDate"> &lt;!&ndash; 生产日期 &ndash;&gt;
<el-input
v-model="queryParams.printDate"
:placeholder="$t('stockFreeze.inputPrintDate')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('stockFreeze.lotNo')" prop="lotNo"> <!-- 批号 -->
<el-input
v-model="queryParams.lotNo"
:placeholder="$t('stockFreeze.inputLotNo')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('stockFreeze.method')" prop="method"> <!-- 操作 -->
<el-input
v-model="queryParams.method"
:placeholder="$t('stockFreeze.inputMethod')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-form-item>-->
<!-- <el-form-item :label="$t('stockFreeze.lotNo')" prop="lotNo"> &lt;!&ndash; 批号 &ndash;&gt;-->
<!-- <el-input-->
<!-- v-model="queryParams.lotNo"-->
<!-- :placeholder="$t('stockFreeze.inputLotNo')"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('stockFreeze.method')" prop="method"> &lt;!&ndash; 操作 &ndash;&gt;-->
<!-- <el-input-->
<!-- v-model="queryParams.method"-->
<!-- :placeholder="$t('stockFreeze.inputMethod')"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item :label="$t('stockFreeze.warehouseId')" prop="warehouseId"> <!-- 仓库 -->
<el-input
v-model="queryParams.warehouseId"
:placeholder="$t('stockFreeze.inputWarehouseId')"
clearable
@keyup.enter.native="handleQuery"
/>
<el-select v-model="queryParams.warehouseId" :placeholder="$t('stockFreeze.warehouseId')">
<el-option
v-for="item in warehouseOptions"
:key="item.warehouseId"
:label="item.warehouseName"
:value="item.warehouseId"
/>
</el-select>
</el-form-item>
<el-form-item :label="$t('stockFreeze.stockDetailId')" prop="stockDetailId"> <!-- 库存字表id -->
<el-input
v-model="queryParams.stockDetailId"
:placeholder="$t('stockFreeze.inputStockDetailId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('stockFreeze.operatingTarget')" prop="operatingTarget"> <!-- 操作目标 -->
<el-input
v-model="queryParams.operatingTarget"
:placeholder="$t('stockFreeze.inputOperatingTarget')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('stockFreeze.barCodeOldQuantity')" prop="barCodeOldQuantity"> <!-- 条码数量 -->
<el-input
v-model="queryParams.barCodeOldQuantity"
:placeholder="$t('stockFreeze.inputBarCodeOldQuantity')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('stockFreeze.barCodeQuantity')" prop="barCodeQuantity"> <!-- 条码数量 -->
<el-input
v-model="queryParams.barCodeQuantity"
:placeholder="$t('stockFreeze.inputBarCodeQuantity')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('stockFreeze.productGuid')" prop="productGuid"> <!-- 物料guid -->
<!-- <el-form-item :label="$t('stockFreeze.stockDetailId')" prop="stockDetailId"> &lt;!&ndash; 库存字表id &ndash;&gt;-->
<!-- <el-input-->
<!-- v-model="queryParams.stockDetailId"-->
<!-- :placeholder="$t('stockFreeze.inputStockDetailId')"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('stockFreeze.operatingTarget')" prop="operatingTarget"> &lt;!&ndash; 操作目标 &ndash;&gt;-->
<!-- <el-input-->
<!-- v-model="queryParams.operatingTarget"-->
<!-- :placeholder="$t('stockFreeze.inputOperatingTarget')"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('stockFreeze.barCodeOldQuantity')" prop="barCodeOldQuantity"> &lt;!&ndash; 条码数量 &ndash;&gt;-->
<!-- <el-input-->
<!-- v-model="queryParams.barCodeOldQuantity"-->
<!-- :placeholder="$t('stockFreeze.inputBarCodeOldQuantity')"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('stockFreeze.barCodeQuantity')" prop="barCodeQuantity"> &lt;!&ndash; 条码数量 &ndash;&gt;-->
<!-- <el-input-->
<!-- v-model="queryParams.barCodeQuantity"-->
<!-- :placeholder="$t('stockFreeze.inputBarCodeQuantity')"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('stockFreeze.productGuid')" prop="productGuid"> &lt;!&ndash; 物料guid &ndash;&gt;
<el-input
v-model="queryParams.productGuid"
:placeholder="$t('stockFreeze.inputProductGuid')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-form-item>-->
<el-form-item>
<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> <!-- 重置 -->
@@ -120,7 +122,7 @@
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button
type="primary"
plain
@@ -128,7 +130,7 @@
size="mini"
@click="handleAdd"
v-hasPermi="['stock:freeze:add']"
>{{$t('stockFreeze.add')}}</el-button> <!-- 新增 -->
>{{$t('stockFreeze.add')}}</el-button> &lt;!&ndash; 新增 &ndash;&gt;
</el-col>
<el-col :span="1.5">
<el-button
@@ -139,7 +141,7 @@
:disabled="single"
@click="handleUpdate"
v-hasPermi="['stock:freeze:edit']"
>{{$t('stockFreeze.edit')}}</el-button> <!-- 修改 -->
>{{$t('stockFreeze.edit')}}</el-button> &lt;!&ndash; 修改 &ndash;&gt;
</el-col>
<el-col :span="1.5">
<el-button
@@ -150,8 +152,8 @@
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['stock:freeze:remove']"
>{{$t('stockFreeze.delete')}}</el-button> <!-- 删除 -->
</el-col>
>{{$t('stockFreeze.delete')}}</el-button> &lt;!&ndash; 删除 &ndash;&gt;
</el-col>-->
<el-col :span="1.5">
<el-button
type="warning"
@@ -167,20 +169,32 @@
<el-table v-loading="loading" :data="freezeList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('stockFreeze.stockId')" align="center" prop="stockId" /> <!-- 库存编码 -->
<!-- <el-table-column :label="$t('stockFreeze.stockId')" align="center" prop="stockId" /> &lt;!&ndash; 库存编码 &ndash;&gt;-->
<el-table-column :label="$t('stockFreeze.cargoSpaceId')" align="center" prop="cargoSpaceId" /> <!-- 货位编码 -->
<el-table-column :label="$t('stockFreeze.cargoSpaceName')" align="center" prop="cargoSpaceName" /> <!-- 货位名称 -->
<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.productId')" align="center" prop="productId" /> &lt;!&ndash; 物品编码 &ndash;&gt;-->
<!-- <el-table-column :label="$t('stockFreeze.productName')" align="center" prop="productName" /> &lt;!&ndash; 物品名称 &ndash;&gt;-->
<!-- <el-table-column :label="$t('stockFreeze.printDate')" align="center" prop="printDate" /> &lt;!&ndash; 生产日期 &ndash;&gt;-->
<!-- <el-table-column :label="$t('stockFreeze.lotNo')" align="center" prop="lotNo" /> &lt;!&ndash; 批号 &ndash;&gt;-->
<el-table-column :label="$t('stockFreeze.oldStatus')" align="center" prop="oldStatus" >
<template slot-scope="scope">
<dict-tag :options="dict.type.cargo_space_status" :value="scope.row.oldStatus"/>
</template>
</el-table-column><!-- 原库位状态 -->
<el-table-column :label="$t('stockFreeze.currStatus')" align="center" prop="currStatus" >
<template slot-scope="scope">
<dict-tag :options="dict.type.cargo_space_status" :value="scope.row.currStatus"/>
</template>
</el-table-column><!-- 现库位状态 -->
<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.warehouseId')" align="center" prop="warehouseName" /> <!-- 仓库 -->
<el-table-column :label="$t('stockFreeze.createTime')" align="center" prop="createTime" /> <!-- 创建时间 -->
<!-- <el-table-column :label="$t('stockFreeze.stockDetailId')" align="center" prop="stockDetailId" /> &lt;!&ndash; 库存字表id &ndash;&gt;-->
<!-- <el-table-column :label="$t('stockFreeze.operatingTarget')" align="center" prop="operatingTarget" /> &lt;!&ndash; 操作目标 &ndash;&gt;-->
<!-- <el-table-column :label="$t('stockFreeze.barCodeOldQuantity')" align="center" prop="barCodeOldQuantity" /> &lt;!&ndash; 条码数量 &ndash;&gt;-->
<!-- <el-table-column :label="$t('stockFreeze.barCodeQuantity')" align="center" prop="barCodeQuantity" /> &lt;!&ndash; 条码数量 &ndash;&gt;-->
<!-- <el-table-column :label="$t('stockFreeze.productGuid')" align="center" prop="productGuid" /> &lt;!&ndash; 物料guid &ndash;&gt;-->
<el-table-column :label="$t('stockFreeze.operation')" align="center" class-name="small-padding fixed-width"> <!-- 操作 -->
<template slot-scope="scope">
<el-button
@@ -265,9 +279,11 @@
<script>
import { listFreeze, getFreeze, delFreeze, addFreeze, updateFreeze } from "@/api/stock/freeze"
import {listWarehouse} from "@/api/bas/warehouse"
export default {
name: "Freeze",
dicts:['cargo_space_status'],
data() {
return {
// 遮罩层
@@ -284,6 +300,7 @@ export default {
total: 0,
// 库存冻结记录表格数据
freezeList: [],
warehouseOptions:[],
// 弹出层标题
title: "",
// 是否显示弹出层
@@ -360,8 +377,15 @@ export default {
},
created() {
this.getList()
this.getWarehouseList();
},
methods: {
/** 获取仓库列表 */
getWarehouseList() {
listWarehouse().then(response => {
this.warehouseOptions = response.rows;
});
},
/** 查询库存冻结记录列表 */
getList() {
this.loading = true

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

@@ -93,6 +93,15 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('stockManagement.materialDesc')" prop="productName"><!-- 物料描述 -->
<el-input
v-model="queryParams.productName"
:placeholder="$t('stockManagement.materialDesc')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="出库数量" prop="outQuantity">
<el-input
v-model="queryParams.outQuantity"
@@ -126,21 +135,16 @@
/>
</el-form-item>-->
<el-form-item :label="$t('stockManagement.warehouseId')" prop="warehouseId"><!-- 仓库id -->
<el-input
v-model="queryParams.warehouseId"
:placeholder="$t('stockManagement.inputWarehouseId')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('stockManagement.stackingId')" prop="stackingId"><!-- 垛型ID -->
<el-input
v-model="queryParams.stackingId"
:placeholder="$t('stockManagement.inputStackingId')"
clearable
@keyup.enter.native="handleQuery"
/>
<el-select v-model="queryParams.warehouseId" :placeholder="$t('stockManagement.warehouseId')">
<el-option
v-for="item in warehouseOptions"
:key="item.warehouseId"
:label="item.warehouseName"
:value="item.warehouseId"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="备用字段1" prop="spare1">
<el-input
v-model="queryParams.spare1"
@@ -196,7 +200,7 @@
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button
type="primary"
plain
@@ -204,8 +208,8 @@
size="mini"
@click="handleAdd"
v-hasPermi="['stock:management:add']"
>{{$t('stockManagement.add')}} <!-- 新增 --></el-button>
</el-col>
>{{$t('stockManagement.add')}} &lt;!&ndash; 新增 &ndash;&gt;</el-button>
</el-col>-->
<el-col :span="1.5">
<el-button
type="success"
@@ -245,30 +249,43 @@
<el-table-column type="selection" width="55" align="center" />
<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.cargoSpaceName')" align="center" prop="cargoSpaceName" /> <!-- 货位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="$t('stockManagement.cargoSpaceStatus')" align="center" prop="cargoSpaceStatus" >
<template slot-scope="scope">
<dict-tag :options="dict.type.cargo_space_status" :value="scope.row.cargoSpaceStatus"/>
</template>
</el-table-column><!-- 货位状态 -->
<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="$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.backDate')" align="center" prop="backDate" /> &lt;!&ndash; 回流时间 &ndash;&gt;-->
<el-table-column :label="$t('stockManagement.productId')" align="center" prop="extraField.productId" /> <!-- 物料Id -->
<el-table-column :label="$t('stockManagement.materialDesc')" align="center" prop="extraField.materialDesc" /> <!-- 物料描述 -->
<el-table-column :label="$t('stockManagement.englishDesc')" align="center" prop="extraField.englishDesc" /> <!-- 物料英文描述 -->
<el-table-column :label="$t('stockManagement.netWeight')" align="center" prop="extraField.netWeight" /> <!-- 净重 -->
<el-table-column :label="$t('stockManagement.length')" align="center" prop="extraField.length" /> <!-- 长 -->
<el-table-column :label="$t('stockManagement.width')" align="center" prop="extraField.width" /> <!-- 宽 -->
<el-table-column :label="$t('stockManagement.height')" align="center" prop="extraField.height" /> <!-- 高 -->
<el-table-column :label="$t('stockManagement.volume')" align="center" prop="extraField.volume" /> <!-- 体积 -->
<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.outQuantity')" align="center" prop="outQuantity" /> &lt;!&ndash; 出库数量 &ndash;&gt;-->
<el-table-column :label="$t('stockManagement.stockinId')" align="center" prop="stockinId" /> <!-- 入库主单 -->
<el-table-column :label="$t('stockManagement.stockinDetailId')" align="center" prop="stockinDetailId" /> <!-- 入库子单id -->
<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.inClassId')" align="center" prop="inClassId" /> &lt;!&ndash; 入库班组ID &ndash;&gt;-->
<el-table-column :label="$t('stockManagement.warehouseId')" align="center" prop="warehouseName" /> <!-- 仓库 -->
<el-table-column :label="$t('stockManagement.inDate')" align="center" prop="inDate" /> <!-- 入库时间 -->
<!-- <el-table-column :label="$t('stockManagement.stackingId')" align="center" prop="stackingId" /> &lt;!&ndash; 垛型ID &ndash;&gt;-->
<el-table-column :label="$t('stockManagement.operation')" align="center" class-name="small-padding fixed-width"> <!-- 操作 -->
<template slot-scope="scope">
<el-button
@@ -316,73 +333,83 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('stockManagement.productStatus')" prop="productStatus"> <!-- 物料状态 -->
<el-select v-model="form.productStatus" :placeholder="$t('stockManagement.selectProductStatus')">
<el-form-item :label="$t('stockManagement.cargoSpaceStatus')" prop="cargoSpaceStatus"> <!-- 货位状态 -->
<el-select v-model="form.cargoSpaceStatus" :placeholder="$t('stockManagement.cargoSpaceStatus')">
<el-option
v-for="dict in dict.type.product_status"
v-for="dict in dict.type.cargo_space_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
<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="$t('stockManagement.inDate')" prop="inDate"> <!-- 入库时间 -->
<el-input v-model="form.inDate" :placeholder="$t('stockManagement.inputInDate')" />
</el-form-item>
<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="$t('stockManagement.productGuid')" prop="productGuid"> <!-- 物料GUID -->
<el-input v-model="form.productGuid" :placeholder="$t('stockManagement.inputProductGuid')" />
</el-form-item>
<!-- <el-form-item :label="$t('stockManagement.productStatus')" prop="productStatus"> &lt;!&ndash; 物料状态 &ndash;&gt;-->
<!-- <el-select v-model="form.productStatus" :placeholder="$t('stockManagement.selectProductStatus')">-->
<!-- <el-option-->
<!-- v-for="dict in dict.type.product_status"-->
<!-- :key="dict.value"-->
<!-- :label="dict.label"-->
<!-- :value="dict.value"-->
<!-- ></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('stockManagement.lotNo')" prop="lotNo"> &lt;!&ndash; 批次号 &ndash;&gt;-->
<!-- <el-input v-model="form.lotNo" :placeholder="$t('stockManagement.inputLotNo')" />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('stockManagement.inDate')" prop="inDate"> &lt;!&ndash; 入库时间 &ndash;&gt;-->
<!-- <el-input v-model="form.inDate" :placeholder="$t('stockManagement.inputInDate')" />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('stockManagement.backDate')" prop="backDate"> &lt;!&ndash; 回流时间 &ndash;&gt;-->
<!-- <el-input v-model="form.backDate" :placeholder="$t('stockManagement.inputBackDate')" />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('stockManagement.productGuid')" prop="productGuid"> &lt;!&ndash; 物料GUID &ndash;&gt;-->
<!-- <el-input v-model="form.productGuid" :placeholder="$t('stockManagement.inputProductGuid')" />-->
<!-- </el-form-item>-->
<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="$t('stockManagement.jobId')" prop="jobId"> <!-- 作业ID -->
<el-input v-model="form.jobId" :placeholder="$t('stockManagement.inputJobId')" />
</el-form-item>
<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="$t('stockManagement.outQuantity')" prop="outQuantity"> <!-- 出库数量 -->
<el-input v-model="form.outQuantity" :placeholder="$t('stockManagement.inputOutQuantity')" />
</el-form-item>
<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="$t('stockManagement.stockinId')" prop="stockinId"> <!-- 入库主单 -->
<el-input v-model="form.stockinId" :placeholder="$t('stockManagement.inputStockinId')" />
</el-form-item>
<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="$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" />
</el-form-item>
<el-form-item label="备用字段1" prop="spare1">
<el-input v-model="form.spare1" placeholder="请输入备用字段1" />
</el-form-item>
<el-form-item label="备用字段2" prop="spare2">
<el-input v-model="form.spare2" placeholder="请输入备用字段2" />
</el-form-item>
<el-form-item label="备用字段3" prop="spare3">
<el-input v-model="form.spare3" placeholder="请输入备用字段3" />
</el-form-item>
<el-form-item label="备用字段4" prop="spare4">
<el-input v-model="form.spare4" placeholder="请输入备用字段4" />
</el-form-item>
<el-form-item label="备用字段5" prop="spare5">
<el-input v-model="form.spare5" placeholder="请输入备用字段5" />
</el-form-item>
<el-form-item label="备用字段6" prop="spare6">
<el-input v-model="form.spare6" placeholder="请输入备用字段6" />
</el-form-item>
<!-- <el-form-item :label="$t('stockManagement.jobId')" prop="jobId"> &lt;!&ndash; 作业ID &ndash;&gt;-->
<!-- <el-input v-model="form.jobId" :placeholder="$t('stockManagement.inputJobId')" />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('stockManagement.trayCode')" prop="trayCode"> &lt;!&ndash; 托盘条码 &ndash;&gt;-->
<!-- <el-input v-model="form.trayCode" :placeholder="$t('stockManagement.inputTrayCode')" />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('stockManagement.outQuantity')" prop="outQuantity"> &lt;!&ndash; 出库数量 &ndash;&gt;-->
<!-- <el-input v-model="form.outQuantity" :placeholder="$t('stockManagement.inputOutQuantity')" />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('stockManagement.stockinDetailId')" prop="stockinDetailId"> &lt;!&ndash; 入库子单id &ndash;&gt;-->
<!-- <el-input v-model="form.stockinDetailId" :placeholder="$t('stockManagement.inputStockinDetailId')" />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('stockManagement.stockinId')" prop="stockinId"> &lt;!&ndash; 入库主单 &ndash;&gt;-->
<!-- <el-input v-model="form.stockinId" :placeholder="$t('stockManagement.inputStockinId')" />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('stockManagement.inClassId')" prop="inClassId"> &lt;!&ndash; 入库班组ID &ndash;&gt;-->
<!-- <el-input v-model="form.inClassId" :placeholder="$t('stockManagement.inputInClassId')" />-->
<!-- </el-form-item>-->
<!-- <el-form-item :label="$t('stockManagement.warehouseId')" prop="warehouseId"> &lt;!&ndash; 仓库 &ndash;&gt;-->
<!-- <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" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="备用字段1" prop="spare1">-->
<!-- <el-input v-model="form.spare1" placeholder="请输入备用字段1" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="备用字段2" prop="spare2">-->
<!-- <el-input v-model="form.spare2" placeholder="请输入备用字段2" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="备用字段3" prop="spare3">-->
<!-- <el-input v-model="form.spare3" placeholder="请输入备用字段3" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="备用字段4" prop="spare4">-->
<!-- <el-input v-model="form.spare4" placeholder="请输入备用字段4" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="备用字段5" prop="spare5">-->
<!-- <el-input v-model="form.spare5" placeholder="请输入备用字段5" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="备用字段6" prop="spare6">-->
<!-- <el-input v-model="form.spare6" placeholder="请输入备用字段6" />-->
<!-- </el-form-item>-->
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">{{$t('stockManagement.confirm')}} <!-- 确定 --></el-button>
@@ -394,10 +421,10 @@
<script>
import { listManagement, getManagement, delManagement, addManagement, updateManagement } from "@/api/stock/management"
import {listWarehouse} from "@/api/bas/warehouse"
export default {
name: "Management",
dicts: ['product_status', 'stock_status'],
dicts: ['product_status', 'stock_status','cargo_space_status'],
data() {
return {
// 遮罩层
@@ -414,6 +441,8 @@ export default {
total: 0,
// 库存信息表格数据
managementList: [],
// 仓库选项
warehouseOptions: [],
// 弹出层标题
title: "",
// 是否显示弹出层
@@ -451,16 +480,23 @@ export default {
form: {},
// 表单校验
rules: {
stockId: [
/*stockId: [
{ required: true, message: this.$t('stockManagement.stockIdRequired'), trigger: "blur" } // 库存id不能为空
],
]*/
}
}
},
created() {
this.getList()
this.getWarehouseList();
},
methods: {
/** 获取仓库列表 */
getWarehouseList() {
listWarehouse().then(response => {
this.warehouseOptions = response.rows;
});
},
/** 查询库存信息列表 */
getList() {
this.loading = true

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

@@ -41,14 +41,14 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="$t('stockRecord.printDate')" prop="printDate"> <!-- 生产日期 -->
<!-- <el-form-item :label="$t('stockRecord.printDate')" prop="printDate"> &lt;!&ndash; 生产日期 &ndash;&gt;
<el-input
v-model="queryParams.printDate"
:placeholder="$t('stockRecord.inputPrintDate')"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-form-item>-->
<el-form-item :label="$t('stockRecord.lotNo')" prop="lotNo"> <!-- 批号 -->
<el-input
v-model="queryParams.lotNo"
@@ -85,12 +85,14 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('stockRecord.warehouseId')" prop="warehouseId"> <!-- 仓库 -->
<el-input
v-model="queryParams.warehouseId"
:placeholder="$t('stockRecord.inputWarehouseId')"
clearable
@keyup.enter.native="handleQuery"
/>
<el-select v-model="queryParams.warehouseId" :placeholder="$t('stockRecord.warehouseId')">
<el-option
v-for="item in warehouseOptions"
:key="item.warehouseId"
:label="item.warehouseName"
:value="item.warehouseId"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="库存字表id" prop="stockDetailId">
<el-input
@@ -188,10 +190,11 @@
<el-table-column type="selection" width="55" align="center" />
<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.cargoSpaceName')" align="center" prop="cargoSpaceName" /> <!-- 货位编码 -->
<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.printDate')" align="center" prop="printDate" /> &lt;!&ndash; 生产日期 &ndash;&gt;-->
<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" /> <!-- 操作后数量 -->
@@ -200,12 +203,13 @@
<dict-tag :options="dict.type.stock_maintain_method" :value="scope.row.method"/>
</template>
</el-table-column>
<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="$t('stockRecord.warehouseId')" align="center" prop="warehouseName" /> <!-- 仓库 -->
<el-table-column :label="$t('stockRecord.createTime')" align="center" prop="createTime" /> <!-- 创建时间 -->
<!-- <el-table-column :label="$t('stockRecord.stockDetailId')" align="center" prop="stockDetailId" /> &lt;!&ndash; 库存字表id &ndash;&gt;-->
<!-- <el-table-column :label="$t('stockRecord.operatingTarget')" align="center" prop="operatingTarget" /> &lt;!&ndash; 操作目标 &ndash;&gt;-->
<!-- <el-table-column :label="$t('stockRecord.barCodeOldQuantity')" align="center" prop="barCodeOldQuantity" /> &lt;!&ndash; 条码数量 &ndash;&gt;-->
<!-- <el-table-column :label="$t('stockRecord.barCodeQuantity')" align="center" prop="barCodeQuantity" /> &lt;!&ndash; 条码数量 &ndash;&gt;-->
<!-- <el-table-column :label="$t('stockRecord.productGuid')" align="center" prop="productGuid" /> &lt;!&ndash; 物料guid &ndash;&gt;-->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@@ -303,6 +307,7 @@
<script>
import { listRecord, getRecord, delRecord, addRecord, updateRecord, exportRecord } from "@/api/stock/record";
import {listWarehouse} from "@/api/bas/warehouse"
export default {
name: "Record",
@@ -323,6 +328,7 @@ export default {
total: 0,
// 库存操作记录表格数据
recordList: [],
warehouseOptions:[],
// 弹出层标题
title: "",
// 是否显示弹出层
@@ -404,9 +410,16 @@ export default {
};
},
created() {
this.getList();
this.getList()
this.getWarehouseList();
},
methods: {
/** 获取仓库列表 */
getWarehouseList() {
listWarehouse().then(response => {
this.warehouseOptions = response.rows;
});
},
/** 查询库存操作记录列表 */
getList() {
this.loading = true;