-
-
+
+
@@ -244,37 +244,37 @@ export default {
value: 1800000
}],
timeZoneOptions: [{
- label: '最近5分钟',
+ label: this.$t('es_log.table.table14'),
value: 300 * 1000
}, {
- label: '最近15分钟',
+ label: this.$t('es_log.table.table15'),
value: 900 * 1000
}, {
- label: '最近30分钟',
+ label: this.$t('es_log.table.table16'),
value: 1800 * 1000
}, {
- label: '最近1小时',
+ label: this.$t('es_log.table.table17'),
value: 3600 * 1000
}, {
- label: '最近3小时',
+ label: this.$t('es_log.table.table18'),
value: 3600 * 1000 * 3
}, {
- label: '最近6小时',
+ label: this.$t('es_log.table.table19'),
value: 3600 * 1000 * 6
}, {
- label: '最近12小时',
+ label: this.$t('es_log.table.table20'),
value: 3600 * 1000 * 12
}, {
- label: '最近24小时',
+ label: this.$t('es_log.table.table21'),
value: 3600 * 1000 * 24
}, {
- label: '最近2天',
+ label: this.$t('es_log.table.table22'),
value: 3600 * 1000 * 24 * 2
}, {
- label: '最近7天',
+ label: this.$t('es_log.table.table23'),
value: 3600 * 1000 * 24 * 7
}, {
- label: '最近15天',
+ label: this.$t('es_log.table.table24'),
value: 3600 * 1000 * 24 * 15
}],
timeZoneValue: '',
diff --git a/wms_pro/qd/src/views/system/dept/index.vue b/wms_pro/qd/src/views/system/dept/index.vue
index 17220f82..4beaf18d 100644
--- a/wms_pro/qd/src/views/system/dept/index.vue
+++ b/wms_pro/qd/src/views/system/dept/index.vue
@@ -8,7 +8,7 @@
v-model="query.name"
clearable
size="mini"
- placeholder="输入部门名称搜索"
+ :placeholder="$t('department.table_title.enter_department_name')"
style="width: 200px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
@@ -17,7 +17,7 @@
v-model="query.is_used"
clearable
size="mini"
- placeholder="状态"
+ :placeholder="$t('department.table_value.State')"
class="filter-item"
style="width: 90px"
@change="crud.toQuery"
@@ -37,13 +37,13 @@
width="500px"
>
-
+
-
+
-
+
-
+
-
+
- 是
- 否
+
+ {{ $t('auto.common.true') }}
+ {{ $t('auto.common.false') }}
+
-
+
-
+
@@ -101,23 +103,23 @@
>
-
-
-
+
+
+
-
+
@@ -143,6 +145,7 @@ import CRUD, { crud, form, header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
+import i18n from '@/i18n'
const defaultForm = {
code: null,
@@ -158,7 +161,7 @@ export default {
name: 'Dept',
components: { Treeselect, crudOperation, rrOperation, udOperation },
cruds() {
- return CRUD({ title: '部门', idField: 'dept_id', url: 'api/dept/vo', crudMethod: { ...crudDept }})
+ return CRUD({ title: i18n.t('department.table_title.Department'), idField: 'dept_id', url: 'api/dept/vo', crudMethod: { ...crudDept }})
},
mixins: [presenter(), header(), form(defaultForm), crud()],
// 设置数据字典
@@ -265,7 +268,7 @@ export default {
},
// 改变状态
changeEnabled(data, val) {
- const satus = this.enabledTypeOptions.find(item => { return item.key == data.is_used })
+ const satus = this.enabledTypeOptions.find(item => { return item.key === data.is_used })
this.$confirm('此操作将 "' + satus.display_name + '" ' + data.name + '部门, 是否继续？', '提示', {
confirmButtonText: '确定',
diff --git a/wms_pro/qd/src/views/system/menu/index.vue b/wms_pro/qd/src/views/system/menu/index.vue
index da7d33af..ba0d1765 100644
--- a/wms_pro/qd/src/views/system/menu/index.vue
+++ b/wms_pro/qd/src/views/system/menu/index.vue
@@ -8,7 +8,7 @@
v-model="query.blurry"
clearable
size="mini"
- placeholder="模糊搜索"
+ :placeholder="$t('menu.placeholder.fuzzy_search')"
style="width: 200px;margin-bottom: 10px"
class="filter-item"
@keyup.enter.native="queryBlurry"
@@ -16,11 +16,12 @@
@@ -39,15 +40,15 @@
width="650px"
>
-
+
- 系统
- 目录
- 菜单
- 按钮
+ {{ $t('menu.dialog.system') }}
+ {{ $t('menu.dialog.catalogue') }}
+ {{ $t('menu.dialog.menu') }}
+ {{ $t('menu.dialog.button') }}
-
+
-
+
-
+
- 是
- 否
+ {{ $t('auto.common.true') }}
+ {{ $t('auto.common.false') }}
-
+
- 是
- 否
+ {{ $t('auto.common.true') }}
+ {{ $t('auto.common.false') }}
-
+
- 是
- 否
+ {{ $t('auto.common.true') }}
+ {{ $t('auto.common.false') }}
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
+
@@ -149,46 +171,46 @@
@selection-change="crud.selectionChangeHandler"
>
-
-
+
+
{{ dict.label.system_type[scope.row.systemType] }} : {{ scope.row.systemType }}
-
+
-
+
{{ scope.row.menu_sort }}
-
-
-
+
+
+
是
否
-
+
- 是
- 否
+ YES
+ NO
-
+
- 否
- 是
+ NO
+ YES
-
+
@@ -216,6 +238,7 @@ import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import Dict from '../../../components/Dict/Dict'
+import i18n from '@/i18n'
// crud交由presenter持有
const defaultForm = {
@@ -240,7 +263,7 @@ export default {
name: 'Menu',
components: { Treeselect, IconSelect, crudOperation, rrOperation, udOperation },
cruds() {
- return CRUD({ title: '菜单', idField: 'menu_id', url: 'api/sysMenu', crudMethod: { ...crudMenu }})
+ return CRUD({ title: i18n.t('menu.title'), idField: 'menu_id', url: 'api/sysMenu', crudMethod: { ...crudMenu }})
},
mixins: [presenter(), header(), form(defaultForm), crud()],
dicts: ['system_type'],
diff --git a/wms_pro/qd/src/views/system/role/index.vue b/wms_pro/qd/src/views/system/role/index.vue
index ec65da1b..5018e350 100644
--- a/wms_pro/qd/src/views/system/role/index.vue
+++ b/wms_pro/qd/src/views/system/role/index.vue
@@ -8,7 +8,7 @@
v-model="query.blurry"
size="mini"
clearable
- placeholder="输入名称"
+ :placeholder="$t('role.table_title.input_name')"
style="width: 200px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
@@ -27,16 +27,16 @@
width="520px"
>
-
+
-
+
@@ -44,7 +44,7 @@
- 角色列表
+ {{ $t('role.table_value.roleList') }}
-
-
-
+
+
+
- {{ parseTime(scope.row.createTime) }}
+ {{ parseTime(scope.row.create_time) }}
- 菜单分配
+ {{ $t('role.other.Menu_assignments') }}
保存
+ >{{ $t('role.other.Save') }}
@@ -130,13 +130,14 @@ import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
+import i18n from '@/i18n'
const defaultForm = { role_id: null, name: null, remark: null }
export default {
name: 'Role',
- components: { pagination, crudOperation, rrOperation, udOperation, crudMenu },
+ components: { pagination, crudOperation, rrOperation, udOperation },
cruds() {
- return CRUD({ idField: 'role_id', title: '角色', url: 'api/sysRole', crudMethod: { ...crudRoles }})
+ return CRUD({ idField: 'role_id', title: i18n.t('role.table_value.Role'), url: 'api/sysRole', crudMethod: { ...crudRoles }})
},
mixins: [presenter(), header(), form(defaultForm), crud()],
data() {
diff --git a/wms_pro/qd/src/views/system/user/index.vue b/wms_pro/qd/src/views/system/user/index.vue
index 8c957945..8991def1 100644
--- a/wms_pro/qd/src/views/system/user/index.vue
+++ b/wms_pro/qd/src/views/system/user/index.vue
@@ -8,7 +8,7 @@
v-model="deptName"
clearable
size="mini"
- placeholder="请输入部门名称"
+ :placeholder="$t('user.table_title.enter_department_name')"
prefix-icon="el-icon-search"
class="filter-item"
@input="getDeptDatas"
@@ -30,7 +30,7 @@
v-model="query.blurry"
clearable
size="mini"
- placeholder="输入账号或者名称"
+ :placeholder="$t('user.table_title.Enter_Account_Number (Name)')"
style="width: 200px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
@@ -39,7 +39,7 @@
v-model="query.is_used"
clearable
size="mini"
- placeholder="状态"
+ :placeholder="$t('user.table_title.State')"
class="filter-item"
style="width: 90px"
@change="crud.toQuery"
@@ -65,42 +65,42 @@
width="700px"
>
-
+
-
+
-
+
-
+
-
+
-
+
-
-
- 男
- 女
+
+
+ {{ $t('user.table_value.boy') }}
+ {{ $t('user.table_value.girl') }}
-
+
-
+
@@ -130,8 +130,8 @@
@@ -143,48 +143,50 @@
@selection-change="crud.selectionChangeHandler"
>
-
+
-
-
-
-
+
+
+
+
- {{ item.name }}
+
+ {{ item.name }}、
+
- >
-
+
+
{{ enabledTypeOptions.find(item => {return item.key == scope.row.is_used}).display_name }}
-
+
- 修改
- 删除
-
- 更多
+ {{ $t('user.other.Revise') }}
+ {{ $t('user.other.Delete') }}
+
+ {{ $t('user.other.More') }}
- 重置密码
+ {{ $t('user.other.Reset') }}
- 分配部门
+ {{ $t('user.other.Department_permissions') }}
- 数据权限
+ {{ $t('user.other.Data_Permissions') }}
- {{ enabledTypeOptions.find(item => {return item.key !== scope.row.is_used}).display_name }}账号
+ {{ enabledTypeOptions.find(item => {return item.key !== scope.row.is_used}).display_name }}{{ $t('user.other.Lock_account') }}
- 分配角色
+ {{ $t('user.other.Assign_roles') }}
@@ -323,13 +325,13 @@ import { getAll, getLevel } from '@/views/system/role/role'
import CRUD, { crud, form, header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
-import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
import { mapGetters } from 'vuex'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import RelevanceUserDialog from '@/views/system/user/dialog/relevanceUserDialog'
import RelevanceDeptDialog from '@/views/system/user/dialog/relevanceDeptDialog'
+import i18n from '@/i18n'
let userRoles = []
const defaultForm = {
@@ -346,9 +348,9 @@ const defaultForm = {
}
export default {
name: 'User',
- components: { RelevanceDeptDialog, RelevanceUserDialog, Treeselect, crudOperation, rrOperation, udOperation, pagination },
+ components: { RelevanceDeptDialog, RelevanceUserDialog, Treeselect, crudOperation, rrOperation, pagination },
cruds() {
- return CRUD({ title: '用户', idField: 'user_id', url: 'api/users', crudMethod: { ...crudUser }})
+ return CRUD({ title: i18n.t('user.table_value.User'), idField: 'user_id', url: 'api/users', crudMethod: { ...crudUser }})
},
mixins: [presenter(), header(), form(defaultForm), crud()],
// 数据字典
@@ -366,8 +368,8 @@ export default {
del: ['admin', 'user:del']
},
enabledTypeOptions: [
- { key: true, display_name: '激活' },
- { key: false, display_name: '锁定' }
+ { key: true, display_name: i18n.t('user.table_value.activation') },
+ { key: false, display_name: i18n.t('user.table_value.lock') }
],
rules: {
username: [
@@ -445,7 +447,6 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
-
this.crud.delAllLoading = true
this.crud.doDelete(datas)
}).catch(() => {
@@ -583,7 +584,6 @@ export default {
},
// 切换部门
handleNodeClick(data) {
-
this.query.dept_id = data.dept_id
this.query.needAll = true
this.crud.toQuery()
@@ -696,7 +696,7 @@ export default {
this.$nextTick(function() {
for (var index = 0; index < res.length; index++) {
for (var i = 0; i < this.dataDialog.dataScopeType.length; i++) {
- if (this.dataDialog.dataScopeType[i].value == res[index].permissionScopeType) {
+ if (this.dataDialog.dataScopeType[i].value === res[index].permissionScopeType) {
this.dataDialog.dataScopeType[i].permissionId = res[index].permissionId
if (res[index].users) this.dataDialog.dataScopeType[i].users = res[index].users
if (res[index].depts) this.dataDialog.dataScopeType[i].depts = res[index].depts
@@ -716,7 +716,7 @@ export default {
},
openRelevance(row, index) {
for (var i = 0; i < this.permissions.length; i++) {
- if (this.permissions[i].permissionId != undefined && this.permissions[i].permissionId && this.permissions[i].permissionId != row.permissionId) {
+ if (this.permissions[i].permissionId !== undefined && this.permissions[i].permissionId && this.permissions[i].permissionId !== row.permissionId) {
this.$delete(this.dataDialog.dataScopeType[index], this.permissions[i].permissionId.toString())
}
}
@@ -725,15 +725,15 @@ export default {
this.deptIds = []
this.userIds = []
console.log(row)
- if (row.permissionId == '1605129738328870912') { // 选择用户
+ if (row.permissionId === '1605129738328870912') { // 选择用户
this.userIds = this.dataDialog.dataScopeType[index].users
this.rowData = row
this.relevanceUser = true
- } else if (row.permissionId == '1605129882164137984') { // 选择部门
+ } else if (row.permissionId === '1605129882164137984') { // 选择部门
this.deptIds = this.dataDialog.dataScopeType[index].depts
this.rowData = row
this.relevanceDept = true
- } else if (row.permissionId == '1605128919449735168') { // 自身
+ } else if (row.permissionId === '1605128919449735168') { // 自身
const param = {
user_id: this.dataDialog.user_id
}
@@ -746,8 +746,8 @@ export default {
},
selectUsers(row) { // row对话框传来的数据
for (var i = 0; i < this.dataDialog.dataScopeType.length; i++) {
- if (this.dataDialog.dataScopeType[i].dictId == this.rowData.dictId) {
- if (this.dataDialog.dataScopeType[i].depts != undefined && this.dataDialog.dataScopeType[i].depts.length > 0) this.dataDialog.dataScopeType[i].depts = []
+ if (this.dataDialog.dataScopeType[i].dictId === this.rowData.dictId) {
+ if (this.dataDialog.dataScopeType[i].depts !== undefined && this.dataDialog.dataScopeType[i].depts.length > 0) this.dataDialog.dataScopeType[i].depts = []
this.dataDialog.dataScopeType[i].users = row
break
}
@@ -756,8 +756,8 @@ export default {
},
selectDepts(row) {
for (var i = 0; i < this.dataDialog.dataScopeType.length; i++) {
- if (this.dataDialog.dataScopeType[i].dictId == this.rowData.dictId) {
- if (this.dataDialog.dataScopeType[i].users != undefined && this.dataDialog.dataScopeType[i].users.length > 0) this.dataDialog.dataScopeType[i].users = []
+ if (this.dataDialog.dataScopeType[i].dictId === this.rowData.dictId) {
+ if (this.dataDialog.dataScopeType[i].users !== undefined && this.dataDialog.dataScopeType[i].users.length > 0) this.dataDialog.dataScopeType[i].users = []
this.dataDialog.dataScopeType[i].depts = row
break
}
@@ -855,7 +855,7 @@ export default {
checkNode.parent.indeterminate = false
}
// 如果取消所有第二节点的勾选状态，则第一层父节点也取消勾选
- if (checkNode.level == 2 && checkNode.parent.childNodes.every(ele => !ele.checked)) {
+ if (checkNode.level === 2 && checkNode.parent.childNodes.every(ele => !ele.checked)) {
checkNode.parent.checked = false
checkNode.parent.indeterminate = false
}
@@ -880,4 +880,13 @@ export default {
height: 30px;
line-height: 30px;
}
+.el-form-item__label {
+ white-space: nowrap;
+}
+
+.no-wrap {
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}