java_project
/
hy-vue
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

还原部门角色绑定

dev
long 2 years ago
parent
0b055ad4ac
commit
b76f328095
2 changed files with 73 additions and 77 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 64
      src/views/system/DepartList.vue
  2. 86
      src/views/system/DepartUserList.vue

64
src/views/system/DepartList.vue
Unescape View File

@ -1,32 +1,31 @@
<template xmlns:background-color="http://www.w3.org/1999/xhtml"> <template xmlns:background-color="http://www.w3.org/1999/xhtml">
<a-card :bordered="false">
<a-row :gutter="10"> <a-row :gutter="10">
<a-col :md="12" :sm="24"> <a-col :md="12" :sm="24">
<a-card :bordered="false"> <a-card :bordered="false">
<!-- 按钮操作区域 --> <!-- 按钮操作区域 -->
<a-row style="margin-left: 14px"> <a-row style="margin-left: 14px">
<a-button @click="handleAdd(1)" type="primary">添加部门</a-button> <a-button @click="handleAdd(1)" type="primary">添加部门</a-button>
<a-button @click="handleAdd(2)" type="primary">添加下级</a-button> <a-button @click="handleAdd(2)" type="primary">添加下级</a-button>
<!-- <a-button type="primary" icon="download" @click="handleExportXls('部门信息')">导出</a-button>--> <a-button type="primary" icon="download" @click="handleExportXls('部门信息')">导出</a-button>
<!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">--> <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<!-- <a-button type="primary" icon="import">导入</a-button>--> <a-button type="primary" icon="import">导入</a-button>
<!-- </a-upload>--> </a-upload>
<a-button title="删除多条数据" @click="batchDel" type="default">批量删除</a-button> <a-button title="删除多条数据" @click="batchDel" type="default">批量删除</a-button>
<!--<a-button @click="refresh" type="default" icon="reload" :loading="loading">刷新</a-button>--> <!--<a-button @click="refresh" type="default" icon="reload" :loading="loading">刷新</a-button>-->
</a-row> </a-row>
<div style="background: #fff;padding-left:16px;height: 100%; margin-top: 5px"> <div style="background: #fff;padding-left:16px;height: 100%; margin-top: 5px">
<a-alert type="info" :showIcon="true"> <a-alert type="info" :showIcon="true">
<div slot="message"> <div slot="message">
当前选择：<span v-if="this.currSelected.title">{{ getCurrSelectedTitle() }}</span> 当前选择：<span v-if="this.currSelected.title">{{ getCurrSelectedTitle() }}</span>
<a v-if="this.currSelected.title" style="margin-left: 10px" @click="onClearSelected">取消选择</a> <a v-if="this.currSelected.title" style="margin-left: 10px" @click="onClearSelected">取消选择</a>
</div> </div>
</a-alert> </a-alert>
<a-input-search @search="onSearch" style="width:100%;margin-top: 10px" placeholder="请输入部门名称"/> <a-input-search @search="onSearch" style="width:100%;margin-top: 10px" placeholder="请输入部门名称"/>
<!-- 树--> <!-- 树-->
<a-col :md="10" :sm="24"> <a-col :md="10" :sm="24">
<template> <template>
<a-dropdown :trigger="[this.dropTrigger]" @visibleChange="dropStatus"> <a-dropdown :trigger="[this.dropTrigger]" @visibleChange="dropStatus">
<span style="user-select: none"> <span style="user-select: none">
<a-tree <a-tree
checkable checkable
@ -156,15 +155,14 @@
</a-empty> </a-empty>
</a-card> </a-card>
</a-tab-pane> </a-tab-pane>
<!-- <a-tab-pane tab="部门权限" key="2" forceRender>--> <a-tab-pane tab="部门权限" key="2" forceRender>
<!-- <depart-auth-modal ref="departAuth"/>--> <depart-auth-modal ref="departAuth"/>
<!-- </a-tab-pane>--> </a-tab-pane>
</a-tabs> </a-tabs>
</a-col> </a-col>
<depart-modal ref="departModal" @ok="loadTree"></depart-modal> <depart-modal ref="departModal" @ok="loadTree"></depart-modal>
</a-row> </a-row>
</a-card>
</template> </template>
<script> <script>
import DepartModal from './modules/DepartModal' import DepartModal from './modules/DepartModal'
@ -586,7 +584,7 @@
} }
} }
// <!---- author:os_chengtgen -- date:20190827 -- for:切换父子勾选模式 =======------> // <!---- author:os_chengtgen -- date:20190827 -- for:切换父子勾选模式 =======------>
}, },
created() { created() {
this.currFlowId = this.$route.params.id this.currFlowId = this.$route.params.id

86
src/views/system/DepartUserList.vue
Unescape View File

@ -1,52 +1,50 @@
<template> <template>
<a-card :bordered="false"> <a-row :gutter="10">
<a-row :gutter="10"> <a-col :md="8" :sm="24">
<a-col :md="8" :sm="24"> <a-card :bordered="false">
<a-card :bordered="false"> <div style="background: #fff;padding-left:16px;height: 100%; margin-top: 5px">
<div style="background: #fff;padding-left:16px;height: 100%; margin-top: 5px"> <a-input-search @search="onSearch" style="width:100%;margin-top: 10px" placeholder="请输入部门名称"/>
<a-input-search @search="onSearch" style="width:100%;margin-top: 10px" placeholder="请输入部门名称"/> <!-- 树-->
<!-- 树-->
<template v-if="userIdentity === '2' && departTree.length>0"> <template v-if="userIdentity === '2' && departTree.length>0">
<!--组织机构--> <!--组织机构-->
<a-tree <a-tree
showLine showLine
:selectedKeys="selectedKeys" :selectedKeys="selectedKeys"
:checkStrictly="true" :checkStrictly="true"
@select="onSelect" @select="onSelect"
:dropdownStyle="{maxHeight:'200px',overflow:'auto'}" :dropdownStyle="{maxHeight:'200px',overflow:'auto'}"
:treeData="departTree" :treeData="departTree"
:autoExpandParent="autoExpandParent" :autoExpandParent="autoExpandParent"
:expandedKeys="iExpandedKeys" :expandedKeys="iExpandedKeys"
@expand="onExpand" @expand="onExpand"
/> />
</template> </template>
<div style="margin-top: 24px;" v-else-if="userIdentity === '2' && departTree.length==0"> <div style="margin-top: 24px;" v-else-if="userIdentity === '2' && departTree.length==0">
<h3><span>您的部门下暂无有效部门信息</span></h3> <h3><span>您的部门下暂无有效部门信息</span></h3>
</div>
<div style="margin-top: 24px;" v-else><h3>普通员工暂此权限</h3></div>
</div> </div>
</a-card> <div style="margin-top: 24px;" v-else><h3>普通员工暂此权限</h3></div>
</a-col> </div>
<a-col :md="16" :sm="24"> </a-card>
<a-card :bordered="false"> </a-col>
<a-tabs defaultActiveKey="2" @change="callback"> <a-col :md="16" :sm="24">
<a-tab-pane tab="基本信息" key="1" forceRender> <a-card :bordered="false">
<Dept-Base-Info ref="DeptBaseInfo"></Dept-Base-Info> <a-tabs defaultActiveKey="2" @change="callback">
</a-tab-pane> <a-tab-pane tab="基本信息" key="1" forceRender>
<!-- <a-tab-pane tab="用户信息" key="2">--> <Dept-Base-Info ref="DeptBaseInfo"></Dept-Base-Info>
<!-- <Dept-User-Info ref="DeptUserInfo" @clearSelectedDepartKeys="clearSelectedDepartKeys"></Dept-User-Info>--> </a-tab-pane>
<!-- </a-tab-pane>--> <a-tab-pane tab="用户信息" key="2">
<!-- <a-tab-pane tab="部门角色" key="3" forceRender>--> <Dept-User-Info ref="DeptUserInfo" @clearSelectedDepartKeys="clearSelectedDepartKeys"></Dept-User-Info>
<!-- <dept-role-info ref="DeptRoleInfo" @clearSelectedDepartKeys="clearSelectedDepartKeys"/>--> </a-tab-pane>
<!-- </a-tab-pane>--> <a-tab-pane tab="部门角色" key="3" forceRender>
</a-tabs> <dept-role-info ref="DeptRoleInfo" @clearSelectedDepartKeys="clearSelectedDepartKeys"/>
</a-card> </a-tab-pane>
</a-col> </a-tabs>
</a-row> </a-card>
</a-card> </a-col>
</a-row>
</template> </template>
<script> <script>
import DeptBaseInfo from './modules/DeptBaseInfo' import DeptBaseInfo from './modules/DeptBaseInfo'

Write Preview
Loading…
Cancel
Save