forked from Gitlink/microservices
fix(文章操作基于代码仓库实现): 新增文档模块，操作文档时调用GitLink仓库相关接口完成操作
部门修改为组织 关联Issue:https://www.gitlink.org.cn/Gitlink/forgeplus/issues/2696
This commit is contained in:
parent
d6bca6276e
commit
982633eff0
|
|
@ -438,7 +438,12 @@ public class CmsDocServiceImpl implements ICmsDocService {
|
||||||
//检查该文件是否已存在
|
//检查该文件是否已存在
|
||||||
CmsDoc oldCmsDoc = cmsDocMapper.selectCmsDocByNameAndDeptId(cmsDoc.getName(), cmsDoc.getDeptId());
|
CmsDoc oldCmsDoc = cmsDocMapper.selectCmsDocByNameAndDeptId(cmsDoc.getName(), cmsDoc.getDeptId());
|
||||||
if (oldCmsDoc != null) {
|
if (oldCmsDoc != null) {
|
||||||
throw new ServiceException("该文件已存在(文章Id[" + cmsDoc.getName() + "])");
|
if (oldCmsDoc.getIsDir()) {
|
||||||
|
throw new ServiceException("该栏目已存在(栏目名称[" + cmsDoc.getName() + "])");
|
||||||
|
} else {
|
||||||
|
throw new ServiceException("该文章已存在(文章名称[" + cmsDoc.getName() + "])");
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
//2、检查该组织是否创建了专区项目
|
//2、检查该组织是否创建了专区项目
|
||||||
CmsProject cmsProject = cmsProjectService.selectCmsProjectByDeptId(cmsDoc.getDeptId());
|
CmsProject cmsProject = cmsProjectService.selectCmsProjectByDeptId(cmsDoc.getDeptId());
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
import request from '@/utils/request'
|
import request from '@/utils/request'
|
||||||
|
|
||||||
// 查询部门列表
|
// 查询组织列表
|
||||||
export function listDept(query) {
|
export function listDept(query) {
|
||||||
return request({
|
return request({
|
||||||
url: '/system/dept/list',
|
url: '/system/dept/list',
|
||||||
|
|
@ -9,7 +9,7 @@ export function listDept(query) {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
// 查询部门列表（排除节点）
|
// 查询组织列表（排除节点）
|
||||||
export function listDeptExcludeChild(deptId) {
|
export function listDeptExcludeChild(deptId) {
|
||||||
return request({
|
return request({
|
||||||
url: '/system/dept/list/exclude/' + deptId,
|
url: '/system/dept/list/exclude/' + deptId,
|
||||||
|
|
@ -17,7 +17,7 @@ export function listDeptExcludeChild(deptId) {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
// 查询部门详细
|
// 查询组织详细
|
||||||
export function getDept(deptId) {
|
export function getDept(deptId) {
|
||||||
return request({
|
return request({
|
||||||
url: '/system/dept/' + deptId,
|
url: '/system/dept/' + deptId,
|
||||||
|
|
@ -25,7 +25,7 @@ export function getDept(deptId) {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
// 新增部门
|
// 新增组织
|
||||||
export function addDept(data) {
|
export function addDept(data) {
|
||||||
return request({
|
return request({
|
||||||
url: '/system/dept',
|
url: '/system/dept',
|
||||||
|
|
@ -34,7 +34,7 @@ export function addDept(data) {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
// 修改部门
|
// 修改组织
|
||||||
export function updateDept(data) {
|
export function updateDept(data) {
|
||||||
return request({
|
return request({
|
||||||
url: '/system/dept',
|
url: '/system/dept',
|
||||||
|
|
@ -43,7 +43,7 @@ export function updateDept(data) {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
// 删除部门
|
// 删除组织
|
||||||
export function delDept(deptId) {
|
export function delDept(deptId) {
|
||||||
return request({
|
return request({
|
||||||
url: '/system/dept/' + deptId,
|
url: '/system/dept/' + deptId,
|
||||||
|
|
|
||||||
|
|
@ -110,7 +110,7 @@ export function authUserSelectAll(data) {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
// 根据角色ID查询部门树结构
|
// 根据角色ID查询组织树结构
|
||||||
export function deptTreeSelect(roleId) {
|
export function deptTreeSelect(roleId) {
|
||||||
return request({
|
return request({
|
||||||
url: '/system/role/deptTree/' + roleId,
|
url: '/system/role/deptTree/' + roleId,
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
import request from '@/utils/request'
|
import request from '@/utils/request'
|
||||||
import { parseStrEmpty } from "@/utils/ruoyi";
|
import {parseStrEmpty} from "@/utils/ruoyi";
|
||||||
|
|
||||||
// 查询用户列表
|
// 查询用户列表
|
||||||
export function listUser(query) {
|
export function listUser(query) {
|
||||||
|
|
@ -126,7 +126,7 @@ export function updateAuthRole(data) {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
// 查询部门下拉树结构
|
// 查询组织下拉树结构
|
||||||
export function deptTreeSelect() {
|
export function deptTreeSelect() {
|
||||||
return request({
|
return request({
|
||||||
url: '/system/user/deptTree',
|
url: '/system/user/deptTree',
|
||||||
|
|
|
||||||
|
|
@ -150,7 +150,7 @@
|
||||||
<el-collapse accordion>
|
<el-collapse accordion>
|
||||||
<el-collapse-item title="v3.6.2 - 2023-01-16">
|
<el-collapse-item title="v3.6.2 - 2023-01-16">
|
||||||
<ol>
|
<ol>
|
||||||
<li>重置时取消部门选中</li>
|
<li>重置时取消组织选中</li>
|
||||||
<li>新增返回警告消息提示</li>
|
<li>新增返回警告消息提示</li>
|
||||||
<li>忽略不必要的属性数据返回</li>
|
<li>忽略不必要的属性数据返回</li>
|
||||||
<li>修改参数键名时移除前缓存配置</li>
|
<li>修改参数键名时移除前缓存配置</li>
|
||||||
|
|
@ -164,7 +164,7 @@
|
||||||
<li>修复gateway流控规则生效但不显示问题</li>
|
<li>修复gateway流控规则生效但不显示问题</li>
|
||||||
<li>修复主题颜色在Drawer组件不会加载问题</li>
|
<li>修复主题颜色在Drawer组件不会加载问题</li>
|
||||||
<li>修复调度日志点击多次数据不变化的问题</li>
|
<li>修复调度日志点击多次数据不变化的问题</li>
|
||||||
<li>修复用户编辑时角色和部门存在无法修改情况</li>
|
<li>修复用户编辑时角色和组织存在无法修改情况</li>
|
||||||
<li>修复使用透明底png图片时，自动填充黑色背景</li>
|
<li>修复使用透明底png图片时，自动填充黑色背景</li>
|
||||||
<li>修复table中更多按钮切换主题色未生效修复问题</li>
|
<li>修复table中更多按钮切换主题色未生效修复问题</li>
|
||||||
<li>修复某些特性的环境生成代码变乱码TXT文件问题</li>
|
<li>修复某些特性的环境生成代码变乱码TXT文件问题</li>
|
||||||
|
|
@ -222,7 +222,7 @@
|
||||||
<li>优化定时任务支持执行父类方法</li>
|
<li>优化定时任务支持执行父类方法</li>
|
||||||
<li>优化修改资料头像被覆盖的问题</li>
|
<li>优化修改资料头像被覆盖的问题</li>
|
||||||
<li>优化修改用户登录账号重复验证</li>
|
<li>优化修改用户登录账号重复验证</li>
|
||||||
<li>优化用户个人信息接口防止修改部门</li>
|
<li>优化用户个人信息接口防止修改组织</li>
|
||||||
<li>优化布局设置使用el-drawer抽屉显示</li>
|
<li>优化布局设置使用el-drawer抽屉显示</li>
|
||||||
<li>优化日志注解记录限制请求地址的长度</li>
|
<li>优化日志注解记录限制请求地址的长度</li>
|
||||||
<li>优化导入更新用户数据前校验数据权限</li>
|
<li>优化导入更新用户数据前校验数据权限</li>
|
||||||
|
|
@ -285,7 +285,7 @@
|
||||||
<li>添加页签openPage支持传递参数</li>
|
<li>添加页签openPage支持传递参数</li>
|
||||||
<li>添加清理分页的线程变量方法</li>
|
<li>添加清理分页的线程变量方法</li>
|
||||||
<li>修改npm即将过期的注册源地址</li>
|
<li>修改npm即将过期的注册源地址</li>
|
||||||
<li>用户缓存信息添加部门ancestors祖级列表</li>
|
<li>用户缓存信息添加组织ancestors祖级列表</li>
|
||||||
<li>升级spring-cloud到最新版2021.0.1</li>
|
<li>升级spring-cloud到最新版2021.0.1</li>
|
||||||
<li>升级spring-boot到最新版本2.6.6</li>
|
<li>升级spring-boot到最新版本2.6.6</li>
|
||||||
<li>升级spring-boot-admin到最新版2.6.6</li>
|
<li>升级spring-boot-admin到最新版2.6.6</li>
|
||||||
|
|
@ -339,9 +339,9 @@
|
||||||
<li>优化空值不进行回显数据字典</li>
|
<li>优化空值不进行回显数据字典</li>
|
||||||
<li>优化用户导入提示溢出则显示滚动条</li>
|
<li>优化用户导入提示溢出则显示滚动条</li>
|
||||||
<li>优化定时任务cron表达式小时设置24</li>
|
<li>优化定时任务cron表达式小时设置24</li>
|
||||||
<li>优化部门修改缩放后出现的错位问题</li>
|
<li>优化组织修改缩放后出现的错位问题</li>
|
||||||
<li>优化分页方法设置成通用方便灵活调用</li>
|
<li>优化分页方法设置成通用方便灵活调用</li>
|
||||||
<li>优化用户管理部门查询选择节点后分页参数初始</li>
|
<li>优化用户管理组织查询选择节点后分页参数初始</li>
|
||||||
<li>其他细节优化</li>
|
<li>其他细节优化</li>
|
||||||
</ol>
|
</ol>
|
||||||
</el-collapse-item>
|
</el-collapse-item>
|
||||||
|
|
@ -388,7 +388,7 @@
|
||||||
<li>修改时检查用户数据权限范围</li>
|
<li>修改时检查用户数据权限范围</li>
|
||||||
<li>修复保存配置主题颜色失效问题</li>
|
<li>修复保存配置主题颜色失效问题</li>
|
||||||
<li>新增暗色菜单风格主题</li>
|
<li>新增暗色菜单风格主题</li>
|
||||||
<li>菜单&部门新增展开/折叠功能</li>
|
<li>菜单&组织新增展开/折叠功能</li>
|
||||||
<li>页签新增关闭左侧&添加图标</li>
|
<li>页签新增关闭左侧&添加图标</li>
|
||||||
<li>代码生成主子表多选行数据</li>
|
<li>代码生成主子表多选行数据</li>
|
||||||
<li>日期范围支持添加多组</li>
|
<li>日期范围支持添加多组</li>
|
||||||
|
|
@ -470,8 +470,8 @@
|
||||||
<li>用户信息长度校验限制</li>
|
<li>用户信息长度校验限制</li>
|
||||||
<li>角色&菜单新增字段属性提示信息</li>
|
<li>角色&菜单新增字段属性提示信息</li>
|
||||||
<li>修复用户搜索分页变量错误</li>
|
<li>修复用户搜索分页变量错误</li>
|
||||||
<li>优化部门父级启用状态</li>
|
<li>优化组织父级启用状态</li>
|
||||||
<li>启用部门状态排除顶级节点</li>
|
<li>启用组织状态排除顶级节点</li>
|
||||||
<li>定时任务新增更多操作</li>
|
<li>定时任务新增更多操作</li>
|
||||||
<li>优化代码生成模板</li>
|
<li>优化代码生成模板</li>
|
||||||
<li>优化顶部菜单显示样式</li>
|
<li>优化顶部菜单显示样式</li>
|
||||||
|
|
@ -579,7 +579,7 @@
|
||||||
<li>支持主题风格配置</li>
|
<li>支持主题风格配置</li>
|
||||||
<li>服务之间feign调用传递用户信息</li>
|
<li>服务之间feign调用传递用户信息</li>
|
||||||
<li>删除用户和角色解绑关联</li>
|
<li>删除用户和角色解绑关联</li>
|
||||||
<li>去除用户手机邮箱部门必填验证</li>
|
<li>去除用户手机邮箱组织必填验证</li>
|
||||||
<li>代码生成预览支持高亮显示</li>
|
<li>代码生成预览支持高亮显示</li>
|
||||||
<li>获取请求token方法移至权限工具类</li>
|
<li>获取请求token方法移至权限工具类</li>
|
||||||
<li>代码生成预览提供滚动机制</li>
|
<li>代码生成预览提供滚动机制</li>
|
||||||
|
|
@ -693,9 +693,9 @@
|
||||||
<li>限制系统内置参数不允许删除</li>
|
<li>限制系统内置参数不允许删除</li>
|
||||||
<li>修正调用目标字符串最大长度</li>
|
<li>修正调用目标字符串最大长度</li>
|
||||||
<li>修改自定义权限实现</li>
|
<li>修改自定义权限实现</li>
|
||||||
<li>优化递归菜单&部门子节点</li>
|
<li>优化递归菜单&组织子节点</li>
|
||||||
<li>修改sass为node-sass，避免el-icon图标乱码</li>
|
<li>修改sass为node-sass，避免el-icon图标乱码</li>
|
||||||
<li>修复根节点为子部门时，树状结构显示问题</li>
|
<li>修复根节点为子组织时，树状结构显示问题</li>
|
||||||
<li>全局异常状态汉化拦截处理</li>
|
<li>全局异常状态汉化拦截处理</li>
|
||||||
<li>唯一限制条件只返回单条数据</li>
|
<li>唯一限制条件只返回单条数据</li>
|
||||||
<li>其他细节优化</li>
|
<li>其他细节优化</li>
|
||||||
|
|
@ -787,7 +787,7 @@
|
||||||
<li>修正岗位导出权限注解</li>
|
<li>修正岗位导出权限注解</li>
|
||||||
<li>修复首页搜索菜单外链无法点击跳转问题</li>
|
<li>修复首页搜索菜单外链无法点击跳转问题</li>
|
||||||
<li>修复菜单管理选择图标，backspace删除时不过滤数据</li>
|
<li>修复菜单管理选择图标，backspace删除时不过滤数据</li>
|
||||||
<li>用户管理部门分支节点不可检查&显示计数</li>
|
<li>用户管理组织分支节点不可检查&显示计数</li>
|
||||||
<li>数据范围过滤属性调整</li>
|
<li>数据范围过滤属性调整</li>
|
||||||
<li>字典管理添加缓存读取</li>
|
<li>字典管理添加缓存读取</li>
|
||||||
<li>参数管理支持缓存操作</li>
|
<li>参数管理支持缓存操作</li>
|
||||||
|
|
|
||||||
|
|
@ -1,336 +1,338 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="app-container">
|
<div class="app-container">
|
||||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
|
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
|
||||||
<el-form-item label="部门名称" prop="deptName">
|
<el-form-item label="组织名称" prop="deptName">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="queryParams.deptName"
|
v-model="queryParams.deptName"
|
||||||
placeholder="请输入部门名称"
|
placeholder="请输入组织名称"
|
||||||
clearable
|
clearable
|
||||||
@keyup.enter.native="handleQuery"
|
@keyup.enter.native="handleQuery"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="状态" prop="status">
|
<el-form-item label="状态" prop="status">
|
||||||
<el-select v-model="queryParams.status" placeholder="部门状态" clearable>
|
<el-select v-model="queryParams.status" placeholder="组织状态" clearable>
|
||||||
<el-option
|
<el-option
|
||||||
v-for="dict in dict.type.sys_normal_disable"
|
v-for="dict in dict.type.sys_normal_disable"
|
||||||
:key="dict.value"
|
:key="dict.value"
|
||||||
:label="dict.label"
|
:label="dict.label"
|
||||||
:value="dict.value"
|
:value="dict.value"
|
||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
||||||
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
|
|
||||||
<el-row :gutter="10" class="mb8">
|
<el-row :gutter="10" class="mb8">
|
||||||
<el-col :span="1.5">
|
<el-col :span="1.5">
|
||||||
<el-button
|
<el-button
|
||||||
type="primary"
|
type="primary"
|
||||||
plain
|
plain
|
||||||
icon="el-icon-plus"
|
icon="el-icon-plus"
|
||||||
size="mini"
|
size="mini"
|
||||||
@click="handleAdd"
|
@click="handleAdd"
|
||||||
v-hasPermi="['system:dept:add']"
|
v-hasPermi="['system:dept:add']"
|
||||||
>新增</el-button>
|
>新增</el-button>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="1.5">
|
<el-col :span="1.5">
|
||||||
<el-button
|
<el-button
|
||||||
type="info"
|
type="info"
|
||||||
plain
|
plain
|
||||||
icon="el-icon-sort"
|
icon="el-icon-sort"
|
||||||
size="mini"
|
size="mini"
|
||||||
@click="toggleExpandAll"
|
@click="toggleExpandAll"
|
||||||
>展开/折叠</el-button>
|
>展开/折叠</el-button>
|
||||||
</el-col>
|
</el-col>
|
||||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||||
</el-row>
|
</el-row>
|
||||||
|
|
||||||
<el-table
|
<el-table
|
||||||
v-if="refreshTable"
|
v-if="refreshTable"
|
||||||
v-loading="loading"
|
v-loading="loading"
|
||||||
:data="deptList"
|
:data="deptList"
|
||||||
row-key="deptId"
|
row-key="deptId"
|
||||||
:default-expand-all="isExpandAll"
|
:default-expand-all="isExpandAll"
|
||||||
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
|
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
|
||||||
>
|
>
|
||||||
<el-table-column prop="deptName" label="部门名称" width="260"></el-table-column>
|
<el-table-column prop="deptName" label="组织名称" width="260"></el-table-column>
|
||||||
<el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
|
<el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
|
||||||
<el-table-column prop="status" label="状态" width="100">
|
<el-table-column prop="status" label="状态" width="100">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
|
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="创建时间" align="center" prop="createTime" width="200">
|
<el-table-column label="创建时间" align="center" prop="createTime" width="200">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span>{{ parseTime(scope.row.createTime) }}</span>
|
<span>{{ parseTime(scope.row.createTime) }}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-button
|
<el-button
|
||||||
size="mini"
|
size="mini"
|
||||||
type="text"
|
type="text"
|
||||||
icon="el-icon-edit"
|
icon="el-icon-edit"
|
||||||
@click="handleUpdate(scope.row)"
|
@click="handleUpdate(scope.row)"
|
||||||
v-hasPermi="['system:dept:edit']"
|
v-hasPermi="['system:dept:edit']"
|
||||||
>修改</el-button>
|
>修改</el-button>
|
||||||
<el-button
|
<el-button
|
||||||
size="mini"
|
size="mini"
|
||||||
type="text"
|
type="text"
|
||||||
icon="el-icon-plus"
|
icon="el-icon-plus"
|
||||||
@click="handleAdd(scope.row)"
|
@click="handleAdd(scope.row)"
|
||||||
v-hasPermi="['system:dept:add']"
|
v-hasPermi="['system:dept:add']"
|
||||||
>新增</el-button>
|
>新增</el-button>
|
||||||
<el-button
|
<el-button
|
||||||
v-if="scope.row.parentId != 0"
|
v-if="scope.row.parentId != 0"
|
||||||
size="mini"
|
size="mini"
|
||||||
type="text"
|
type="text"
|
||||||
icon="el-icon-delete"
|
icon="el-icon-delete"
|
||||||
@click="handleDelete(scope.row)"
|
@click="handleDelete(scope.row)"
|
||||||
v-hasPermi="['system:dept:remove']"
|
v-hasPermi="['system:dept:remove']"
|
||||||
>删除</el-button>
|
>删除</el-button>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
|
|
||||||
<!-- 添加或修改部门对话框 -->
|
<!-- 添加或修改组织对话框 -->
|
||||||
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
|
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
|
||||||
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="24" v-if="form.parentId !== 0">
|
<el-col :span="24" v-if="form.parentId !== 0">
|
||||||
<el-form-item label="上级部门" prop="parentId">
|
<el-form-item label="上级组织" prop="parentId">
|
||||||
<treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级部门" />
|
<treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer"
|
||||||
</el-form-item>
|
placeholder="选择上级组织"/>
|
||||||
</el-col>
|
</el-form-item>
|
||||||
</el-row>
|
</el-col>
|
||||||
<el-row>
|
</el-row>
|
||||||
<el-col :span="12">
|
<el-row>
|
||||||
<el-form-item label="部门名称" prop="deptName">
|
<el-col :span="12">
|
||||||
<el-input v-model="form.deptName" placeholder="请输入部门名称" />
|
<el-form-item label="组织名称" prop="deptName">
|
||||||
</el-form-item>
|
<el-input v-model="form.deptName" placeholder="请输入组织名称"/>
|
||||||
</el-col>
|
</el-form-item>
|
||||||
<el-col :span="12">
|
</el-col>
|
||||||
<el-form-item label="显示排序" prop="orderNum">
|
<el-col :span="12">
|
||||||
<el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
|
<el-form-item label="显示排序" prop="orderNum">
|
||||||
</el-form-item>
|
<el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
|
||||||
</el-col>
|
</el-form-item>
|
||||||
</el-row>
|
</el-col>
|
||||||
<el-row>
|
</el-row>
|
||||||
<el-col :span="12">
|
<el-row>
|
||||||
<el-form-item label="负责人" prop="leader">
|
<el-col :span="12">
|
||||||
<el-input v-model="form.leader" placeholder="请输入负责人" maxlength="20" />
|
<el-form-item label="负责人" prop="leader">
|
||||||
</el-form-item>
|
<el-input v-model="form.leader" placeholder="请输入负责人" maxlength="20" />
|
||||||
</el-col>
|
</el-form-item>
|
||||||
<el-col :span="12">
|
</el-col>
|
||||||
<el-form-item label="联系电话" prop="phone">
|
<el-col :span="12">
|
||||||
<el-input v-model="form.phone" placeholder="请输入联系电话" maxlength="11" />
|
<el-form-item label="联系电话" prop="phone">
|
||||||
</el-form-item>
|
<el-input v-model="form.phone" placeholder="请输入联系电话" maxlength="11" />
|
||||||
</el-col>
|
</el-form-item>
|
||||||
</el-row>
|
</el-col>
|
||||||
<el-row>
|
</el-row>
|
||||||
<el-col :span="12">
|
<el-row>
|
||||||
<el-form-item label="邮箱" prop="email">
|
<el-col :span="12">
|
||||||
<el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
|
<el-form-item label="邮箱" prop="email">
|
||||||
</el-form-item>
|
<el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
|
||||||
</el-col>
|
</el-form-item>
|
||||||
<el-col :span="12">
|
</el-col>
|
||||||
<el-form-item label="部门状态">
|
<el-col :span="12">
|
||||||
<el-radio-group v-model="form.status">
|
<el-form-item label="组织状态">
|
||||||
<el-radio
|
<el-radio-group v-model="form.status">
|
||||||
v-for="dict in dict.type.sys_normal_disable"
|
<el-radio
|
||||||
:key="dict.value"
|
v-for="dict in dict.type.sys_normal_disable"
|
||||||
:label="dict.value"
|
:key="dict.value"
|
||||||
>{{dict.label}}</el-radio>
|
:label="dict.value"
|
||||||
</el-radio-group>
|
>{{ dict.label }}
|
||||||
</el-form-item>
|
</el-radio>
|
||||||
</el-col>
|
</el-radio-group>
|
||||||
</el-row>
|
</el-form-item>
|
||||||
</el-form>
|
</el-col>
|
||||||
<div slot="footer" class="dialog-footer">
|
</el-row>
|
||||||
<el-button type="primary" @click="submitForm">确 定</el-button>
|
</el-form>
|
||||||
<el-button @click="cancel">取 消</el-button>
|
<div slot="footer" class="dialog-footer">
|
||||||
</div>
|
<el-button type="primary" @click="submitForm">确 定</el-button>
|
||||||
</el-dialog>
|
<el-button @click="cancel">取 消</el-button>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</el-dialog>
|
||||||
|
</div>
|
||||||
<script>
|
</template>
|
||||||
import { listDept, getDept, delDept, addDept, updateDept, listDeptExcludeChild } from "@/api/system/dept";
|
|
||||||
import Treeselect from "@riophae/vue-treeselect";
|
<script>
|
||||||
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
|
import {addDept, delDept, getDept, listDept, listDeptExcludeChild, updateDept} from "@/api/system/dept";
|
||||||
|
import Treeselect from "@riophae/vue-treeselect";
|
||||||
export default {
|
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
|
||||||
name: "Dept",
|
|
||||||
dicts: ['sys_normal_disable'],
|
export default {
|
||||||
components: { Treeselect },
|
name: "Dept",
|
||||||
data() {
|
dicts: ['sys_normal_disable'],
|
||||||
return {
|
components: { Treeselect },
|
||||||
// 遮罩层
|
data() {
|
||||||
loading: true,
|
return {
|
||||||
// 显示搜索条件
|
// 遮罩层
|
||||||
showSearch: true,
|
loading: true,
|
||||||
// 表格树数据
|
// 显示搜索条件
|
||||||
deptList: [],
|
showSearch: true,
|
||||||
// 部门树选项
|
// 表格树数据
|
||||||
deptOptions: [],
|
deptList: [],
|
||||||
// 弹出层标题
|
// 组织树选项
|
||||||
title: "",
|
deptOptions: [],
|
||||||
// 是否显示弹出层
|
// 弹出层标题
|
||||||
open: false,
|
title: "",
|
||||||
// 是否展开，默认全部展开
|
// 是否显示弹出层
|
||||||
isExpandAll: true,
|
open: false,
|
||||||
// 重新渲染表格状态
|
// 是否展开，默认全部展开
|
||||||
refreshTable: true,
|
isExpandAll: true,
|
||||||
// 查询参数
|
// 重新渲染表格状态
|
||||||
queryParams: {
|
refreshTable: true,
|
||||||
deptName: undefined,
|
// 查询参数
|
||||||
status: undefined
|
queryParams: {
|
||||||
},
|
deptName: undefined,
|
||||||
// 表单参数
|
status: undefined
|
||||||
form: {},
|
},
|
||||||
// 表单校验
|
// 表单参数
|
||||||
rules: {
|
form: {},
|
||||||
parentId: [
|
// 表单校验
|
||||||
{ required: true, message: "上级部门不能为空", trigger: "blur" }
|
rules: {
|
||||||
],
|
parentId: [
|
||||||
deptName: [
|
{required: true, message: "上级组织不能为空", trigger: "blur"}
|
||||||
{ required: true, message: "部门名称不能为空", trigger: "blur" }
|
],
|
||||||
],
|
deptName: [
|
||||||
orderNum: [
|
{required: true, message: "组织名称不能为空", trigger: "blur"}
|
||||||
{ required: true, message: "显示排序不能为空", trigger: "blur" }
|
],
|
||||||
],
|
orderNum: [
|
||||||
email: [
|
{ required: true, message: "显示排序不能为空", trigger: "blur" }
|
||||||
{
|
],
|
||||||
type: "email",
|
email: [
|
||||||
message: "请输入正确的邮箱地址",
|
{
|
||||||
trigger: ["blur", "change"]
|
type: "email",
|
||||||
}
|
message: "请输入正确的邮箱地址",
|
||||||
],
|
trigger: ["blur", "change"]
|
||||||
phone: [
|
}
|
||||||
{
|
],
|
||||||
pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
|
phone: [
|
||||||
message: "请输入正确的手机号码",
|
{
|
||||||
trigger: "blur"
|
pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
|
||||||
}
|
message: "请输入正确的手机号码",
|
||||||
]
|
trigger: "blur"
|
||||||
}
|
}
|
||||||
};
|
]
|
||||||
},
|
}
|
||||||
created() {
|
};
|
||||||
this.getList();
|
},
|
||||||
},
|
created() {
|
||||||
methods: {
|
this.getList();
|
||||||
/** 查询部门列表 */
|
},
|
||||||
getList() {
|
methods: {
|
||||||
this.loading = true;
|
/** 查询组织列表 */
|
||||||
listDept(this.queryParams).then(response => {
|
getList() {
|
||||||
this.deptList = this.handleTree(response.data, "deptId");
|
this.loading = true;
|
||||||
this.loading = false;
|
listDept(this.queryParams).then(response => {
|
||||||
});
|
this.deptList = this.handleTree(response.data, "deptId");
|
||||||
},
|
this.loading = false;
|
||||||
/** 转换部门数据结构 */
|
});
|
||||||
normalizer(node) {
|
},
|
||||||
if (node.children && !node.children.length) {
|
/** 转换组织数据结构 */
|
||||||
delete node.children;
|
normalizer(node) {
|
||||||
}
|
if (node.children && !node.children.length) {
|
||||||
return {
|
delete node.children;
|
||||||
id: node.deptId,
|
}
|
||||||
label: node.deptName,
|
return {
|
||||||
children: node.children
|
id: node.deptId,
|
||||||
};
|
label: node.deptName,
|
||||||
},
|
children: node.children
|
||||||
// 取消按钮
|
};
|
||||||
cancel() {
|
},
|
||||||
this.open = false;
|
// 取消按钮
|
||||||
this.reset();
|
cancel() {
|
||||||
},
|
this.open = false;
|
||||||
// 表单重置
|
this.reset();
|
||||||
reset() {
|
},
|
||||||
this.form = {
|
// 表单重置
|
||||||
deptId: undefined,
|
reset() {
|
||||||
parentId: undefined,
|
this.form = {
|
||||||
deptName: undefined,
|
deptId: undefined,
|
||||||
orderNum: undefined,
|
parentId: undefined,
|
||||||
leader: undefined,
|
deptName: undefined,
|
||||||
phone: undefined,
|
orderNum: undefined,
|
||||||
email: undefined,
|
leader: undefined,
|
||||||
status: "0"
|
phone: undefined,
|
||||||
};
|
email: undefined,
|
||||||
this.resetForm("form");
|
status: "0"
|
||||||
},
|
};
|
||||||
/** 搜索按钮操作 */
|
this.resetForm("form");
|
||||||
handleQuery() {
|
},
|
||||||
this.getList();
|
/** 搜索按钮操作 */
|
||||||
},
|
handleQuery() {
|
||||||
/** 重置按钮操作 */
|
this.getList();
|
||||||
resetQuery() {
|
},
|
||||||
this.resetForm("queryForm");
|
/** 重置按钮操作 */
|
||||||
this.handleQuery();
|
resetQuery() {
|
||||||
},
|
this.resetForm("queryForm");
|
||||||
/** 新增按钮操作 */
|
this.handleQuery();
|
||||||
handleAdd(row) {
|
},
|
||||||
this.reset();
|
/** 新增按钮操作 */
|
||||||
if (row != undefined) {
|
handleAdd(row) {
|
||||||
this.form.parentId = row.deptId;
|
this.reset();
|
||||||
}
|
if (row != undefined) {
|
||||||
this.open = true;
|
this.form.parentId = row.deptId;
|
||||||
this.title = "添加部门";
|
}
|
||||||
listDept().then(response => {
|
this.open = true;
|
||||||
this.deptOptions = this.handleTree(response.data, "deptId");
|
this.title = "添加组织";
|
||||||
});
|
listDept().then(response => {
|
||||||
},
|
this.deptOptions = this.handleTree(response.data, "deptId");
|
||||||
/** 展开/折叠操作 */
|
});
|
||||||
toggleExpandAll() {
|
},
|
||||||
this.refreshTable = false;
|
/** 展开/折叠操作 */
|
||||||
this.isExpandAll = !this.isExpandAll;
|
toggleExpandAll() {
|
||||||
this.$nextTick(() => {
|
this.refreshTable = false;
|
||||||
this.refreshTable = true;
|
this.isExpandAll = !this.isExpandAll;
|
||||||
});
|
this.$nextTick(() => {
|
||||||
},
|
this.refreshTable = true;
|
||||||
/** 修改按钮操作 */
|
});
|
||||||
handleUpdate(row) {
|
},
|
||||||
this.reset();
|
/** 修改按钮操作 */
|
||||||
getDept(row.deptId).then(response => {
|
handleUpdate(row) {
|
||||||
this.form = response.data;
|
this.reset();
|
||||||
this.open = true;
|
getDept(row.deptId).then(response => {
|
||||||
this.title = "修改部门";
|
this.form = response.data;
|
||||||
});
|
this.open = true;
|
||||||
listDeptExcludeChild(row.deptId).then(response => {
|
this.title = "修改组织";
|
||||||
this.deptOptions = this.handleTree(response.data, "deptId");
|
});
|
||||||
});
|
listDeptExcludeChild(row.deptId).then(response => {
|
||||||
},
|
this.deptOptions = this.handleTree(response.data, "deptId");
|
||||||
/** 提交按钮 */
|
});
|
||||||
submitForm: function() {
|
},
|
||||||
this.$refs["form"].validate(valid => {
|
/** 提交按钮 */
|
||||||
if (valid) {
|
submitForm: function() {
|
||||||
if (this.form.deptId != undefined) {
|
this.$refs["form"].validate(valid => {
|
||||||
updateDept(this.form).then(response => {
|
if (valid) {
|
||||||
this.$modal.msgSuccess("修改成功");
|
if (this.form.deptId != undefined) {
|
||||||
this.open = false;
|
updateDept(this.form).then(response => {
|
||||||
this.getList();
|
this.$modal.msgSuccess("修改成功");
|
||||||
});
|
this.open = false;
|
||||||
} else {
|
this.getList();
|
||||||
addDept(this.form).then(response => {
|
});
|
||||||
this.$modal.msgSuccess("新增成功");
|
} else {
|
||||||
this.open = false;
|
addDept(this.form).then(response => {
|
||||||
this.getList();
|
this.$modal.msgSuccess("新增成功");
|
||||||
});
|
this.open = false;
|
||||||
}
|
this.getList();
|
||||||
}
|
});
|
||||||
});
|
}
|
||||||
},
|
}
|
||||||
/** 删除按钮操作 */
|
});
|
||||||
handleDelete(row) {
|
},
|
||||||
this.$modal.confirm('是否确认删除名称为"' + row.deptName + '"的数据项？').then(function() {
|
/** 删除按钮操作 */
|
||||||
return delDept(row.deptId);
|
handleDelete(row) {
|
||||||
}).then(() => {
|
this.$modal.confirm('是否确认删除名称为"' + row.deptName + '"的数据项？').then(function() {
|
||||||
this.getList();
|
return delDept(row.deptId);
|
||||||
this.$modal.msgSuccess("删除成功");
|
}).then(() => {
|
||||||
}).catch(() => {});
|
this.getList();
|
||||||
}
|
this.$modal.msgSuccess("删除成功");
|
||||||
}
|
}).catch(() => {});
|
||||||
};
|
}
|
||||||
</script>
|
}
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -24,7 +24,8 @@
|
||||||
<div class="pull-right">{{ user.email }}</div>
|
<div class="pull-right">{{ user.email }}</div>
|
||||||
</li>
|
</li>
|
||||||
<li class="list-group-item">
|
<li class="list-group-item">
|
||||||
<svg-icon icon-class="tree" />所属部门
|
<svg-icon icon-class="tree"/>
|
||||||
|
所属组织
|
||||||
<div class="pull-right" v-if="user.dept">{{ user.dept.deptName }} / {{ postGroup }}</div>
|
<div class="pull-right" v-if="user.dept">{{ user.dept.deptName }} / {{ postGroup }}</div>
|
||||||
</li>
|
</li>
|
||||||
<li class="list-group-item">
|
<li class="list-group-item">
|
||||||
|
|
@ -62,7 +63,7 @@
|
||||||
import userAvatar from "./userAvatar";
|
import userAvatar from "./userAvatar";
|
||||||
import userInfo from "./userInfo";
|
import userInfo from "./userInfo";
|
||||||
import resetPwd from "./resetPwd";
|
import resetPwd from "./resetPwd";
|
||||||
import { getUserProfile } from "@/api/system/user";
|
import {getUserProfile} from "@/api/system/user";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "Profile",
|
name: "Profile",
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue