修改用户管理角色管理
This commit is contained in:
@@ -23,30 +23,30 @@
|
||||
<a-input-search @search="onSearch" style="width:100%;margin-top: 6px"
|
||||
:placeholder="$t('enterDepartmentName')"/>
|
||||
<!-- 树-->
|
||||
<template>
|
||||
<!-- <a-dropdown :trigger="[this.dropTrigger]" @visibleChange="dropStatus">-->
|
||||
<!-- checkable-->
|
||||
<a-tree
|
||||
multiple
|
||||
style="height:600px;overflow: auto;width: 100%"
|
||||
@select="onSelect"
|
||||
@check="onCheck"
|
||||
@rightClick="rightHandle"
|
||||
:selectedKeys="selectedKeys"
|
||||
:checkedKeys="checkedKeys"
|
||||
:treeData="departTree"
|
||||
:checkStrictly="checkStrictly"
|
||||
:autoExpandParent="false"
|
||||
:expandedKeys="iExpandedKeys"
|
||||
@expand="onExpand"/>
|
||||
<!--新增右键点击事件,和增加添加和删除功能-->
|
||||
<!-- <a-menu slot="overlay">-->
|
||||
<!-- <a-menu-item @click="handleAdd(3)" key="1">{{$t('addTo')}}</a-menu-item>-->
|
||||
<!-- <a-menu-item @click="handleDelete" key="2">{{$t('delete')}}</a-menu-item>-->
|
||||
<!-- <a-menu-item @click="closeDrop" key="3">{{$t('cancel')}}</a-menu-item>-->
|
||||
<!-- </a-menu>-->
|
||||
<!-- </a-dropdown>-->
|
||||
</template>
|
||||
<template>
|
||||
<!-- <a-dropdown :trigger="[this.dropTrigger]" @visibleChange="dropStatus">-->
|
||||
<!-- checkable-->
|
||||
<!-- :expandedKeys="iExpandedKeys" -->
|
||||
<a-tree
|
||||
multiple
|
||||
style="height:600px;overflow: auto;width: 100%"
|
||||
@select="onSelect"
|
||||
@check="onCheck"
|
||||
@rightClick="rightHandle"
|
||||
:selectedKeys="selectedKeys"
|
||||
:checkedKeys="checkedKeys"
|
||||
:treeData="departTree"
|
||||
:checkStrictly="checkStrictly"
|
||||
:autoExpandParent="false"
|
||||
@expand="onExpand"/>
|
||||
<!--新增右键点击事件,和增加添加和删除功能-->
|
||||
<!-- <a-menu slot="overlay">-->
|
||||
<!-- <a-menu-item @click="handleAdd(3)" key="1">{{$t('addTo')}}</a-menu-item>-->
|
||||
<!-- <a-menu-item @click="handleDelete" key="2">{{$t('delete')}}</a-menu-item>-->
|
||||
<!-- <a-menu-item @click="closeDrop" key="3">{{$t('cancel')}}</a-menu-item>-->
|
||||
<!-- </a-menu>-->
|
||||
<!-- </a-dropdown>-->
|
||||
</template>
|
||||
</div>
|
||||
</a-card>
|
||||
<!---- author:os_chengtgen -- date:20190827 -- for:切换父子勾选模式 =======------>
|
||||
@@ -94,8 +94,8 @@
|
||||
:labelCol="labelCol"
|
||||
:wrapperCol="wrapperCol"
|
||||
:label="$t('OrganizationCode')">
|
||||
<a-input :disabled="disable"
|
||||
:placeholder="$t('enterOrganizationCode')"
|
||||
<a-input :disabled="disable"
|
||||
:placeholder="$t('enterOrganizationCode')"
|
||||
v-decorator="['orgCode', validatorRules.orgCode ]"/>
|
||||
</a-form-item>
|
||||
<a-form-item
|
||||
@@ -128,32 +128,35 @@
|
||||
:labelCol="labelCol"
|
||||
:wrapperCol="wrapperCol"
|
||||
:label="$t('sort')">
|
||||
<a-input-number :disabled="disable" v-decorator="[ 'departOrder',{'initialValue':0}]"/>
|
||||
<a-input-number :disabled="disable" v-decorator="[ 'departOrder',{'initialValue':0}]"/>
|
||||
</a-form-item>
|
||||
<a-form-item
|
||||
:labelCol="labelCol"
|
||||
:wrapperCol="wrapperCol"
|
||||
:label="$t('phoneNumber')">
|
||||
<a-input :disabled="disable" :placeholder="$t('enterMobileNumber')" v-decorator="['mobile', {'initialValue':''}]"/>
|
||||
<a-input :disabled="disable" :placeholder="$t('enterMobileNumber')"
|
||||
v-decorator="['mobile', {'initialValue':''}]"/>
|
||||
</a-form-item>
|
||||
<a-form-item
|
||||
:labelCol="labelCol"
|
||||
:wrapperCol="wrapperCol"
|
||||
:label="$t('address')">
|
||||
<a-input :disabled="disable" :placeholder="$t('enterAddress')" v-decorator="['address', {'initialValue':''}]"/>
|
||||
<a-input :disabled="disable" :placeholder="$t('enterAddress')"
|
||||
v-decorator="['address', {'initialValue':''}]"/>
|
||||
</a-form-item>
|
||||
<a-form-item
|
||||
:labelCol="labelCol"
|
||||
:wrapperCol="wrapperCol"
|
||||
:label="$t('remarks')">
|
||||
<a-textarea :disabled="disable" :placeholder="$t('enterComments')" v-decorator="['memo', {'initialValue':''}]"/>
|
||||
<a-textarea :disabled="disable" :placeholder="$t('enterComments')"
|
||||
v-decorator="['memo', {'initialValue':''}]"/>
|
||||
</a-form-item>
|
||||
</a-form>
|
||||
<!-- <div class="anty-form-btn">-->
|
||||
<!-- <a-button @click="emptyCurrForm" type="default" htmlType="button" icon="sync">{{$t('reset')}}</a-button>-->
|
||||
<!-- <a-button @click="submitCurrForm" type="primary" htmlType="button" icon="form">{{$t('preservation')}}-->
|
||||
<!-- </a-button>-->
|
||||
<!-- </div>-->
|
||||
<!-- <div class="anty-form-btn">-->
|
||||
<!-- <a-button @click="emptyCurrForm" type="default" htmlType="button" icon="sync">{{$t('reset')}}</a-button>-->
|
||||
<!-- <a-button @click="submitCurrForm" type="primary" htmlType="button" icon="form">{{$t('preservation')}}-->
|
||||
<!-- </a-button>-->
|
||||
<!-- </div>-->
|
||||
</a-card>
|
||||
<a-card v-else :bordered="false" style="height:248px !important;">
|
||||
<a-empty>
|
||||
@@ -267,10 +270,10 @@
|
||||
edges: []
|
||||
},
|
||||
validatorRules: {
|
||||
// departName: { rules: [{ required: true, message: this.$t('EnterOrganizationDepartment') }] },
|
||||
// orgCode: { rules: [{ required: true, message: this.$t('enterOrganizationCode') }] },
|
||||
// orgCategory: { rules: [{ required: true, message: this.$t('enterOrganizationType') }] },
|
||||
// mobile: { rules: [{ validator: this.validateMobile }] }
|
||||
// departName: { rules: [{ required: true, message: this.$t('EnterOrganizationDepartment') }] },
|
||||
// orgCode: { rules: [{ required: true, message: this.$t('enterOrganizationCode') }] },
|
||||
// orgCategory: { rules: [{ required: true, message: this.$t('enterOrganizationType') }] },
|
||||
// mobile: { rules: [{ validator: this.validateMobile }] }
|
||||
},
|
||||
url: {
|
||||
delete: '/sys/sysDepart/delete',
|
||||
@@ -280,7 +283,7 @@
|
||||
importExcelUrl: 'sys/sysDepart/importExcel'
|
||||
},
|
||||
orgCategoryDisabled: false,
|
||||
recordTab:{},
|
||||
recordTab: {}
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
@@ -423,13 +426,13 @@
|
||||
this.recordTab = record
|
||||
// this.$refs.departAuth.show(record.id)
|
||||
// 传用户信息参数
|
||||
if (this.$refs.DeptUserInfo){
|
||||
if (this.$refs.DeptUserInfo) {
|
||||
this.$refs.DeptUserInfo.open(record)
|
||||
}
|
||||
},
|
||||
tabChange(event){
|
||||
if(event == 3){
|
||||
this.$nextTick(()=>{
|
||||
tabChange(event) {
|
||||
if (event == 3) {
|
||||
this.$nextTick(() => {
|
||||
this.$refs.DeptUserInfo.open(this.recordTab)
|
||||
})
|
||||
}
|
||||
@@ -657,7 +660,8 @@
|
||||
background: #fff;
|
||||
border-radius: 0 0 2px 2px;
|
||||
}
|
||||
.box-ant{
|
||||
margin-right: 0!important;
|
||||
|
||||
.box-ant {
|
||||
margin-right: 0 !important;
|
||||
}
|
||||
</style>
|
||||
@@ -40,6 +40,7 @@
|
||||
<div style="margin-top: 15px">
|
||||
<a-table
|
||||
ref="table"
|
||||
rowKey="id"
|
||||
:columns="columns"
|
||||
:dataSource="dataSource"
|
||||
:pagination="ipagination"
|
||||
@@ -106,34 +107,46 @@
|
||||
selectionRows2: [],
|
||||
test: {},
|
||||
rightcolval: 0,
|
||||
columns:
|
||||
[
|
||||
{
|
||||
title: this.$t('RoleCode'),
|
||||
align: 'center',
|
||||
dataIndex: 'roleCode'
|
||||
},
|
||||
{
|
||||
title: this.$t('roleName'),
|
||||
align: 'center',
|
||||
dataIndex: 'roleName'
|
||||
},
|
||||
{
|
||||
title: this.$t('createTime'),
|
||||
dataIndex: 'createTime',
|
||||
align: 'center',
|
||||
sorter: true,
|
||||
customRender: (text) => {
|
||||
return moment(text).format('YYYY-MM-DD')
|
||||
}
|
||||
columns: [
|
||||
{
|
||||
title: this.$t('serialNumber'),
|
||||
dataIndex: '',
|
||||
key: 'rowIndex',
|
||||
width: 20,
|
||||
align: 'center',
|
||||
customRender: function(t, r, index) {
|
||||
return parseInt(index) + 1
|
||||
}
|
||||
// {
|
||||
// title: this.$t('operation'),
|
||||
// dataIndex: 'action',
|
||||
// align: 'center',
|
||||
// scopedSlots: { customRender: 'action' }
|
||||
// }
|
||||
],
|
||||
},
|
||||
{
|
||||
title: this.$t('RoleCode'),
|
||||
align: 'center',
|
||||
dataIndex: 'roleCode',
|
||||
width: 180
|
||||
},
|
||||
{
|
||||
title: this.$t('roleName'),
|
||||
align: 'center',
|
||||
dataIndex: 'roleName',
|
||||
width: 180
|
||||
},
|
||||
{
|
||||
title: this.$t('createTime'),
|
||||
dataIndex: 'createTime',
|
||||
align: 'center',
|
||||
width: 180,
|
||||
sorter: true,
|
||||
customRender: (text) => {
|
||||
return moment(text).format('YYYY-MM-DD')
|
||||
}
|
||||
}
|
||||
// {
|
||||
// title: this.$t('operation'),
|
||||
// dataIndex: 'action',
|
||||
// align: 'center',
|
||||
// scopedSlots: { customRender: 'action' }
|
||||
// }
|
||||
],
|
||||
// 高级查询拼接条件
|
||||
superQueryMatchType2: 'and',
|
||||
url: {
|
||||
|
||||
@@ -74,6 +74,7 @@
|
||||
|
||||
<!-- table区域-begin -->
|
||||
<div>
|
||||
<!-- :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"-->
|
||||
<a-table
|
||||
ref="table"
|
||||
rowKey="id"
|
||||
@@ -81,7 +82,6 @@
|
||||
:dataSource="dataSource"
|
||||
:pagination="ipagination"
|
||||
:loading="loading"
|
||||
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
|
||||
@change="handleTableChange">
|
||||
|
||||
<template slot="avatarslot" slot-scope="text, record, index">
|
||||
|
||||
@@ -139,13 +139,14 @@
|
||||
align: "center",
|
||||
dataIndex: 'phone'
|
||||
},
|
||||
{
|
||||
title: this.$t('operation'),
|
||||
dataIndex: 'action',
|
||||
scopedSlots: {customRender: 'action'},
|
||||
align: "center",
|
||||
width: 150
|
||||
}],
|
||||
// {
|
||||
// title: this.$t('operation'),
|
||||
// dataIndex: 'action',
|
||||
// scopedSlots: {customRender: 'action'},
|
||||
// align: "center",
|
||||
// width: 150
|
||||
// }
|
||||
],
|
||||
url: {
|
||||
list: "/sys/user/departUserList",
|
||||
edit: "/sys/user/editSysDepartWithUser",
|
||||
|
||||
Reference in New Issue
Block a user