diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/difference/controller/CheckDifferenceRecordController.java b/ruoyi-admin/src/main/java/com/ruoyi/check/difference/controller/CheckDifferenceRecordController.java index 375f0bf..4eb6484 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/check/difference/controller/CheckDifferenceRecordController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/difference/controller/CheckDifferenceRecordController.java @@ -176,6 +176,8 @@ public class CheckDifferenceRecordController extends BaseController { newStock.setProductGuid(record.getProductGuid()); newStock.setProductId(record.getProductId()); newStock.setStockStatus("1"); // 设置库存状态为正常 + newStock.setWarehouseId(record.getWarehouseId()); + newStock.setInType(""); // 初始化extraField对象 ExtraField extraField = new ExtraField(); extraField.setProductId(record.getProductId()); diff --git a/ruoyi-admin/src/main/resources/mapper/check/CheckStockinFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/check/CheckStockinFinishMapper.xml index 734d948..b48a9fc 100644 --- a/ruoyi-admin/src/main/resources/mapper/check/CheckStockinFinishMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/check/CheckStockinFinishMapper.xml @@ -105,6 +105,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and spare3 = #{spare3} and spare4 = #{spare4} and spare5 = #{spare5} + + ${params.warehouseDataScope} + diff --git a/ruoyi-admin/src/main/resources/mapper/check/CheckStockinMapper.xml b/ruoyi-admin/src/main/resources/mapper/check/CheckStockinMapper.xml index bfb1218..1ed29cc 100644 --- a/ruoyi-admin/src/main/resources/mapper/check/CheckStockinMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/check/CheckStockinMapper.xml @@ -76,6 +76,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and cs.spare3 = #{spare3} and cs.spare4 = #{spare4} and cs.spare5 = #{spare5} + + ${params.warehouseDataScope} + diff --git a/ruoyi-ui/src/lang/en.js b/ruoyi-ui/src/lang/en.js index a7db06f..8dfb8b8 100644 --- a/ruoyi-ui/src/lang/en.js +++ b/ruoyi-ui/src/lang/en.js @@ -26,12 +26,12 @@ export default { reviewing: 'Reviewing', executing: 'Executing', - emptyLocation:"emptyLocation", - fullLocation:"fullLocation", - inboundAllocated:"inboundAllocated", - outboundAllocated:"outboundAllocated", - inboundNeedCheck:"inboundNeedCheck", - outboundNeedCheck:"outboundNeedCheck", + emptyLocation: "emptyLocation", + fullLocation: "fullLocation", + inboundAllocated: "inboundAllocated", + outboundAllocated: "outboundAllocated", + inboundNeedCheck: "inboundNeedCheck", + outboundNeedCheck: "outboundNeedCheck", }, @@ -42,7 +42,7 @@ export default { password: 'Password', code: 'Code', rememberMe: 'Remember Me', - bottom:'Copyright © 2025 ForTucky All Rights Reserved.400-1882-319', + bottom: 'Copyright © 2025 ForTucky All Rights Reserved.400-1882-319', accountLogin: 'Account Login' }, tagsView: { @@ -114,7 +114,7 @@ export default { spare8: 'Volume (m³)', netWeight: 'Net Weight (KG)', grossWeight: 'Gross Weight (KG)', - addProductError:'product exist,please update product num' + addProductError: 'product exist,please update product num' }, // ***************收货单据管理************* inReceiveStockin: { @@ -129,8 +129,8 @@ export default { status: 'Document Status', selectStatus: 'Please select document status', search: 'Search', - inputMaterialDesc:'inputMaterialDesc', - inputLotNo:'inputLotNo', + inputMaterialDesc: 'inputMaterialDesc', + inputLotNo: 'inputLotNo', reset: 'Reset', generateStockin: 'Generate Stockin Document', delet: 'Delete', @@ -226,7 +226,7 @@ export default { englishDesc: '英文描述', cartonNo: '箱号', packingMethod: '包装方式', - createTime:"创建时间" + createTime: "创建时间" }, // ***************出库单据管理************** outStockoutManage: { @@ -235,13 +235,13 @@ export default { status: 'Document Status', customerNo: 'Customer Code', customerName: 'Customer Name', - productName:'Product Name', + productName: 'Product Name', createManId: 'Creator', createDate: 'Create Time', startDate: 'Start Time', finishDate: 'Confirm Time', warehouseId: 'Warehouse ID', - warehouseName:'Warehouse　Name', + warehouseName: 'Warehouse　Name', stockoutDetailId: 'Outbound Detail ID', productId: 'Material Code', lotNo: 'Batch No.', @@ -265,15 +265,15 @@ export default { selectOutType: 'Please select outbound type', selectStatus: 'Please select document status', inputCustomerNo: 'Please input customer code', - inputCustomerName:'Please input customer name', - inputProductName:'Please input product name', + inputCustomerName: 'Please input customer name', + inputProductName: 'Please input product name', selectStartDate: 'Please input start date', selectFinishDate: 'Please input finish date', - auditTitle:'auditTitle', - selectExit:'selectExit', - pleaseSelectExit:'pleaseSelectExit', - confirmExit:'confirm', - cancelExit:'cancel', + auditTitle: 'auditTitle', + selectExit: 'selectExit', + pleaseSelectExit: 'pleaseSelectExit', + confirmExit: 'confirm', + cancelExit: 'cancel', }, // ***************新建出库单据************** @@ -342,7 +342,7 @@ export default { selectStartTime: 'Please select start time', finishTime: 'End Time', selectFinishTime: 'Please select end time', - createTime:'Create Time', + createTime: 'Create Time', // Location Information warehouse: 'Warehouse', @@ -401,7 +401,7 @@ export default { materialExistWarning: 'Selected material already exists, please reselect', quantityExceedError: 'Quantity cannot exceed stock quantity', saveSuccess: 'Document {msg} saved successfully', - lotNo:'lotNo', + lotNo: 'lotNo', cargoSpaceName: 'cargoSpaceName', }, //***************盘点单据管理*************** @@ -449,10 +449,13 @@ export default { onlyUnreviewedCanReview: 'Only unreviewed documents can be reviewed', confirmSuccess: 'Confirm successful', onlyReviewedCanConfirm: 'Only reviewed documents can be confirmed', - autoAllocation:'autoAllocation', - autoAllocationSuccess:"autoAllocationSuccess", - checkPort:'checkPort', + autoAllocation: 'autoAllocation', + autoAllocationSuccess: "autoAllocationSuccess", + checkPort: 'checkPort', departmentName: 'departmentName', + auditTitle: 'auditTitle', + selectExit: 'selectExit', + pleaseSelectExit: 'pleaseSelectExit', }, // ***************盘点入库作业************* checkJobIn: { @@ -517,14 +520,14 @@ export default { statusRequired: 'Task Status cannot be empty', taskNoRequired: 'Task No. cannot be empty', selectData: 'Please select data to operate', - materialDesc:"materialDesc", - englishDesc:"englishDesc", - cartonNo:"cartonNo", - packingMethod:"packingMethod", - netWeight:"netWeight", - totalNetWeight:"totalNetWeight", - grossWeight:"grossWeight", - onlyOneCanAutoAllocation:"onlyOneCanAutoAllocation" + materialDesc: "materialDesc", + englishDesc: "englishDesc", + cartonNo: "cartonNo", + packingMethod: "packingMethod", + netWeight: "netWeight", + totalNetWeight: "totalNetWeight", + grossWeight: "grossWeight", + onlyOneCanAutoAllocation: "onlyOneCanAutoAllocation" }, // **************盘点出库作业**************** checkJobOut: { @@ -584,14 +587,14 @@ export default { finishSuccess: 'Manual finish successful', confirmInvalid: 'Are you sure to manually invalid the data with ID "{jobIds}"?', invalidSuccess: 'Manual invalid successful', - materialDesc:"materialDesc", - englishDesc:"englishDesc", - cartonNo:"cartonNo", - packingMethod:"packingMethod", - netWeight:"netWeight", - totalNetWeight:"totalNetWeight", - grossWeight:"grossWeight", - onlyOneCanAutoAllocation:"onlyOneCanAutoAllocation", + materialDesc: "materialDesc", + englishDesc: "englishDesc", + cartonNo: "cartonNo", + packingMethod: "packingMethod", + netWeight: "netWeight", + totalNetWeight: "totalNetWeight", + grossWeight: "grossWeight", + onlyOneCanAutoAllocation: "onlyOneCanAutoAllocation", outQuantity: 'outQuantity', pickQuantity: 'pickQuantity', department: 'department', @@ -600,12 +603,12 @@ export default { }, // ****************盘点差异管理***************** checkDifference: { - unaudited:'unaudited', - warehouseId:'warehouse', - audited:'audited', - inputStatus:'Please Select Status', - status:'status', - audit:'audit', + unaudited: 'unaudited', + warehouseId: 'warehouse', + audited: 'audited', + inputStatus: 'Please Select Status', + status: 'status', + audit: 'audit', createTime: 'createTime', checkGuid: 'Check ID', checkStockDetailId: 'Check Document ID', @@ -638,7 +641,7 @@ export default { inputOldQuantity: 'Please enter original value', inputNewQuantity: 'Please enter new value', inputProductGuid: 'Please enter product GUID', - inputRecordType:'Please select RecordType' + inputRecordType: 'Please select RecordType' }, // ********************库存信息************* stockManagement: { @@ -694,23 +697,22 @@ export default { editSuccess: 'Modified successfully', deleteSuccess: 'Deleted successfully', confirmDelete: 'Are you sure to delete the stock information with ID "{stockIds}"?', - productId:'productId', - materialDesc:'materialDesc', - englishDesc:'englishDesc', - netWeight:'netWeight', - length:'length', - width:'width', - height:'height', - volume:'volume', + productId: 'productId', + materialDesc: 'materialDesc', + englishDesc: 'englishDesc', + netWeight: 'netWeight', + length: 'length', + width: 'width', + height: 'height', + volume: 'volume', cargoSpaceStatus: 'cargoSpaceStatus', cargoSpaceStockStatus: 'cargoSpaceStockStatus', inputMaterialDesc: 'inputMaterialDesc', - deleteConfirm:"deleteStock" + deleteConfirm: "deleteStock" }, - searchViewStockSecure: { stockId: 'Stock ID', cargoSpaceId: 'Cargo Space ID', @@ -750,12 +752,12 @@ export default { editSuccess: 'Modified successfully', deleteSuccess: 'Deleted successfully', deleteConfirm: 'Are you sure you want to delete the stock secure query with ID "{stockIds}"?', - search:'search', - reset:'reset', - export:'export' + search: 'search', + reset: 'reset', + export: 'export' }, - // *************Supplier Management*************** + // *************Supplier Management*************** BasSupplier: { // Fields supplierNo: 'Supplier No.', @@ -989,7 +991,7 @@ export default { deleteSuccess: 'Deleted successfully', confirmDelete: 'Are you sure to delete the stock operation record with ID {whGuids}?', fileName: 'record_{time}', - createTime: '创建时间', + createTime: '创建时间', }, // **************库存冻结记录************** stockFreeze: { @@ -1050,7 +1052,7 @@ export default { editSuccess: 'Modified successfully', deleteSuccess: 'Deleted successfully', deleteConfirm: 'Are you sure to delete the selected stock freeze records?', - createTime: 'CreateTime', + createTime: 'CreateTime', }, menu: { //收货单据新增 @@ -1079,31 +1081,31 @@ export default { //********************KPI分析******************** KPIAnalysis: 'KPI Analysis', - // 入库分析 - KPIAnalysis_StockIn: 'StockIn Analysis', - // 出库分析 - KPIAnalysis_StockOut: 'StockOut Analysis', - // 巷道分布 - KPIAnalysis_Roadway: 'Roadway Distribution', - // 货位分析 - KPIAnalysis_CargoSpace: 'Cargo Analysis', - // 库存平面图 - KPIAnalysis_CargoPlan: 'Cargo Plan', + // 入库分析 + KPIAnalysis_StockIn: 'StockIn Analysis', + // 出库分析 + KPIAnalysis_StockOut: 'StockOut Analysis', + // 巷道分布 + KPIAnalysis_Roadway: 'Roadway Distribution', + // 货位分析 + KPIAnalysis_CargoSpace: 'Cargo Analysis', + // 库存平面图 + KPIAnalysis_CargoPlan: 'Cargo Plan', //********************系统监控******************** SystemMonitor: 'SystemMonitor', - // 在线用户 - SystemMonitor_Online: 'Online', - // 定时任务 - SystemMonitor_ScheduledTask: 'ScheduledTask', - // 数据监控 - SystemMonitor_DataMonitor: 'DataMonitor', - //服务监控 - SystemMonitor_ServiceMonitor: 'ServiceMonitor', - //缓存监控 - SystemMonitor_CacheMonitor: 'CacheMonitor', - //缓存列表 - SystemMonitor_CacheList: 'CacheList', + // 在线用户 + SystemMonitor_Online: 'Online', + // 定时任务 + SystemMonitor_ScheduledTask: 'ScheduledTask', + // 数据监控 + SystemMonitor_DataMonitor: 'DataMonitor', + //服务监控 + SystemMonitor_ServiceMonitor: 'ServiceMonitor', + //缓存监控 + SystemMonitor_CacheMonitor: 'CacheMonitor', + //缓存列表 + SystemMonitor_CacheList: 'CacheList', //********************系统管理******************** SystemManagement: 'SystemManagement', @@ -1125,11 +1127,10 @@ export default { NoticeManagement: 'NoticeManagement', //日志管理 LogManagement: 'LogManagement', - //操作日志 - LogManagement_OperationLog: 'OperationLog', - //登录日志 - LogManagement_LoginLog: 'LoginLog', - + //操作日志 + LogManagement_OperationLog: 'OperationLog', + //登录日志 + LogManagement_LoginLog: 'LoginLog', // ****************盘点管理****************** @@ -1145,23 +1146,23 @@ export default { stockOperationRecords: 'stockOperationRecords', stockFreezeRecord: 'stockFreezeRecord', // ***************基础信息**************** - basicInformation:'basicInformation', - customerManagement:'customerManagement', - supplierManagement:'supplierManagement', - materialManagement:'materialManagement', - basicPointLocation:'basicPointLocation', + basicInformation: 'basicInformation', + customerManagement: 'customerManagement', + supplierManagement: 'supplierManagement', + materialManagement: 'materialManagement', + basicPointLocation: 'basicPointLocation', //*************** 查询统计************* - queryStatistics:'queryStatistics', - inventoryDetailQuery:'inventoryDetailQuery', - inventorySummaryQuery:'inventorySummaryQuery', - inboundDocumentHistory:'inboundDocumentHistory', - outboundDocumentHistory:'outboundDocumentHistory', - inboundTaskFlow:'inboundTaskFlow', - outboundTaskFlow:'outboundTaskFlow', - flatInventoryFlow:'flatInventoryFlow', - flatOutboundFlow:'flatOutboundFlow', - safetyStockInquiry:'safetyStockInquiry', - warningInventoryInquiry:'warningInventoryInquiry' + queryStatistics: 'queryStatistics', + inventoryDetailQuery: 'inventoryDetailQuery', + inventorySummaryQuery: 'inventorySummaryQuery', + inboundDocumentHistory: 'inboundDocumentHistory', + outboundDocumentHistory: 'outboundDocumentHistory', + inboundTaskFlow: 'inboundTaskFlow', + outboundTaskFlow: 'outboundTaskFlow', + flatInventoryFlow: 'flatInventoryFlow', + flatOutboundFlow: 'flatOutboundFlow', + safetyStockInquiry: 'safetyStockInquiry', + warningInventoryInquiry: 'warningInventoryInquiry' }, //=====================仓库（库区）管理===================== warehouse: { @@ -1308,84 +1309,84 @@ export default { //=====================基础信息:容器管理===================== bas_ContainerManagement: { //--------------标题-------------- - addContainerItem: 'Add Container Item', - editContainerItem: 'Edit Container Item', + addContainerItem: 'Add Container Item', + editContainerItem: 'Edit Container Item', - //--------------子页面标题-------------- - addContainerDetailsItem: 'Add ContainerDetails Item', - editContainerDetailsItem: 'Edit ContainerDetails Item', + //--------------子页面标题-------------- + addContainerDetailsItem: 'Add ContainerDetails Item', + editContainerDetailsItem: 'Edit ContainerDetails Item', //--------------字段名-------------- - containerId: 'ContainerId', - portName: 'PortName', - status: 'Status', - productTypeQuantity: 'TypeQuantity', - capacity: 'Capacity', - createTime: 'CreateTime', - updateTime: 'UpdateTime', - operationMan: 'Operationer', - operation: 'Operation', + containerId: 'ContainerId', + portName: 'PortName', + status: 'Status', + productTypeQuantity: 'TypeQuantity', + capacity: 'Capacity', + createTime: 'CreateTime', + updateTime: 'UpdateTime', + operationMan: 'Operationer', + operation: 'Operation', - //--------------子页面字段-------------- - id: 'Id', - productId: 'ProductId', - productName: 'ProductName', - quantity: 'Quantity', - unit: 'Unit', + //--------------子页面字段-------------- + id: 'Id', + productId: 'ProductId', + productName: 'ProductName', + quantity: 'Quantity', + unit: 'Unit', //--------------文本框输入提示-------------- - placeholderContainerId: 'Enter ContainerId', - placeholderPortName: 'Select PortName', - placeholderStatus: 'Select Status', - placeholderProductTypeQuantity: 'Enter TypeQuantity', - placeholderCapacity: 'Enter Capacity', - placeholderOperationMan: 'Enter Operationer', + placeholderContainerId: 'Enter ContainerId', + placeholderPortName: 'Select PortName', + placeholderStatus: 'Select Status', + placeholderProductTypeQuantity: 'Enter TypeQuantity', + placeholderCapacity: 'Enter Capacity', + placeholderOperationMan: 'Enter Operationer', - //--------------子页面输入提示-------------- - placeholderProductId: 'Enter ProductId', - placeholderProductName: 'Enter ProductName', - placeholderQuantity: 'Enter Quantity', - placeholderUnit: 'Enter Unit', + //--------------子页面输入提示-------------- + placeholderProductId: 'Enter ProductId', + placeholderProductName: 'Enter ProductName', + placeholderQuantity: 'Enter Quantity', + placeholderUnit: 'Enter Unit', //--------------交互按钮-------------- - btnSearch: 'Search', - btnReset: 'Reset', - btnAdd: 'Add', - btnEdit: 'Edit', - btnDelete: 'Delete', - btnSave: 'Save', - btnExport: 'Export', - btnImport: 'Import', - btnSubmit: 'Submit', - btnConfirm: 'Confirm', - btnCancel: 'Cancel', - btnClose: 'Close', - btnRemark: 'Remark', - btnAddOrBinding: 'Add/Binding', - btnDeleteOrUnbinding: 'Delete/Unbinding', - btnDetails:'Details', + btnSearch: 'Search', + btnReset: 'Reset', + btnAdd: 'Add', + btnEdit: 'Edit', + btnDelete: 'Delete', + btnSave: 'Save', + btnExport: 'Export', + btnImport: 'Import', + btnSubmit: 'Submit', + btnConfirm: 'Confirm', + btnCancel: 'Cancel', + btnClose: 'Close', + btnRemark: 'Remark', + btnAddOrBinding: 'Add/Binding', + btnDeleteOrUnbinding: 'Delete/Unbinding', + btnDetails: 'Details', //--------------交互文本-------------- - //--------------提示信息-------------- - addSuccessInfo: 'Add Success', - editSuccessInfo: 'Edit Success', - deleteSuccessInfo: 'Delete Success', + //--------------提示信息-------------- + addSuccessInfo: 'Add Success', + editSuccessInfo: 'Edit Success', + deleteSuccessInfo: 'Delete Success', - //---getList--- - textErrorForGetPortName: 'Failed to get PortName!', - textErrorForRequestException: 'Request exception and check the network', + //---getList--- + textErrorForGetPortName: 'Failed to get PortName!', + textErrorForRequestException: 'Request exception and check the network', - //---handleDelete--- - textDeleteConfirm1: 'Are you sure to delete the data item with ContainerId "', - textDeleteConfirm2: '"?', + //---handleDelete--- + textDeleteConfirm1: 'Are you sure to delete the data item with ContainerId "', + textDeleteConfirm2: '"?', - //---子页面--- - textDeleteDetailsConfirm1: 'Are you sure to delete the data item with Id "', - textDeleteDetailsConfirm2: '"?', + //---子页面--- + textDeleteDetailsConfirm1: 'Are you sure to delete the data item with Id "', + textDeleteDetailsConfirm2: '"?', - //--------------其他-------------- - lblWidthSearch: '100px', - lblWidthDialog: '110px', + //--------------其他-------------- + lblWidthSearch: '100px', + lblWidthDialog: '110px', }, //=====================系统管理：用户管理===================== @@ -1447,37 +1448,37 @@ export default { editUserItem: 'Edit User', //--------------提示文本-------------- - //---布局--- - textDragOrClick1: 'Drag file here, or ', - textDragOrClick2: 'click to upload', - textUpdateExistingData: 'Do you want to update existing user data?', - textUploadTip: 'Only xlsx and xls files are allowed.', - textDownloadTemplate: 'Download Template', + //---布局--- + textDragOrClick1: 'Drag file here, or ', + textDragOrClick2: 'click to upload', + textUpdateExistingData: 'Do you want to update existing user data?', + textUploadTip: 'Only xlsx and xls files are allowed.', + textDownloadTemplate: 'Download Template', - //---函数：handleStatusChange--- - textEnable: 'enable', - textDisable: 'disable', - textUserConfirm1:"Are you sure you want to \"", - textUserConfirm2:"\" user？", - textSuccess: 'success', + //---函数：handleStatusChange--- + textEnable: 'enable', + textDisable: 'disable', + textUserConfirm1: "Are you sure you want to \"", + textUserConfirm2: "\" user？", + textSuccess: 'success', - //---函数：handleResetPwd--- - textInputPassword1: 'Please enter the new password for the \"', - textInputPassword2: '\" user', - textTips: 'Tip', - textConfirm: 'Confirm', - textCancel: 'Cancel', - textResetPassword: 'The change was successful and the new password is:', + //---函数：handleResetPwd--- + textInputPassword1: 'Please enter the new password for the \"', + textInputPassword2: '\" user', + textTips: 'Tip', + textConfirm: 'Confirm', + textCancel: 'Cancel', + textResetPassword: 'The change was successful and the new password is:', - //---函数：handleDelete--- - textDeleteConfirm1: 'Is it confirmed to delete the data item with user number "', - textDeleteConfirm2: '"?', + //---函数：handleDelete--- + textDeleteConfirm1: 'Is it confirmed to delete the data item with user number "', + textDeleteConfirm2: '"?', - //---函数：handleImport--- - textImportTitle: 'Import User Data', + //---函数：handleImport--- + textImportTitle: 'Import User Data', - //---函数：textUploadTitle--- - textImportResult: 'Result', + //---函数：textUploadTitle--- + textImportResult: 'Result', //--------------操作提示-------------- addSuccessInfo: 'Add Success', @@ -1508,41 +1509,41 @@ export default { //------------------------------------------------------------------------ //分配角色 - basInfo:'Basic Infomation', - roleInfo:'Role Info', - roleId:'Role Id', - roleName:'Role Name', - roleKey:'Role Key', + basInfo: 'Basic Infomation', + roleInfo: 'Role Info', + roleId: 'Role Id', + roleName: 'Role Name', + roleKey: 'Role Key', //个人信息 - userInfo:'User Info', - roleGroup:'Role Group', - basDetail:'Basic Detail', - resetPwd:'Reset Password', + userInfo: 'User Info', + roleGroup: 'Role Group', + basDetail: 'Basic Detail', + resetPwd: 'Reset Password', //基本资料---用户信息 - male:'Male', - female:'Female', + male: 'Male', + female: 'Female', //基本资料---修改密码 - oldPassword:'Old Password', - newPassword:'New Password', - confirmPassword:'Confirm Password', - placecholderOldPassword:'Enter Old Password', - placecholderNewPassword:'Enter New Password', - placecholderConfirmPassword:'Confirm Password', + oldPassword: 'Old Password', + newPassword: 'New Password', + confirmPassword: 'Confirm Password', + placecholderOldPassword: 'Enter Old Password', + placecholderNewPassword: 'Enter New Password', + placecholderConfirmPassword: 'Confirm Password', - checkPasswordIsSame:'Fail:Different passwords entered twice', - oldPasswordIsNull:'Old Password cannot be null', - newPasswordIsNull:'New Password cannot be null', - passwordFormat1:"Password must be 6-20 characters long", - passwordFormat2:"Can't contain special characters：< > \" ' \\\ |", - confirmPasswordIsNull:'Confirm Password cannot be null', + checkPasswordIsSame: 'Fail:Different passwords entered twice', + oldPasswordIsNull: 'Old Password cannot be null', + newPasswordIsNull: 'New Password cannot be null', + passwordFormat1: "Password must be 6-20 characters long", + passwordFormat2: "Can't contain special characters：< > \" ' \\\ |", + confirmPasswordIsNull: 'Confirm Password cannot be null', //上传头像 - avatarTitle:'Click to upload', - updateAvatar:'Update Avatar', - errorMessage:'The file format is wrong, please upload the image type, such as: JPG, PNG suffix file.' + avatarTitle: 'Click to upload', + updateAvatar: 'Update Avatar', + errorMessage: 'The file format is wrong, please upload the image type, such as: JPG, PNG suffix file.' }, @@ -1599,35 +1600,35 @@ export default { AssignDataPermission: 'Assign Data Permission', //--------------提示文本-------------- - //---布局--- - //---角色配置对话框--- - roleKeyContent: "Permission characters defined in the controller, e.g. @PreAuthorize(`@ss.hasRole('admin')`)", - //---复选框--- - cbxExpandOrCollapse: 'Expand/Collapse', - cbxAllOrNone: 'All/None', - cbxInherite:'Inherite', - txtLoading: 'Loading...', + //---布局--- + //---角色配置对话框--- + roleKeyContent: "Permission characters defined in the controller, e.g. @PreAuthorize(`@ss.hasRole('admin')`)", + //---复选框--- + cbxExpandOrCollapse: 'Expand/Collapse', + cbxAllOrNone: 'All/None', + cbxInherite: 'Inherite', + txtLoading: 'Loading...', - //输入框 - tbxRemark: 'Please Enter', + //输入框 + tbxRemark: 'Please Enter', - //权限范围选项文本 - lblDataScopeOption1: 'Full Data Permission', - lblDataScopeOption2: 'Custom Data Permission', - lblDataScopeOption3: 'Department Data Permission Only', - lblDataScopeOption4: 'Full Department Data Permission', - lblDataScopeOption5: 'Personal Data Permission', + //权限范围选项文本 + lblDataScopeOption1: 'Full Data Permission', + lblDataScopeOption2: 'Custom Data Permission', + lblDataScopeOption3: 'Department Data Permission Only', + lblDataScopeOption4: 'Full Department Data Permission', + lblDataScopeOption5: 'Personal Data Permission', - //---函数：handleStatusChange--- - textEnable: 'enable', - textDisable: 'disable', - textUserConfirm1:"Are you sure you want to \"", - textUserConfirm2:"\" role？", - textSuccess: 'success', + //---函数：handleStatusChange--- + textEnable: 'enable', + textDisable: 'disable', + textUserConfirm1: "Are you sure you want to \"", + textUserConfirm2: "\" role？", + textSuccess: 'success', - //---函数：handleDelete--- - textDeleteConfirm1: 'Is it confirmed to delete the data item with role number "', - textDeleteConfirm2: '"?', + //---函数：handleDelete--- + textDeleteConfirm1: 'Is it confirmed to delete the data item with role number "', + textDeleteConfirm2: '"?', //--------------操作提示-------------- addSuccessInfo: 'Add Success', @@ -1652,7 +1653,7 @@ export default { nickName: 'NickName', email: 'Email', phoneNumber: 'PhoneNumber', - textSelectRole:'Select Assigned Role', + textSelectRole: 'Select Assigned Role', placeholderUserName: 'Enter UserName', placeholderPhoneNumber: 'Enter PhoneNumber', @@ -1662,13 +1663,13 @@ export default { btnCancelAuthorizations: 'Cancel Authorizations', btnCancelAuthorization: 'Cancel Authorization', - //---cancelAuthUser--- - textConfirmCancelRole1: 'Sure you want to cancel the "', - textConfirmCancelRole2: '" role for this user?', - cancelSuccessInfo: '取消授权成功', + //---cancelAuthUser--- + textConfirmCancelRole1: 'Sure you want to cancel the "', + textConfirmCancelRole2: '" role for this user?', + cancelSuccessInfo: '取消授权成功', - //---cancelAuthUserAll--- - textConfirmCancelSelectedRole: 'Sure you want to uncheck the user authorization data item?', + //---cancelAuthUserAll--- + textConfirmCancelSelectedRole: 'Sure you want to uncheck the user authorization data item?', }, @@ -1698,12 +1699,12 @@ export default { placeholderRole: 'Enter Role', placeholderRemark: 'Enter Remark', - //--------------二级窗口操作提示-------------- - placeholderParentMenu: 'Select Parent Menu', - placeholderMenuIcon: 'Select Menu Icon', - placeholderRouterName: 'Enter Router Name', - placeholderRouterPath: 'Enter Router Path', - placeholderParams: 'Enter Router Params', + //--------------二级窗口操作提示-------------- + placeholderParentMenu: 'Select Parent Menu', + placeholderMenuIcon: 'Select Menu Icon', + placeholderRouterName: 'Enter Router Name', + placeholderRouterPath: 'Enter Router Path', + placeholderParams: 'Enter Router Params', //--------------交互按钮-------------- btnSearch: 'Search', @@ -1729,8 +1730,8 @@ export default { menuIcon: 'Menu Icon', routerName: 'RouterName', isFrame: 'IsFrame', - isFrameOptions1:' Yes', - isFrameOptions2:' No', + isFrameOptions1: ' Yes', + isFrameOptions2: ' No', routerPath: 'RouterPath', routerParams: 'RouterParams', isCache: 'IsCache', @@ -1739,23 +1740,23 @@ export default { isVisible: 'IsVisible', //--------------提示文本-------------- - //---二级窗口提示文本--- - textRouterName: 'The default is the same as the routing address: if the address is: `user`, then the name is `User` (note: to avoid name conflicts, in special cases please customize to ensure uniqueness)', - textIsFrame:"For outbound links, the routing address should start with `http(s)://`.", - textRouterPath: 'The routing address is the path of the menu, such as `user`, `user/add`, etc. (note: to avoid conflicts, please ensure that the routing address is unique)', - textComponentPath: "Path to the accessed component, e.g. `system/user/index`, defaults to the `views` directory.", - textPerms: "Permission characters defined in the controller, e.g. @PreAuthorize(`@ss.hasPermi('system:user:list')`).", - textRouterParams: "Default pass parameters for access routes, e.g. `{“id”: 1, “name”: “ry”}`.", - textIsCache: "Selecting yes will be cached by `keep-alive`, which requires the matching component's `name` and address to be the same", - textIsVisible: "If you choose to hide it, the route will not appear in the sidebar, but it will still be accessible.Whether to display the menu, if not displayed, it will not be displayed in the menu list", - textStatus: "If you choose to deactivate, the route will not appear in the sidebar and cannot be accessed.", + //---二级窗口提示文本--- + textRouterName: 'The default is the same as the routing address: if the address is: `user`, then the name is `User` (note: to avoid name conflicts, in special cases please customize to ensure uniqueness)', + textIsFrame: "For outbound links, the routing address should start with `http(s)://`.", + textRouterPath: 'The routing address is the path of the menu, such as `user`, `user/add`, etc. (note: to avoid conflicts, please ensure that the routing address is unique)', + textComponentPath: "Path to the accessed component, e.g. `system/user/index`, defaults to the `views` directory.", + textPerms: "Permission characters defined in the controller, e.g. @PreAuthorize(`@ss.hasPermi('system:user:list')`).", + textRouterParams: "Default pass parameters for access routes, e.g. `{“id”: 1, “name”: “ry”}`.", + textIsCache: "Selecting yes will be cached by `keep-alive`, which requires the matching component's `name` and address to be the same", + textIsVisible: "If you choose to hide it, the route will not appear in the sidebar, but it will still be accessible.Whether to display the menu, if not displayed, it will not be displayed in the menu list", + textStatus: "If you choose to deactivate, the route will not appear in the sidebar and cannot be accessed.", - //---函数：getTreeselect--- - MainTitle: 'MainTitle', + //---函数：getTreeselect--- + MainTitle: 'MainTitle', - //---函数：handleDelete--- - textDeleteConfirm1: 'Are you sure to delete the data item with MenuName "', - textDeleteConfirm2: '"?', + //---函数：handleDelete--- + textDeleteConfirm1: 'Are you sure to delete the data item with MenuName "', + textDeleteConfirm2: '"?', //--------------操作提示-------------- addSuccessInfo: 'Add Success', @@ -1783,21 +1784,21 @@ export default { placeholderDeptName: 'Enter DeptName', placeholderStatus: 'Select Status', - //--------------二级窗口标题-------------- - addDeptItem: 'Add Department', - editDeptItem: 'Edit Department', + //--------------二级窗口标题-------------- + addDeptItem: 'Add Department', + editDeptItem: 'Edit Department', - parentDept: 'Parent Department', - setOrderNum: 'OrderNumber', - leader : 'Leader', - phoneNumber: 'PhoneNumber', - email: 'Email', + parentDept: 'Parent Department', + setOrderNum: 'OrderNumber', + leader: 'Leader', + phoneNumber: 'PhoneNumber', + email: 'Email', - //--------------二级窗口操作提示-------------- - placeholderParentDept: 'Select Parent Department', - placeholderLeader : 'Enter Leader', - placeholderPhoneNumber: 'Enter PhoneNumber', - placeholderEmail: 'Enter Email', + //--------------二级窗口操作提示-------------- + placeholderParentDept: 'Select Parent Department', + placeholderLeader: 'Enter Leader', + placeholderPhoneNumber: 'Enter PhoneNumber', + placeholderEmail: 'Enter Email', //--------------交互按钮-------------- btnSearch: 'Search', @@ -1816,9 +1817,9 @@ export default { //--------------提示文本-------------- - //---handleDelete--- - textDeleteConfirm1: 'Are you sure to delete the data item with dept name "', - textDeleteConfirm2: '"?', + //---handleDelete--- + textDeleteConfirm1: 'Are you sure to delete the data item with dept name "', + textDeleteConfirm2: '"?', //--------------操作提示-------------- addSuccessInfo: 'Add Success', @@ -1852,13 +1853,13 @@ export default { placeholderPostName: 'Enter PostName', placeholderRemark: 'Enter Remark', - //--------------二级窗口标题-------------- - addPostItem: 'Add Department', - editPostItem: 'Edit Department', + //--------------二级窗口标题-------------- + addPostItem: 'Add Department', + editPostItem: 'Edit Department', - //--------------二级窗口操作提示-------------- - placeholderPostSort: 'Enter PostSort', - placeholderStatus : 'Select Status', + //--------------二级窗口操作提示-------------- + placeholderPostSort: 'Enter PostSort', + placeholderStatus: 'Select Status', //--------------交互按钮-------------- btnSearch: 'Search', @@ -1876,9 +1877,9 @@ export default { //--------------提示文本-------------- - //---handleDelete--- - textDeleteConfirm1: 'Are you sure to delete the data item with post name "', - textDeleteConfirm2: '"?', + //---handleDelete--- + textDeleteConfirm1: 'Are you sure to delete the data item with post name "', + textDeleteConfirm2: '"?', //--------------操作提示-------------- addSuccessInfo: 'Add Success', @@ -1913,11 +1914,11 @@ export default { placeholderDateEnd: 'Date End', //--------------二级窗口标题-------------- - addDictTypeItem: 'Add DictType', - editDictTypeItem: 'Edit DictType', + addDictTypeItem: 'Add DictType', + editDictTypeItem: 'Edit DictType', - //--------------二级窗口操作提示-------------- - placeholderRemark: 'Enter Remark', + //--------------二级窗口操作提示-------------- + placeholderRemark: 'Enter Remark', //--------------交互按钮-------------- btnSearch: 'Search', @@ -1935,9 +1936,9 @@ export default { //--------------提示文本-------------- - //---handleDelete--- - textDeleteConfirm1: 'Are you sure you want to delete the data item with dictType "', - textDeleteConfirm2: '"?', + //---handleDelete--- + textDeleteConfirm1: 'Are you sure you want to delete the data item with dictType "', + textDeleteConfirm2: '"?', //--------------操作提示-------------- addSuccessInfo: 'Add success', @@ -1951,24 +1952,24 @@ export default { //-------------------------------------------------------------- // 子页面data - dictCode:'DictCode', - dictLabel:'DictLabel', - dictValue:'DictValue', - dictSort:'DictSort', + dictCode: 'DictCode', + dictLabel: 'DictLabel', + dictValue: 'DictValue', + dictSort: 'DictSort', - placeholderDictLabel:'Enter DictLabel', - placeholderDictValue:'Enter DictValue', - placeholderCssClass:'Enter Css Class', + placeholderDictLabel: 'Enter DictLabel', + placeholderDictValue: 'Enter DictValue', + placeholderCssClass: 'Enter Css Class', - cssClass:'CssClass', - listClass:'ListClass', + cssClass: 'CssClass', + listClass: 'ListClass', - optionDefault:'Default', - optionPrimary:'Primary', - optionSuccess:'Success', - optionInfo:'Info', - optionWarning:'Warning', - optionDanger:'Danger', + optionDefault: 'Default', + optionPrimary: 'Primary', + optionSuccess: 'Success', + optionInfo: 'Info', + optionWarning: 'Warning', + optionDanger: 'Danger', heckDictLabelIsNull: 'DictLabel cannot be Null', heckDictValueIsNull: 'DictValue cannot be Null', @@ -1978,13 +1979,13 @@ export default { editDictItem: 'Edit Dictionary Data', //---handleDelete--- - textDeleteDictCodeConfirm1: 'Are you sure you want to delete the data item with dictCode "', - textDeleteDictCodeConfirm2: '"?', + textDeleteDictCodeConfirm1: 'Are you sure you want to delete the data item with dictCode "', + textDeleteDictCodeConfirm2: '"?', }, // ***************系统管理：参数设置************* - systemManagement_ConfigManagement:{ + systemManagement_ConfigManagement: { //--------------数据表标题-------------- configId: 'ConfigId', configName: 'ConfigName', @@ -2004,11 +2005,11 @@ export default { placeholderDateEnd: 'DateEnd', //--------------二级窗口标题-------------- - addConfigItem: 'Add Config Item', - editConfigItem: 'Edit Config Item', + addConfigItem: 'Add Config Item', + editConfigItem: 'Edit Config Item', - //--------------二级窗口操作提示-------------- - placeholderRemark: 'Please enter remark', + //--------------二级窗口操作提示-------------- + placeholderRemark: 'Please enter remark', //--------------交互按钮-------------- btnSearch: 'Search', @@ -2026,9 +2027,9 @@ export default { //--------------提示文本-------------- - //---handleDelete--- - textDeleteConfirm1: 'Are you sure you want to delete the data item with the configId of "', - textDeleteConfirm2: '"?', + //---handleDelete--- + textDeleteConfirm1: 'Are you sure you want to delete the data item with the configId of "', + textDeleteConfirm2: '"?', //--------------操作提示-------------- addSuccessInfo: 'Add success', @@ -2049,7 +2050,7 @@ export default { }, // ***************系统管理：通知公告************* - systemManagement_Notice:{ + systemManagement_Notice: { //--------------数据表标题-------------- noticeId: 'NoticeId', noticeType: 'NoticeType', @@ -2060,24 +2061,24 @@ export default { operation: 'Operation', //--------------二级窗口-------------- - //--------------标题-------------- - addNoticeItem: 'Add Notice Item', - editNoticeItem: 'Edit Notice Item', + //--------------标题-------------- + addNoticeItem: 'Add Notice Item', + editNoticeItem: 'Edit Notice Item', - //--------------交互框标签-------------- - noticeContent:"NoteContent", + //--------------交互框标签-------------- + noticeContent: "NoteContent", - //--------------当前页面交互框操作提示-------------- - placeholderNoticeTitle: 'Enter NoteTitle', - placeholderCreateBy: 'Enter CreateBy', - placeholderNoticeType: 'Select NoticeType', - placeholderCreateTime: 'CreateTime', - placeholderDateStart: 'DateStart', - placeholderDateEnd: 'DateEnd', + //--------------当前页面交互框操作提示-------------- + placeholderNoticeTitle: 'Enter NoteTitle', + placeholderCreateBy: 'Enter CreateBy', + placeholderNoticeType: 'Select NoticeType', + placeholderCreateTime: 'CreateTime', + placeholderDateStart: 'DateStart', + placeholderDateEnd: 'DateEnd', - //--------------二级窗口操作提示-------------- - placeholderRemark: 'Please Enter Remark', - placeholderNoticeContent: 'Please Enter NoticeContent', + //--------------二级窗口操作提示-------------- + placeholderRemark: 'Please Enter Remark', + placeholderNoticeContent: 'Please Enter NoticeContent', //--------------交互按钮-------------- btnSearch: 'Search', @@ -2094,9 +2095,9 @@ export default { //--------------提示文本-------------- - //---handleDelete--- - textDeleteConfirm1: 'Are you sure you want to delete the data item with the noticeId of "', - textDeleteConfirm2: '"?', + //---handleDelete--- + textDeleteConfirm1: 'Are you sure you want to delete the data item with the noticeId of "', + textDeleteConfirm2: '"?', //--------------操作提示-------------- addSuccessInfo: 'Add success', @@ -2116,47 +2117,47 @@ export default { // ***************系统管理：日志管理-操作日志************* // ***************views/monitor/operlog************* - systemManagement_LogManagement_Operation:{ + 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', + 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', + //--------------当前页面交互框操作提示-------------- + placeholderOpenIp: 'Enter openId', + placeholderTitle: 'Enter title', + placeholderBusinessType: 'Select businessType', + placeholderOperName: 'Select operName', + placeholderStatus: 'Select status', + placeholderOperTime: 'OperationTime', + placeholderDateStart: 'DateStart', + placeholderDateEnd: 'DateEnd', //--------------二级窗口-------------- - //--------------标题-------------- - logDetails: 'logDetails', + //--------------标题-------------- + 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', + //--------------交互框标签-------------- + 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', @@ -2173,8 +2174,8 @@ export default { //--------------提示文本-------------- - //---handleClean--- - textDeleteConfirm: 'Confirm that all operation log data entries are cleared?"', + //---handleClean--- + textDeleteConfirm: 'Confirm that all operation log data entries are cleared?"', //--------------操作提示-------------- addSuccessInfo: 'Add success', @@ -2190,26 +2191,26 @@ export default { // ***************系统管理：日志管理-登录日志************* // ***************views/monitor/logininfor************* - systemManagement_LogManagement_Login:{ + systemManagement_LogManagement_Login: { //--------------数据表标题-------------- - infoId: 'InfoId', - userName: 'UserName', - ipAddress: 'IPAddress', - loginLocation: 'LoginLocation', - operLocation: 'OperLocation', - browser: 'Browser', - os: 'OperationSystem', - status: 'Status', - loginTime: 'LoginTime', - message: 'Message', + 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', + //--------------当前页面交互框操作提示-------------- + placeholderIpAddress: 'Enter IPAddress', + placeholderUserName: 'Enter UserName', + placeholderStatus: 'Select Status', + placeholderLoginTime: 'LoginTime', + placeholderDateStart: 'DateStart', + placeholderDateEnd: 'DateEnd', //--------------交互按钮-------------- btnSearch: 'Search', @@ -2227,16 +2228,16 @@ export default { //--------------提示文本-------------- - //---函数：handleDelete--- - textDeleteConfirm1: 'Are you sure you want to delete the data item with the infoId of "', - textDeleteConfirm2: '"?', + //---函数：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: '"?', + //---函数：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?', + //---handleClean--- + textCleanConfirm: 'Are you sure to clear all login log data items?', //--------------操作提示-------------- addSuccessInfo: 'Add success', @@ -2252,23 +2253,23 @@ export default { }, // ***************系统监控：在线用户************* - monitor_Online:{ + monitor_Online: { //--------------数据表标题-------------- - num: 'Id', - tokenId: 'TokenId', - userName: 'UserName', - deptName: 'DeptName', - ipAddress: 'Host IP', - loginLocation: 'LoginLocation', - browser: 'Browser', - os: 'Operating System', - loginTime: 'LoginTime', - message: 'Message', - operation: 'Operation', + num: 'Id', + tokenId: 'TokenId', + userName: 'UserName', + deptName: 'DeptName', + ipAddress: 'Host IP', + loginLocation: 'LoginLocation', + browser: 'Browser', + os: 'Operating System', + loginTime: 'LoginTime', + message: 'Message', + operation: 'Operation', - //--------------当前页面交互框操作提示-------------- - placeholderIpAddress: 'Enter Host IP', - placeholderUserName: 'Enter UserName', + //--------------当前页面交互框操作提示-------------- + placeholderIpAddress: 'Enter Host IP', + placeholderUserName: 'Enter UserName', //--------------交互按钮-------------- btnSearch: 'Search', @@ -2276,9 +2277,9 @@ export default { btnForceLogout: 'Force Logout', //--------------提示文本-------------- - //---函数：handleForceLogout--- - textForceLogoutConfirm1: 'Is the user with the username "', - textForceLogoutConfirm2: '"forcefully logged out?', + //---函数：handleForceLogout--- + textForceLogoutConfirm1: 'Is the user with the username "', + textForceLogoutConfirm2: '"forcefully logged out?', //--------------其他-------------- lblWidthSearch: '68px', @@ -2286,88 +2287,88 @@ export default { }, // ***************系统监控：定时任务************* - Monitor_ScheduledTask:{ + Monitor_ScheduledTask: { //--------------数据表标题-------------- - jobId: 'JobId', - jobName: 'JobName', - jobGroup: 'JobGroup', - invokeTarget: 'InvokeTarget', - cronExpression: 'CronExpression', - status: 'Status', - operation: 'Operation', + jobId: 'JobId', + jobName: 'JobName', + jobGroup: 'JobGroup', + invokeTarget: 'InvokeTarget', + cronExpression: 'CronExpression', + status: 'Status', + operation: 'Operation', - //--------------当前页面交互框操作提示-------------- - placeholderJobName: 'Enter JobName', - placeholderJobGroup: 'Select JobGroup', + //--------------当前页面交互框操作提示-------------- + placeholderJobName: 'Enter JobName', + placeholderJobGroup: 'Select JobGroup', - //---------------二级窗口操作提示------------------ - placeholderInvokeTarget: 'Enter InvokeTarget', - placeholderCronExpression: 'Enter CronExpression', + //---------------二级窗口操作提示------------------ + 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', - btnDetails: 'Details', - btnClose: 'Close', - btnClear: 'Clear', - btnGenerateExpression: 'GenerateExpression', + btnSearch: 'Search', + btnReset: 'Reset', + btnAdd: 'Add', + btnEdit: 'Edit', + btnDelete: 'Delete', + btnImport: 'Import', + btnExport: 'Export', + btnSubmit: 'Confirm', + btnCancel: 'Cancel', + btnMore: 'More', + btnLog: 'Log', + btnDetails: 'Details', + btnClose: 'Close', + btnClear: 'Clear', + btnGenerateExpression: 'GenerateExpression', - //---------------更多-------------- - btnExceOnce: 'Execute Once', - btnJobDetails: 'Job Details', - btnJobLog: 'Job Log', + //---------------更多-------------- + btnExceOnce: 'Execute Once', + btnJobDetails: 'Job Details', + btnJobLog: 'Job Log', //--------------提示文本-------------- - //---二级窗口标题--- - titleAddJob: 'Add Job', - titleEditJob: 'Edit Job', + //---二级窗口标题--- + titleAddJob: 'Add Job', + titleEditJob: 'Edit Job', - //---标签--- - nextValidTime:'Next Valid Time', - execStrategy:'Execution Strategy', - allowParallel:'Allow Parallel', - createTime:'CreateTime', + //---标签--- + 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", + //---二级窗口--- + 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', + textJobStatusNormal: 'Normal', + textJobStatusPause: 'Pause', - textDefaultStrategy: 'Default', - textExecStrategyTip1: 'Immediately', - textExecStrategyTip2: 'Once', - textExecStrategyTip3: 'Never', + textDefaultStrategy: 'Default', + textExecStrategyTip1: 'Immediately', + textExecStrategyTip2: 'Once', + textExecStrategyTip3: 'Never', - textIsParallelTip1: 'Enable', - textIsParallelTip2: 'Disable', + textIsParallelTip1: 'Enable', + textIsParallelTip2: 'Disable', - //---函数：handleDelete--- - textEnable: 'Enable', - textDisable: 'Disable', - textChangeConfirm1: 'Are you sure you want to enable "', - textChangeConfirm2: '" job?', - textSuccess: 'Success', + //---函数：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?', + //---函数：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: '"?', + //---函数：handleDelete--- + textDeleteConfirm1: 'Sure you want to delete the data item with timed task number "', + textDeleteConfirm2: '"?', //--------------操作提示-------------- addSuccessInfo: 'Add success', @@ -2403,15 +2404,15 @@ export default { optionFail: 'Fail', //---函数：handleDelete--- - textDeleteJobLogConfirm1: 'Are you sure you want to delete the data item with jobLog number "', - textDeleteJobLogConfirm2: '"?', + textDeleteJobLogConfirm1: 'Are you sure you want to delete the data item with jobLog number "', + textDeleteJobLogConfirm2: '"?', //---函数：handleClean--- - textClearJobLogConfirm: 'Are you sure you want to clear all jobLogs?', + textClearJobLogConfirm: 'Are you sure you want to clear all jobLogs?', }, // ***************系统监控：服务监控*************** - Monitor_Service:{ + Monitor_Service: { property: 'Property', value: 'Value', memory: 'Memory', @@ -2428,13 +2429,13 @@ export default { memory_Free: 'Free Memory', memory_Usage: 'Usage', - server_Information: 'Server Information', + server_Information: 'Server Information', server_Name: "Server Name", server_Ip: "Server IP", server_OS: "System OS", server_OSArch: "System OS Arch", - jvm_Information: 'JVM Information', + jvm_Information: 'JVM Information', jvm_Name: "Java Name", jvm_Version: "Java Version", jvm_StartTime: "StartTime", @@ -2457,7 +2458,7 @@ export default { }, // ***************系统监控：缓存监控*************** - Monitor_Cache:{ + Monitor_Cache: { basInfomation: 'Basic Information', redisVersion: 'Redis Version', redisMode: 'Redis Mode', @@ -2481,15 +2482,15 @@ export default { commandStats: 'Command Stats', memoryUsedInfo: "Memory Infomation", - command: "Command", - peakValue: "Peak Value", + command: "Command", + peakValue: "Peak Value", cacheMemoryUsed: "Cache Memory Used", textLoading: "Loading...", }, // ***************系统监控：缓存列表*************** - Monitor_CacheList:{ + Monitor_CacheList: { cacheList: 'Cache List', Id: 'Id', cacheName: 'Cache Name', @@ -2506,9 +2507,9 @@ export default { refreshKeySuccessInfo: "Refresh Key Success", clearAllCacheSuccessInfo: "Clear All Cache Success", - textSuccess:'] Success', - textClearCacheName:'Clear Cache Name[', - textClearCacheKey:'Clear Cache Key[', + textSuccess: '] Success', + textClearCacheName: 'Clear Cache Name[', + textClearCacheKey: 'Clear Cache Key[', btnRefresh: 'Refresh', btnClearAll: 'Clear', @@ -2516,7 +2517,7 @@ export default { }, // ***************KPI分析：入库分析*************** - KPIAnalysis_StockIn:{ + KPIAnalysis_StockIn: { warehouse: 'Warehouse', yearMonth: 'Year Month', @@ -2529,12 +2530,12 @@ export default { textChartStockIn: 'Stock In Analysis', textYAxisName: 'Value', - lblWidthSearch:'90px' + lblWidthSearch: '90px' }, // ***************KPI分析：出库分析*************** - KPIAnalysis_StockOut:{ + KPIAnalysis_StockOut: { warehouse: 'Warehouse', yearMonth: 'YearMonth', @@ -2547,12 +2548,12 @@ export default { textChartStockOut: 'Stock Out Analysis', textYAxisName: 'Value', - lblWidthSearch:'90px' + lblWidthSearch: '90px' }, // ***************KPI分析：巷道分析*************** - KPIAnalysis_Roadway:{ + KPIAnalysis_Roadway: { warehouse: 'Warehouse', dateStart: 'DateStart', dateEnd: 'DateEnd', @@ -2569,12 +2570,12 @@ export default { quantityOfStockIn: 'Stock In', quantityOfStockOut: 'Stock Out', - lblWidthSearch:'90px' + lblWidthSearch: '90px' }, // ***************KPI分析：货位分析*************** - KPIAnalysis_CargoSpace:{ + KPIAnalysis_CargoSpace: { warehouse: 'Warehouse', placeholderWarehouse: 'Select Warehouse', @@ -2592,17 +2593,17 @@ export default { roadway2: 'Roadway-2', roadway3: 'Roadway-3', roadway4: 'Roadway-4', - config:'Serise Configuration', + config: 'Serise Configuration', textChartCargoSpace: 'CargoSpace Analysis', textValue: 'Value', - lblWidthSearch:'90px' + lblWidthSearch: '90px' }, // ***************KPI分析：库存平面图*************** - KPIAnalysis_CargoPlan:{ + KPIAnalysis_CargoPlan: { warehouse: 'Warehouse', raodway: 'Roadway', row: 'Row', @@ -2617,13 +2618,13 @@ export default { legendOccupied: 'Occupied', legendStockInAssigned: 'Stock In Assigned', legendStockOutAssigned: 'Stock Out Assigned', - legendStockInException:'Stock In Exception', - legendStockOutException:'Stock Out Exception', + legendStockInException: 'Stock In Exception', + legendStockOutException: 'Stock Out Exception', //---formatTooltip--- failGetCargoSpace: 'Fail to get CargoSpace.', - lblWidthSearch:'90px' + lblWidthSearch: '90px' }, @@ -3152,15 +3153,15 @@ export default { cancel: '取 消' }, // ***************Product Basic Fields************** - basproduct1:{ - englishName:"English Name", - netWeightPerUnit:"Net Weight Per Unit", - long:"Length MM", - wide:"Width MM", - tall:"Height MM", - volume:"Volume m³", - price:"Price", - notes:"Description" + basproduct1: { + englishName: "English Name", + netWeightPerUnit: "Net Weight Per Unit", + long: "Length MM", + wide: "Width MM", + tall: "Height MM", + volume: "Volume m³", + price: "Price", + notes: "Description" }, // ***************客户管理************** basCustomer: { diff --git a/ruoyi-ui/src/lang/zh.js b/ruoyi-ui/src/lang/zh.js index 8280913..fdc23b2 100644 --- a/ruoyi-ui/src/lang/zh.js +++ b/ruoyi-ui/src/lang/zh.js @@ -432,6 +432,9 @@ export default { autoAllocationSuccess:"自动分配成功", checkPort:'盘点出口', departmentName: '部门名称', + auditTitle:'审核单据', + selectExit:'选择出口', + pleaseSelectExit:'请选择出口', }, // ***************盘点入库作业************* checkJobIn: { diff --git a/ruoyi-ui/src/views/check/stockCheck/index.vue b/ruoyi-ui/src/views/check/stockCheck/index.vue index a9c50d9..f9f0a64 100644 --- a/ruoyi-ui/src/views/check/stockCheck/index.vue +++ b/ruoyi-ui/src/views/check/stockCheck/index.vue @@ -251,10 +251,10 @@ /> - + - - + +