update 去掉权限树弹框和角色管理的新增角色
This commit is contained in:
@@ -107,7 +107,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<!-- 操作按钮区域 -->
|
<!-- 操作按钮区域 -->
|
||||||
<div class="table-operator">
|
<div class="table-operator">
|
||||||
<a-button @click="handleAdd2" type="primary" icon="plus" style="margin-top: 16px">{{ $t('roleManage.newUser') }}</a-button>
|
<!--<a-button @click="handleAdd2" type="primary" icon="plus" style="margin-top: 16px">{{ $t('roleManage.newUser') }}</a-button>-->
|
||||||
<!--<a-button @click="handleEdit2" type="primary" icon="edit" style="margin-top: 16px">用户编辑</a-button>-->
|
<!--<a-button @click="handleEdit2" type="primary" icon="edit" style="margin-top: 16px">用户编辑</a-button>-->
|
||||||
<a-button @click="handleAddUserRole" type="primary" icon="plus" style="margin-top: 16px">{{ $t('roleManage.existingUsers') }}</a-button>
|
<a-button @click="handleAddUserRole" type="primary" icon="plus" style="margin-top: 16px">{{ $t('roleManage.existingUsers') }}</a-button>
|
||||||
|
|
||||||
|
|||||||
@@ -47,17 +47,14 @@
|
|||||||
<span slot="description"> {{ $t('depart:selectDepartmentFirst') }} </span>
|
<span slot="description"> {{ $t('depart:selectDepartmentFirst') }} </span>
|
||||||
</a-empty>
|
</a-empty>
|
||||||
</a-card>
|
</a-card>
|
||||||
<depart-datarule-modal ref="datarule"/>
|
|
||||||
</a-card>
|
</a-card>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { queryTreeListForRole, queryDepartPermission, saveDepartPermission } from '@/api/api'
|
import { queryTreeListForRole, queryDepartPermission, saveDepartPermission } from '@/api/api'
|
||||||
import DepartDataruleModal from './DepartDataruleModal'
|
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'DepartAuthModal',
|
name: 'DepartAuthModal',
|
||||||
components: { DepartDataruleModal },
|
|
||||||
data () {
|
data () {
|
||||||
return {
|
return {
|
||||||
// 是否开发环境(线上需隐藏按钮)
|
// 是否开发环境(线上需隐藏按钮)
|
||||||
@@ -82,7 +79,6 @@ export default {
|
|||||||
if (id && id.length > 0) {
|
if (id && id.length > 0) {
|
||||||
this.selectedKeys = id
|
this.selectedKeys = id
|
||||||
}
|
}
|
||||||
this.$refs.datarule.show(this.selectedKeys[0], this.departId)
|
|
||||||
},
|
},
|
||||||
onCheck (checkedKeys, { halfCheckedKeys }) {
|
onCheck (checkedKeys, { halfCheckedKeys }) {
|
||||||
// 保存选中的和半选中的,后面保存的时候合并提交
|
// 保存选中的和半选中的,后面保存的时候合并提交
|
||||||
|
|||||||
@@ -48,21 +48,14 @@
|
|||||||
<a-button @click="handleSubmit(false)" type="primary" :loading="loading" ghost style="margin-right: 0.8rem">{{ $t('roleManage.saveOnly') }}</a-button>
|
<a-button @click="handleSubmit(false)" type="primary" :loading="loading" ghost style="margin-right: 0.8rem">{{ $t('roleManage.saveOnly') }}</a-button>
|
||||||
<a-button @click="handleSubmit(true)" type="primary" :loading="loading">{{ $t('roleManage.saveAndClose') }}</a-button>
|
<a-button @click="handleSubmit(true)" type="primary" :loading="loading">{{ $t('roleManage.saveAndClose') }}</a-button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<role-datarule-modal ref="datarule"></role-datarule-modal>
|
|
||||||
|
|
||||||
</a-drawer>
|
</a-drawer>
|
||||||
|
|
||||||
</template>
|
</template>
|
||||||
<script>
|
<script>
|
||||||
import { queryTreeListForRole, queryRolePermission, saveRolePermission } from '@/api/api'
|
import { queryTreeListForRole, queryRolePermission, saveRolePermission } from '@/api/api'
|
||||||
import RoleDataruleModal from './RoleDataruleModal.vue'
|
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'RoleModal',
|
name: 'RoleModal',
|
||||||
components: {
|
|
||||||
RoleDataruleModal
|
|
||||||
},
|
|
||||||
data () {
|
data () {
|
||||||
return {
|
return {
|
||||||
roleId: '',
|
roleId: '',
|
||||||
@@ -84,7 +77,6 @@ export default {
|
|||||||
if (id && id.length > 0) {
|
if (id && id.length > 0) {
|
||||||
this.selectedKeys = id
|
this.selectedKeys = id
|
||||||
}
|
}
|
||||||
this.$refs.datarule.show(this.selectedKeys[0], this.roleId)
|
|
||||||
},
|
},
|
||||||
onCheck (o) {
|
onCheck (o) {
|
||||||
if (this.checkStrictly) {
|
if (this.checkStrictly) {
|
||||||
|
|||||||
Reference in New Issue
Block a user