Merge remote-tracking branch 'origin/master'
# Conflicts: # ruoyi-ui/src/lang/zh.js
This commit is contained in:
lsymicc
@@ -626,6 +626,23 @@ export default {
|
||||
|
||||
},
|
||||
|
||||
viewsMain: {
|
||||
title: 'homePage',
|
||||
unfinishedInboundTask: 'Unfinished Inbound Task Overview',
|
||||
taskKey: 'Task Key',
|
||||
unfinishedInboundTaskName: 'Unfinished Inbound Task',
|
||||
totalUnfinishedCount: 'Total Unfinished Count',
|
||||
todayUnfinishedCount: 'Today Unfinished Count',
|
||||
finishedInboundTask: 'Finished Inbound Task Overview',
|
||||
finishedInboundTaskName: 'Finished Inbound Task',
|
||||
totalFinishedCount: 'Total Finished Count',
|
||||
todayFinishedCount: 'Today Finished Count',
|
||||
unfinishedOutboundTask: 'Unfinished Outbound Task Overview',
|
||||
unfinishedOutboundTaskName: 'Unfinished Outbound Task',
|
||||
finishedOutboundTask: 'Finished Outbound Task Overview',
|
||||
finishedOutboundTaskName: 'Finished Outbound Task'
|
||||
},
|
||||
|
||||
searchViewStockSecure: {
|
||||
stockId: 'Stock ID',
|
||||
cargoSpaceId: 'Cargo Space ID',
|
||||
|
||||
2806
ruoyi-ui/src/lang/hu.js
Normal file
2806
ruoyi-ui/src/lang/hu.js
Normal file
File diff suppressed because it is too large
Load Diff
@@ -3,8 +3,10 @@ import VueI18n from 'vue-i18n'
|
||||
import Cookies from 'js-cookie'
|
||||
import elementEnLocale from 'element-ui/lib/locale/lang/en' // element-ui lang
|
||||
import elementZhLocale from 'element-ui/lib/locale/lang/zh-CN'// element-ui lang
|
||||
import elementHuLocale from 'element-ui/lib/locale/lang/hu'// element-ui lang
|
||||
import enLocale from './en'
|
||||
import zhLocale from './zh'
|
||||
import huLocale from './hu'
|
||||
|
||||
Vue.use(VueI18n)
|
||||
|
||||
@@ -16,12 +18,16 @@ const messages = {
|
||||
zh_CN: {
|
||||
...zhLocale,
|
||||
...elementZhLocale
|
||||
},
|
||||
hu:{
|
||||
...huLocale,
|
||||
...elementHuLocale
|
||||
}
|
||||
}
|
||||
|
||||
const i18n = new VueI18n({
|
||||
// 设置语言 选项 en | zh
|
||||
locale: Cookies.get('language') || 'zh_CN',
|
||||
locale: Cookies.get('language') || 'zh_CN'|| 'hu' ,
|
||||
// 设置文本内容
|
||||
messages
|
||||
})
|
||||
|
||||
@@ -632,6 +632,218 @@ export default {
|
||||
|
||||
|
||||
},
|
||||
|
||||
searchViewStockSecure: {
|
||||
stockId: '库存ID',
|
||||
cargoSpaceId: '货位ID',
|
||||
stockStatus: '库存状态',
|
||||
productStatus: '物料状态',
|
||||
lotNo: '批次号',
|
||||
inDate: '入库时间',
|
||||
backDate: '回流时间',
|
||||
productGuid: '物料GUID',
|
||||
quantity: '库存数量',
|
||||
jobId: '作业ID',
|
||||
trayCode: '托盘条码',
|
||||
outQuantity: '出库数量',
|
||||
stockinDetailId: '入库子单ID',
|
||||
stockinId: '入库主单',
|
||||
inType: '入库类型',
|
||||
inputStockId: '请输入库存ID',
|
||||
inputCargoSpaceId: '请输入货位ID',
|
||||
selectStockStatus: '请选择库存状态',
|
||||
selectProductStatus: '请选择物料状态',
|
||||
inputLotNo: '请输入批次号',
|
||||
inputInDate: '请输入入库时间',
|
||||
inputBackDate: '请输入回流时间',
|
||||
inputProductGuid: '请输入物料GUID',
|
||||
inputContent: '请输入内容',
|
||||
inputJobId: '请输入作业ID',
|
||||
inputTrayCode: '请输入托盘条码',
|
||||
inputStockinDetailId: '请输入入库子单ID',
|
||||
inputStockinId: '请输入入库主单',
|
||||
selectInType: '请选择入库类型',
|
||||
confirm: '确定',
|
||||
cancel: '取消',
|
||||
stockIdRequired: '库存ID不能为空',
|
||||
addTitle: '添加安全库存查询',
|
||||
editTitle: '修改安全库存查询',
|
||||
addSuccess: '新增成功',
|
||||
editSuccess: '修改成功',
|
||||
deleteSuccess: '删除成功',
|
||||
deleteConfirm: '是否确认删除安全库存查询编号为"{stockIds}"的数据项？'
|
||||
},
|
||||
// *************供应商管理***************
|
||||
BasSupplier: {
|
||||
// 字段
|
||||
supplierNo: '供应商编号',
|
||||
supplierGroupNo: '供应商组编号',
|
||||
supplierName: '供应商名称',
|
||||
simpleName: '简称',
|
||||
useable: '是否可用',
|
||||
remark: '备注',
|
||||
supplierArae: '地区分类',
|
||||
taxpayerRegistrationNumber: '纳税人登记号',
|
||||
country: '国家',
|
||||
timeZone: '时区',
|
||||
dataFormat: '数据格式',
|
||||
receivingCountry: '收货国家',
|
||||
taxCategory: '税类',
|
||||
legalPerson: '法人',
|
||||
registeredCapital: '注册资金',
|
||||
address: '企业地址',
|
||||
contactName: '联系人姓名',
|
||||
contactNumber: '联系电话',
|
||||
operation: '操作',
|
||||
|
||||
// 输入框提示
|
||||
inputSupplierNo: '请输入供应商编号',
|
||||
inputSupplierGroupNo: '请输入供应商组编号',
|
||||
inputSupplierName: '请输入供应商名称',
|
||||
inputSimpleName: '请输入简称',
|
||||
inputUseable: '请输入是否可用',
|
||||
inputRemark: '请输入备注',
|
||||
inputSupplierArae: '请输入地区分类',
|
||||
inputTaxpayerRegistrationNumber: '请输入纳税人登记号',
|
||||
inputCountry: '请输入国家',
|
||||
inputTimeZone: '请输入时区',
|
||||
inputDataFormat: '请输入数据格式',
|
||||
inputReceivingCountry: '请输入收货国家',
|
||||
inputTaxCategory: '请输入税类',
|
||||
inputLegalPerson: '请输入法人',
|
||||
inputRegisteredCapital: '请输入注册资金',
|
||||
inputAddress: '请输入企业地址',
|
||||
inputContactName: '请输入联系人姓名',
|
||||
inputContactNumber: '请输入联系电话',
|
||||
|
||||
// 按钮文本
|
||||
search: '搜索',
|
||||
reset: '重置',
|
||||
add: '新增',
|
||||
edit: '修改',
|
||||
delete: '删除',
|
||||
export: '导出',
|
||||
confirm: '确定',
|
||||
cancel: '取消',
|
||||
|
||||
// 对话框标题
|
||||
addTitle: '添加供应商管理',
|
||||
editTitle: '修改供应商管理',
|
||||
|
||||
// 成功提示
|
||||
addSuccess: '新增成功',
|
||||
editSuccess: '修改成功',
|
||||
deleteSuccess: '删除成功',
|
||||
|
||||
// 删除确认提示
|
||||
deleteConfirm: '是否确认删除供应商管理编号为{ids}的数据项？',
|
||||
|
||||
// 表单校验提示
|
||||
fidRequired: 'fid不能为空',
|
||||
useableRequired: '是否可用不能为空'
|
||||
},
|
||||
|
||||
// *************物料管理***************
|
||||
BasProduct: {
|
||||
productId: '物料编码',
|
||||
inputProductId: '请输入物料编码',
|
||||
productName: '物料名称',
|
||||
inputProductName: '请输入物料名称',
|
||||
spare1: '英文描述',
|
||||
inputSpare1: '请输入英文描述',
|
||||
unit: '单位',
|
||||
inputUnit: '请输入单位',
|
||||
spare2: '单件净重KG',
|
||||
inputSpare2: '请输入单件净重',
|
||||
spare3: '箱号',
|
||||
inputSpare3: '请输入箱号',
|
||||
spare4: '包装方式',
|
||||
inputSpare4: '请输入包装方式',
|
||||
spare5: '长MM',
|
||||
inputSpare5: '请输入长度',
|
||||
spare6: '宽MM',
|
||||
inputSpare6: '请输入宽度',
|
||||
spare7: '高MM',
|
||||
inputSpare7: '请输入高度',
|
||||
spare8: '体积m³',
|
||||
inputSpare8: '请输入体积m³',
|
||||
price: '价格',
|
||||
inputPrice: '请输入价格',
|
||||
remark: '描述',
|
||||
inputRemark: '请输入描述',
|
||||
search: '搜索',
|
||||
reset: '重置',
|
||||
add: '新增',
|
||||
edit: '修改',
|
||||
delete: '删除',
|
||||
export: '导出',
|
||||
confirm: '确定',
|
||||
cancel: '取消',
|
||||
operation: '操作',
|
||||
addTitle: '添加物料管理',
|
||||
editTitle: '修改物料管理',
|
||||
deleteConfirm: '是否确认删除物料管理编号为"{productGuids}"的数据项？',
|
||||
addSuccess: '新增成功',
|
||||
editSuccess: '修改成功',
|
||||
deleteSuccess: '删除成功',
|
||||
productIdRequired: '物料编码不能为空',
|
||||
productNameRequired: '物料名称不能为空',
|
||||
unitRequired: '单位不能为空',
|
||||
priceRequired: '价格不能为空'
|
||||
},
|
||||
|
||||
// *************供应商管理***************
|
||||
BasPort: {
|
||||
portName: '点位名称',
|
||||
inputPortName: '请输入点位名称',
|
||||
portType: '点位分类',
|
||||
inputPortType: '请输入点位分类',
|
||||
portDesc: '点位描述',
|
||||
inputPortDesc: '请输入点位描述',
|
||||
search: '搜索',
|
||||
reset: '重置',
|
||||
add: '新增',
|
||||
edit: '修改',
|
||||
delete: '删除',
|
||||
export: '导出',
|
||||
id: 'ID',
|
||||
createMan: '创建人',
|
||||
createTime: '创建时间',
|
||||
operation: '操作',
|
||||
confirm: '确定',
|
||||
cancel: '取消',
|
||||
addTitle: '添加基础点位',
|
||||
editTitle: '修改基础点位',
|
||||
addSuccess: '新增成功',
|
||||
editSuccess: '修改成功',
|
||||
deleteSuccess: '删除成功',
|
||||
deleteConfirm: '是否确认删除基础点位编号为"{ids}"的数据项？',
|
||||
productCode: '物料编码',
|
||||
inputProductCode: '请输入物料编码',
|
||||
productName: '物料名称',
|
||||
inputProductName: '请输入物料名称',
|
||||
bindStatus: '是否绑定',
|
||||
selectBindStatus: '请选择状态',
|
||||
batchBind: '批量绑定',
|
||||
batchUnbind: '批量解绑',
|
||||
productEnDesc: '英文描述',
|
||||
unit: '单位',
|
||||
netWeight: '单件净重KG',
|
||||
boxNo: '箱号',
|
||||
packWay: '包装方式',
|
||||
length: '长MM',
|
||||
width: '宽MM',
|
||||
height: '高MM',
|
||||
volume: '体积m³',
|
||||
price: '价格',
|
||||
description: '描述',
|
||||
bindProduct: '绑定物料',
|
||||
unbindProduct: '删除物料',
|
||||
bindSuccess: '绑定成功',
|
||||
unbindSuccess: '解绑成功',
|
||||
selectProduct: '选择物料'
|
||||
},
|
||||
|
||||
// *************库存操作记录***************
|
||||
stockRecord: {
|
||||
stockId: '库存编码',
|
||||
@@ -1132,7 +1344,7 @@ export default {
|
||||
//基本资料---用户信息
|
||||
male:'男',
|
||||
female:'女',
|
||||
|
||||
|
||||
//基本资料---修改密码
|
||||
oldPassword:'旧密码',
|
||||
newPassword:'新密码',
|
||||
|
||||
Reference in New Issue
Block a user