[update]系统管理-双语处理;角色授权树形结构增加英文字段
This commit is contained in:
@@ -8,7 +8,7 @@
|
||||
switchFullscreen
|
||||
@ok="handleOk"
|
||||
@cancel="handleCancel"
|
||||
cancelText="关闭">
|
||||
:cancelText="$t('close')">
|
||||
|
||||
<!-- 查询区域 -->
|
||||
<div class="table-page-search-wrapper">
|
||||
@@ -16,19 +16,19 @@
|
||||
<a-row :gutter="24">
|
||||
|
||||
<a-col :span="8">
|
||||
<a-form-item label="用户账号">
|
||||
<j-input placeholder="请输入用户账号" v-model="queryParam.username"></j-input>
|
||||
<a-form-item :label="$t('user.userAccount')">
|
||||
<j-input :placeholder="$t('pleaseEnter') + $t('user.userAccount')" v-model="queryParam.username"></j-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="8">
|
||||
<a-form-item label="用户名称">
|
||||
<j-input placeholder="请输入用户名称" v-model="queryParam.realname"></j-input>
|
||||
<a-form-item :label="$t('user.userName')">
|
||||
<j-input :placeholder="$t('pleaseEnter') + $t('user.userName')" v-model="queryParam.realname"></j-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="8">
|
||||
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
|
||||
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
|
||||
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
|
||||
<a-button type="primary" @click="searchQuery" icon="search">{{ $t('query') }}</a-button>
|
||||
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">{{ $t('reset') }}</a-button>
|
||||
</span>
|
||||
</a-col>
|
||||
|
||||
@@ -65,7 +65,7 @@ export default {
|
||||
name: 'SelectUserModal',
|
||||
data () {
|
||||
return {
|
||||
title: '添加已有用户',
|
||||
title: this.$t('roleManage.addUser'),
|
||||
names: [],
|
||||
visible: false,
|
||||
placement: 'right',
|
||||
@@ -75,7 +75,7 @@ export default {
|
||||
// 表头
|
||||
columns1: [
|
||||
{
|
||||
title: '序号',
|
||||
title: this.$t('serialNumber'),
|
||||
dataIndex: '',
|
||||
key: 'rowIndex',
|
||||
width: 50,
|
||||
@@ -85,31 +85,31 @@ export default {
|
||||
}
|
||||
},
|
||||
{
|
||||
title: '用户账号',
|
||||
title: this.$t('user.userAccount'),
|
||||
align: 'center',
|
||||
width: 100,
|
||||
dataIndex: 'username'
|
||||
},
|
||||
{
|
||||
title: '用户名称',
|
||||
title: this.$t('user.userName'),
|
||||
align: 'center',
|
||||
width: 100,
|
||||
dataIndex: 'realname'
|
||||
},
|
||||
{
|
||||
title: '性别',
|
||||
title: this.$t('user.gender'),
|
||||
align: 'center',
|
||||
width: 100,
|
||||
dataIndex: 'sex_dictText'
|
||||
},
|
||||
{
|
||||
title: '电话',
|
||||
title: this.$t('phoneNumber'),
|
||||
align: 'center',
|
||||
width: 100,
|
||||
dataIndex: 'phone'
|
||||
},
|
||||
{
|
||||
title: '部门',
|
||||
title: this.$t('organization'),
|
||||
align: 'center',
|
||||
width: 150,
|
||||
dataIndex: 'orgCodeTxt'
|
||||
|
||||
@@ -118,18 +118,18 @@
|
||||
</a-form-model-item>
|
||||
<!-- update--end--autor:wangshuai-----date:20200108------for:新增身份和负责部门------ -->
|
||||
<!--手写章,用于企标制修订流程最后一个节点在线编辑的手写章信息维护-->
|
||||
<a-form-model-item :label="$t('user.handStamp')" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
||||
<j-image-upload class="avatar-uploader"
|
||||
:text="$t('upload')"
|
||||
v-model="model.avatar"
|
||||
:disabled="disableSubmit"
|
||||
:number=1
|
||||
accept='.png,.PNG,.jpg,.JPG'></j-image-upload>
|
||||
</a-form-model-item>
|
||||
<!--<a-form-model-item :label="$t('user.handStamp')" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
|
||||
<!-- <j-image-upload class="avatar-uploader"-->
|
||||
<!-- :text="$t('upload')"-->
|
||||
<!-- v-model="model.avatar"-->
|
||||
<!-- :disabled="disableSubmit"-->
|
||||
<!-- :number=1-->
|
||||
<!-- accept='.png,.PNG,.jpg,.JPG'></j-image-upload>-->
|
||||
<!--</a-form-model-item>-->
|
||||
|
||||
<a-form-model-item :label="$t('user.gender')" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
||||
<a-select v-model="model.sex"
|
||||
:placeholder="$t('pleaseSelect') + $t('user.gender')"
|
||||
:placeholder="disableSubmit ? '' : $t('pleaseSelect') + $t('user.gender')"
|
||||
:getPopupContainer="(target) => target.parentNode"
|
||||
:disabled="disableSubmit">
|
||||
<a-select-option :value="1">{{ $t('user.male') }}</a-select-option>
|
||||
@@ -138,14 +138,14 @@
|
||||
</a-form-model-item>
|
||||
|
||||
<a-form-model-item :label="$t('user.mailbox')" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="email">
|
||||
<a-input :placeholder="$t('pleaseEnter') + $t('user.mailbox')"
|
||||
<a-input :placeholder="disableSubmit || !!model.id ? '' : $t('pleaseEnter') + $t('user.mailbox')"
|
||||
v-model="model.email"
|
||||
:maxLength="50"
|
||||
:disabled="disableSubmit || !!model.id" />
|
||||
</a-form-model-item>
|
||||
|
||||
<a-form-model-item :label="$t('phoneNumber')" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">
|
||||
<a-input :placeholder="$t('pleaseEnter') + $t('phoneNumber')"
|
||||
<a-input :placeholder="isDisabledAuth('user:form:phone') || disableSubmit || !!model.id ? '' : $t('pleaseEnter') + $t('phoneNumber')"
|
||||
:disabled="isDisabledAuth('user:form:phone') || disableSubmit || !!model.id"
|
||||
v-model="model.phone" />
|
||||
</a-form-model-item>
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
:selectedKeys="selectedKeys"
|
||||
:expandedKeys="expandedKeysss"
|
||||
:checkStrictly="checkStrictly">
|
||||
<span slot="hasDatarule" slot-scope="{slotTitle,ruleFlag}">
|
||||
{{ slotTitle }}<a-icon v-if="ruleFlag" type="align-left" style="margin-left:5px;color: red;"></a-icon>
|
||||
<span slot="hasDatarule" slot-scope="{slotTitle,ruleFlag, dataRef}">
|
||||
{{dataRef[showKey] || slotTitle}}<a-icon v-if="ruleFlag" type="align-left" style="margin-left:5px;color: red;"></a-icon>
|
||||
</span>
|
||||
</a-tree>
|
||||
</a-form-item>
|
||||
@@ -69,7 +69,9 @@ export default {
|
||||
title: this.$t('roleManage.rolePermissionConfig'),
|
||||
visible: false,
|
||||
loading: false,
|
||||
selectedKeys: []
|
||||
selectedKeys: [],
|
||||
// 树形结构显示的信息,处理双语
|
||||
showKey: localStorage.language === 'en-us' ? 'slotTitleEn' : 'slotTitle'
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
|
||||
Reference in New Issue
Block a user