update code

yanzhu-common/src/main/java/com/yanzhu/common/core/domain/TreeSelect.java

@@ -26,6 +26,15 @@ public class TreeSelect implements Serializable
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private List<TreeSelect> children;
 
+    public Object getData() {
+        return data;
+    }
+
+    public void setData(Object data) {
+        this.data = data;
+    }
+
+    private Object data;
     public TreeSelect()
     {
 
@@ -35,6 +44,7 @@ public class TreeSelect implements Serializable
     {
         this.id = dept.getDeptId();
         this.label = dept.getDeptName();
+        this.data=dept;
         this.children = dept.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
     }
 

yanzhu-framework/src/main/java/com/yanzhu/framework/web/service/UserDetailsServiceImpl.java

@@ -62,7 +62,8 @@ public class UserDetailsServiceImpl implements UserDetailsService
 
         //设置项目单位信息
         if(!user.isAdmin()){
-            Long deptId = Convert.toLong(user.getDept().getAncestors().split(",")[3]);
+            String[] tmps=user.getDept().getAncestors().split(",");
+            Long deptId = Convert.toLong(tmps[tmps.length-1]);
             if(deptId != null){
                 SysDept sysDept = sysDeptService.selectDeptById(deptId);
                 user.setParDeptId(sysDept.getDeptId());
@@ -70,7 +71,7 @@ public class UserDetailsServiceImpl implements UserDetailsService
             }
         }else{
             user.setParDeptId(100L);
-            user.setParDeptName("研筑临时项目管理");
+            user.setParDeptName("中铁建设集团有限公司");
         }
         passwordService.validate(user);
         return createLoginUser(user);

yanzhu-manage/src/main/java/com/yanzhu/web/CompanyController.java

@@ -1,8 +1,11 @@
 package com.yanzhu.web;
 
+import com.yanzhu.common.annotation.Log;
 import com.yanzhu.common.core.controller.BaseController;
 import com.yanzhu.common.core.domain.AjaxResult;
 import com.yanzhu.common.core.domain.entity.SysDept;
+import com.yanzhu.common.enums.BusinessType;
+import com.yanzhu.framework.web.domain.server.Sys;
 import com.yanzhu.system.service.ISysDeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -17,7 +20,7 @@ public class CompanyController extends BaseController {
     private ISysDeptService deptService;
 
 
-    @PreAuthorize("@ss.hasPermi('project:company:list')")
+    @PreAuthorize("@ss.hasAnyPermi('project:company:list')")
     @PostMapping("/list")
     public AjaxResult companyList(@RequestBody SysDept where)
     {
@@ -27,4 +30,30 @@ public class CompanyController extends BaseController {
         return success(depts);
     }
 
+    @PreAuthorize("@ss.hasAnyPermi('project:subCompany:list')")
+    @PostMapping("/subList")
+    public AjaxResult subList(@RequestBody SysDept where){
+        where.setDelFlag("0");
+        List<SysDept> depts = deptService.selectDeptList(where);
+        return success(depts);
+    }
+    @PreAuthorize("@ss.hasAnyPermi('project:subCompany:delete')")
+    @Log(title = "段队管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{deptId}")
+    public AjaxResult remove(@PathVariable Long deptId) {
+        return toAjax(deptService.deleteDeepDeptById(deptId));
+    }
+
+    @PreAuthorize("@ss.hasAnyPermi('project:subCompany:add')")
+    @Log(title = "段队管理", businessType = BusinessType.INSERT)
+    @PostMapping("/addSubCompany")
+    public AjaxResult addSubCompany(@RequestBody SysDept dept){
+        if (!deptService.checkDeptNameUnique(dept))
+        {
+            return error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
+        }
+        dept.setCreateBy(getUsername());
+        return toAjax(deptService.insertSubCompany(dept));
+    }
+
 }

yanzhu-system/src/main/java/com/yanzhu/system/mapper/SysDeptMapper.java

@@ -116,4 +116,5 @@ public interface SysDeptMapper
      */
     public int deleteDeptById(Long deptId);
 
+    public int deleteDeepDeptById(Long deptId);
 }

yanzhu-system/src/main/java/com/yanzhu/system/service/ISysDeptService.java

@@ -129,4 +129,13 @@ public interface ISysDeptService
      * @return 结果
      */
     public List<SysDept> findChildList(Long deptId);
+
+    /**
+     * 级联删除
+     * @param deptId
+     * @return
+     */
+    public int deleteDeepDeptById(Long deptId);
+
+    public int insertSubCompany(SysDept dept);
 }

yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysDeptServiceImpl.java

@@ -1,6 +1,7 @@
 package com.yanzhu.system.service.impl;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -213,14 +214,40 @@ public class SysDeptServiceImpl implements ISysDeptService
     {
         SysDept info = deptMapper.selectDeptById(dept.getParentId());
         // 如果父节点不为正常状态,则不允许新增子节点
-        if (!UserConstants.DEPT_NORMAL.equals(info.getStatus()))
+        if (UserConstants.DEPT_DISABLE.equals(info.getStatus()))
         {
             throw new ServiceException("部门停用，不允许新增");
         }
         dept.setAncestors(info.getAncestors() + "," + dept.getParentId());
         return deptMapper.insertDept(dept);
     }
-
+    @Override
+    public int insertSubCompany(SysDept dept) {
+        SysDept info = deptMapper.selectDeptById(dept.getParentId());
+        // 如果父节点不为正常状态,则不允许新增子节点
+        if (UserConstants.DEPT_DISABLE.equals(info.getStatus()))
+        {
+            throw new ServiceException("部门停用，不允许新增");
+        }
+        dept.setStatus("3");
+        dept.setAncestors(info.getAncestors() + "," + dept.getParentId());
+        int id=deptMapper.insertDept(dept);
+        String[] subDepts="成本部,行政部,工程部".split(",");
+        for(String it:subDepts){
+            SysDept dpt=new SysDept();
+            dpt.setParentId(dept.getDeptId());
+            dpt.setAncestors(dept.getAncestors()+","+dpt.getParentId());
+            dpt.setDeptName(it);
+            dpt.setCreateBy(dept.getCreateBy());
+            dpt.setCreateTime(new Date());
+            dpt.setPhone(dept.getPhone());
+            dpt.setEmail(dept.getPhone());
+            dpt.setLeader(dept.getLeader());
+            dpt.setStatus("4");
+            deptMapper.insertDept(dpt);
+        }
+        return id;
+    }
     /**
      * 修改保存部门信息
      * 
@@ -347,4 +374,11 @@ public class SysDeptServiceImpl implements ISysDeptService
         sysDept.setParentId(deptId);
         return deptMapper.selectDeptList(sysDept);
     }
+
+    @Override
+    public int deleteDeepDeptById(Long deptId) {
+        return deptMapper.deleteDeepDeptById(deptId);
+    }
+
+
 }

yanzhu-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -88,7 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where dept_name=#{deptName} and parent_id = #{parentId} and del_flag = '0' limit 1
 	</select>
     
-    <insert id="insertDept" parameterType="SysDept">
+    <insert id="insertDept" parameterType="SysDept" useGeneratedKeys="true" keyProperty="deptId">
  		insert into sys_dept(
  			<if test="deptId != null and deptId != 0">dept_id,</if>
  			<if test="parentId != null and parentId != 0">parent_id,</if>
@@ -160,4 +160,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		update sys_dept set del_flag = '2' where dept_id = #{deptId}
 	</delete>
 
+	<delete id="deleteDeepDeptById" parameterType="Long">
+		update sys_dept set del_flag = '2' where ancestors like  concat('%,', #{deptId}, ',%') or dept_id = #{deptId}
+	</delete>
 </mapper> 

yanzhu-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -57,8 +57,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
     
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
-		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
+		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader,
+		r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
+		from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
+		left join sys_user_role ur on u.user_id = ur.user_id
+		left join sys_role r on r.role_id = ur.role_id
 		where u.del_flag = '0'
 		<if test="userId != null and userId != 0">
 			AND u.user_id = #{userId}

yanzhu-ui/src/api/project/company.js

@@ -9,3 +9,27 @@ export function companyList(data) {
       data:data
     })
   }
+
+
+  export function subList(data) {
+    return request({
+      url: '/project/company/subList',
+      method: 'post',
+      data:data
+    })
+  }
+
+  export function deleteDept(deptId){
+    return request({
+      url: '/project/company/'+deptId,
+      method: 'delete'
+    })
+  }
+
+  export function addSubCompany(data){
+    return request({
+      url: '/project/company/addSubCompany',
+      method: 'post',
+      data: data
+    })
+  }

yanzhu-ui/src/api/system/dept.js

@@ -9,6 +9,7 @@ export function listDept(query) {
   })
 }
 
+
 // 查询部门下拉树结构
 export function treeselect() {
   return request({

yanzhu-ui/src/views/project/subCompany/index.vue

@@ -0,0 +1,264 @@
+<template>
+  <div class="prj-sub-company" style="padding:10px;">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+            <el-form-item label="段队名称" prop="deptName">
+                <el-input v-model="queryParams.deptName" placeholder="请输入段队名称" clearable
+                    @keyup.enter.native="handleQuery" />
+            </el-form-item>
+            <el-form-item label="联系人" prop="leader">
+                <el-input v-model="queryParams.leader" placeholder="请输入联系人" clearable @keyup.enter.native="handleQuery" />
+            </el-form-item>           
+            <el-form-item>
+                <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-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+                <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+                    v-hasPermi="['project:subCompany:add']">新增</el-button>
+            </el-col>
+            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+
+        <el-table v-if="refreshTable" v-loading="loading" :data="deptList" row-key="deptId">
+            <el-table-column prop="deptName" label="段队名称" width="260"></el-table-column>
+            <el-table-column prop="leader" label="联系人" width="260"></el-table-column>
+            <el-table-column prop="phone" label="联系电话" width="260"></el-table-column>
+            <el-table-column prop="status" label="状态" width="100">
+                <template slot-scope="scope">
+                    <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status" />
+                </template>
+            </el-table-column>
+            <el-table-column label="创建时间" align="center" prop="createTime" width="200">
+                <template slot-scope="scope">
+                    <span>{{ parseTime(scope.row.createTime) }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                <template slot-scope="scope">
+                    <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+                        v-hasPermi="['project:subCompany:edit']">修改</el-button>
+                    <el-button size="mini" type="text" icon="el-icon-delete"
+                        @click="handleDelete(scope.row)" v-hasPermi="['project:subCompany:delete']">删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <!-- 添加或修改公司对话框 -->
+        <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body :close-on-click-modal="false"
+             :close-on-press-escape="false">
+            <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+               
+                <el-row>
+                    <el-col :span="24">
+                        <el-form-item label="段队名称" prop="deptName">
+                            <el-input v-model="form.deptName" placeholder="请输入段队名称" />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="24">
+                        <el-form-item label="负责人" prop="leader">
+                            <el-input v-model="form.leader" placeholder="请输入负责人" maxlength="20" />
+                        </el-form-item>
+                    </el-col>
+
+                </el-row>
+
+                <el-row>
+                    <el-col :span="24">
+                        <el-form-item label="联系电话" prop="phone">
+                            <el-input v-model="form.phone" placeholder="请输入联系电话" maxlength="11" />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="24">
+                        <el-form-item label="段队状态">
+                            <el-radio-group v-model="form.status">
+                                <el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value"
+                                    :label="dict.value">{{ dict.label }}</el-radio>
+                            </el-radio-group>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="submitForm">确 定</el-button>
+                <el-button @click="cancel">取 消</el-button>
+            </div>
+        </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import { listDept, getDept, delDept, addDept, updateDept, listDeptExcludeChild } from "@/api/system/dept";
+import { subList,deleteDept,addSubCompany } from '@/api/project/company'
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+
+  dicts: ['sys_normal_disable'],
+    components: { Treeselect },
+    data() {
+        return {
+            // 遮罩层
+            loading: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 表格树数据
+            deptList: [],
+            // 公司树选项
+            deptOptions: [],
+            // 弹出层标题
+            title: "",
+            // 是否显示弹出层
+            open: false,            
+            // 重新渲染表格状态
+            refreshTable: true,
+            // 查询参数
+            queryParams: {
+                deptName: '',
+                status: '',
+                leader: '',
+            },
+            // 表单参数
+            form: {},
+            // 表单校验
+            rules: {
+                deptName: [
+                    { required: true, message: "段队名称不能为空", trigger: "blur" }
+                ],              
+                leader: [
+                    { required: true, message: "联系人不能为空", trigger: "blur" }
+                ],  
+                phone: [
+                    {
+                        required: true,
+                        pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+                        message: "请输入正确的手机号码",
+                        trigger: "blur"
+                    }
+                ]
+            }
+        };
+    },
+    created() {
+        this.queryParams.parentId=this.$store.state.user.dept.deptId
+        this.getList();        
+    },
+    methods: {
+        /** 查询段队列表 */
+        getList() {
+            this.loading = true;
+            subList(this.queryParams).then(response => {
+                this.deptList = response.data;
+                this.loading = false;
+            });
+        },
+        /** 转换段队数据结构 */
+        normalizer(node) {
+            if (node.children && !node.children.length) {
+                delete node.children;
+            }
+            return {
+                id: node.deptId,
+                label: node.deptName,
+                children: node.children
+            };
+        },
+        // 取消按钮
+        cancel() {
+            this.open = false;
+            this.reset();
+        },
+        // 表单重置
+        reset() {
+            this.form = {
+                deptId: undefined,
+                parentId: 100,
+                deptName: undefined,
+                orderNum: 100,
+                leader: undefined,
+                phone: undefined,
+                email: '',
+                status: "0"
+            };
+            this.resetForm("form");
+        },
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.getList();
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.resetForm("queryForm");
+            this.handleQuery();
+        },
+        /** 新增按钮操作 */
+        handleAdd(row) {
+            this.reset();
+            this.form.parentId = 100;
+            this.open = true;
+            this.title = "添加段队";            
+        },
+        /** 修改按钮操作 */
+        handleUpdate(row) {
+            this.reset();
+            getDept(row.deptId).then(response => {
+                this.form = response.data;
+                this.form.parentId = 100;
+                this.open = true;
+                this.title = "修改段队";
+                listDeptExcludeChild(row.deptId).then(response => {
+                    this.deptOptions = this.handleTree(response.data, "deptId");
+                    if (this.deptOptions.length == 0) {
+                        const noResultsOptions = { deptId: this.form.parentId, deptName: this.form.parentName, children: [] };
+                        this.deptOptions.push(noResultsOptions);
+                    }
+                });
+            });
+        },
+        /** 提交按钮 */
+        submitForm: function () {
+            this.$refs["form"].validate(valid => {
+                if (valid) {
+                    this.form.parentId=this.$store.state.user.dept.deptId
+                    if (this.form.deptId != undefined) {
+                        updateDept(this.form).then(response => {
+                            this.$modal.msgSuccess("修改成功");
+                            this.open = false;
+                            this.getList();
+                        });
+                    } else {
+                        addSubCompany(this.form).then(response => {
+                            this.$modal.msgSuccess("新增成功");
+                            this.open = false;
+                            this.getList();
+                        });
+                    }
+                }
+            });
+        },
+        /** 删除按钮操作 */
+        handleDelete(row) {
+            this.$modal.confirm('是否确认删除名称为"' + row.deptName + '"的数据项？').then(function () {
+                return deleteDept(row.deptId);
+            }).then(() => {
+                this.getList();
+                this.$modal.msgSuccess("删除成功");
+            }).catch(() => { });
+        }
+    }
+};
+</script>
+  
+<style lang="scss">
+.prj-sub-company{
+    
+}
+</style>

yanzhu-ui/src/views/system/user/index.vue

@@ -4,75 +4,36 @@
       <!--部门数据-->
       <el-col :span="4" :xs="24">
         <div class="head-container">
-          <el-input
+          <el-input v-model="deptName" placeholder="请输入部门名称" clearable size="small" prefix-icon="el-icon-search"
-            v-model="deptName"
+            style="margin-bottom: 20px" />
-            placeholder="请输入部门名称"
-            clearable
-            size="small"
-            prefix-icon="el-icon-search"
-            style="margin-bottom: 20px"
-          />
         </div>
         <div class="head-container">
-          <el-tree
+          <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false"
-            :data="deptOptions"
+            :filter-node-method="filterNode" ref="tree" node-key="id" default-expand-all highlight-current
-            :props="defaultProps"
+            @node-click="handleNodeClick" />
-            :expand-on-click-node="false"
-            :filter-node-method="filterNode"
-            ref="tree"
-            node-key="id"
-            default-expand-all
-            highlight-current
-            @node-click="handleNodeClick"
-          />
         </div>
       </el-col>
       <!--用户数据-->
       <el-col :span="20" :xs="24">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+          label-width="68px">
           <el-form-item label="用户名称" prop="userName">
-            <el-input
+            <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable style="width: 240px"
-              v-model="queryParams.userName"
+              @keyup.enter.native="handleQuery" />
-              placeholder="请输入用户名称"
-              clearable
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
           </el-form-item>
           <el-form-item label="手机号码" prop="phonenumber">
-            <el-input
+            <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable style="width: 240px"
-              v-model="queryParams.phonenumber"
+              @keyup.enter.native="handleQuery" />
-              placeholder="请输入手机号码"
-              clearable
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
           </el-form-item>
           <el-form-item label="状态" prop="status">
-            <el-select
+            <el-select v-model="queryParams.status" placeholder="用户状态" clearable style="width: 240px">
-              v-model="queryParams.status"
+              <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label"
-              placeholder="用户状态"
+                :value="dict.value" />
-              clearable
-              style="width: 240px"
-            >
-              <el-option
-                v-for="dict in dict.type.sys_normal_disable"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
             </el-select>
           </el-form-item>
           <el-form-item label="创建时间">
-            <el-date-picker
+            <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
-              v-model="dateRange"
+              range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
-              style="width: 240px"
-              value-format="yyyy-MM-dd"
-              type="daterange"
-              range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-            ></el-date-picker>
           </el-form-item>
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -82,56 +43,24 @@
 
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button
+            <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-              type="primary"
+              v-hasPermi="['system:user:add']">新增</el-button>
-              plain
-              icon="el-icon-plus"
-              size="mini"
-              @click="handleAdd"
-              v-hasPermi="['system:user:add']"
-            >新增</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button
+            <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
-              type="success"
+              v-hasPermi="['system:user:edit']">修改</el-button>
-              plain
-              icon="el-icon-edit"
-              size="mini"
-              :disabled="single"
-              @click="handleUpdate"
-              v-hasPermi="['system:user:edit']"
-            >修改</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button
+            <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-              type="danger"
+              v-hasPermi="['system:user:remove']">删除</el-button>
-              plain
-              icon="el-icon-delete"
-              size="mini"
-              :disabled="multiple"
-              @click="handleDelete"
-              v-hasPermi="['system:user:remove']"
-            >删除</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button
+            <el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleImport"
-              type="info"
+              v-hasPermi="['system:user:import']">导入</el-button>
-              plain
-              icon="el-icon-upload2"
-              size="mini"
-              @click="handleImport"
-              v-hasPermi="['system:user:import']"
-            >导入</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button
+            <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
-              type="warning"
+              v-hasPermi="['system:user:export']">导出</el-button>
-              plain
-              icon="el-icon-download"
-              size="mini"
-              @click="handleExport"
-              v-hasPermi="['system:user:export']"
-            >导出</el-button>
           </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
         </el-row>
@@ -139,18 +68,20 @@
         <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
-          <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible"
-          <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
+            :show-overflow-tooltip="true" />          
-          <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[2].visible"
-          <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
+            :show-overflow-tooltip="true" />
+          <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[3].visible"
+            width="120" />
+          <el-table-column label="角色" align="center" key="nickName" prop="nickName" v-if="columns[4].visible"
+            :show-overflow-tooltip="true">
+            <template slot-scope="{row}">{{ row.roles && row.roles.length>0?row.roles[0].roleName:'' }}</template>
+          </el-table-column>
           <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
             <template slot-scope="scope">
-              <el-switch
+              <el-switch v-model="scope.row.status" active-value="0" inactive-value="1"
-                v-model="scope.row.status"
+                @change="handleStatusChange(scope.row)"></el-switch>
-                active-value="0"
-                inactive-value="1"
-                @change="handleStatusChange(scope.row)"
-              ></el-switch>
             </template>
           </el-table-column>
           <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
@@ -158,28 +89,14 @@
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
           </el-table-column>
-          <el-table-column
+          <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
-            label="操作"
-            align="center"
-            width="160"
-            class-name="small-padding fixed-width"
-          >
             <template slot-scope="scope" v-if="scope.row.userId !== 1">
-              <el-button
+              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                size="mini"
+                v-hasPermi="['system:user:edit']">修改</el-button>
-                type="text"
+              <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                icon="el-icon-edit"
+                v-hasPermi="['system:user:remove']">删除</el-button>
-                @click="handleUpdate(scope.row)"
+              <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)"
-                v-hasPermi="['system:user:edit']"
+                v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
-              >修改</el-button>
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-delete"
-                @click="handleDelete(scope.row)"
-                v-hasPermi="['system:user:remove']"
-              >删除</el-button>
-              <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
                 <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
                 <el-dropdown-menu slot="dropdown">
                   <el-dropdown-item command="handleResetPwd" icon="el-icon-key"
@@ -192,105 +109,69 @@
           </el-table-column>
         </el-table>
 
-        <pagination
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-          v-show="total>0"
+          @pagination="getList" />
-          :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getList"
-        />
       </el-col>
     </el-row>
 
     <!-- 添加或修改用户配置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body :close-on-click-modal="false"
-             :close-on-press-escape="false">
+      :close-on-press-escape="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
-          <el-col :span="12">
+          <el-col :span="24">
-            <el-form-item label="用户昵称" prop="nickName">
+            <el-form-item label="用户名" prop="userName">
-              <el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" />
+              <el-input v-model="form.userName" placeholder="请输入用户名" minlength="2" maxlength="20" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+        </el-row>
+        <el-row>
+          <el-col :span="24">
             <el-form-item label="归属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
+              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门"  @select="doInputDept"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="12">
+          <el-col :span="24">
             <el-form-item label="手机号码" prop="phonenumber">
-              <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
+              <el-input v-model="form.phonenumber" readonly onfocus="this.removeAttribute('readonly');" placeholder="请输入手机号码" maxlength="11" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="邮箱" prop="email">
-              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
             </el-form-item>
           </el-col>          
         </el-row>
         <el-row>
-          <el-col :span="12">
+          <el-col :span="24">
-            <el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
+            <el-form-item  label="用户密码" prop="password">
-              <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
+              <el-input v-model="form.password" readonly onfocus="this.removeAttribute('readonly');" placeholder="请输入用户密码" type="password" maxlength="20" show-password />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
-              <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>          
-          <el-col :span="12">
-            <el-form-item label="用户性别">
-              <el-select v-model="form.sex" placeholder="请选择性别">
-                <el-option
-                  v-for="dict in dict.type.sys_user_sex"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
           <el-col :span="12">
             <el-form-item label="状态">
               <el-radio-group v-model="form.status">
-                <el-radio
+                <el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value"
-                  v-for="dict in dict.type.sys_normal_disable"
+                  :label="dict.value">{{ dict.label }}</el-radio>
-                  :key="dict.value"
-                  :label="dict.value"
-                >{{dict.label}}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="12">
+          <el-col :span="24">
-            <el-form-item label="岗位">
+            <el-form-item label="角色">
-              <el-select v-model="form.postIds" multiple placeholder="请选择岗位">
+              <el-select v-model="form.roleId" placeholder="请选择角色">
-                <el-option
+                <el-option v-for="item in roleOptions" :key="item.roleId" :label="item.roleName" :value="item.roleId"
-                  v-for="item in postOptions"
+                  :disabled="item.status == 1"></el-option>
-                  :key="item.postId"
-                  :label="item.postName"
-                  :value="item.postId"
-                  :disabled="item.status == 1"
-                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+        </el-row>
-            <el-form-item label="角色">
+        <el-row>
-              <el-select v-model="form.roleIds" multiple placeholder="请选择角色">
+          <el-col :span="24">
-                <el-option
+            <el-form-item label="岗位">
-                  v-for="item in roleOptions"
+              <el-select v-model="form.postIds" multiple placeholder="请选择岗位">
-                  :key="item.roleId"
+                <el-option v-for="item in postOptions" :key="item.postId" :label="item.postName" :value="item.postId"
-                  :label="item.roleName"
+                  :disabled="item.status == 1"></el-option>
-                  :value="item.roleId"
-                  :disabled="item.status == 1"
-                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -310,20 +191,11 @@
     </el-dialog>
 
     <!-- 用户导入对话框 -->
-    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body :close-on-click-modal="false"
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body
-             :close-on-press-escape="false">
+      :close-on-click-modal="false" :close-on-press-escape="false">
-      <el-upload
+      <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
-        ref="upload"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
-        :limit="1"
+        :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
-        accept=".xlsx, .xls"
-        :headers="upload.headers"
-        :action="upload.url + '?updateSupport=' + upload.updateSupport"
-        :disabled="upload.isUploading"
-        :on-progress="handleFileUploadProgress"
-        :on-success="handleFileSuccess"
-        :auto-upload="false"
-        drag
-      >
         <i class="el-icon-upload"></i>
         <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
         <div class="el-upload__tip text-center" slot="tip">
@@ -331,7 +203,8 @@
             <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
           </div>
           <span>仅允许导入xls、xlsx格式文件。</span>
-          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
+          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;"
+            @click="importTemplate">下载模板</el-link>
         </div>
       </el-upload>
       <div slot="footer" class="dialog-footer">
@@ -384,6 +257,7 @@ export default {
       postOptions: [],
       // 角色选项
       roleOptions: [],
+      oldRoleOptions:[],
       // 表单参数
       form: {},
       defaultProps: {
@@ -418,38 +292,35 @@ export default {
       columns: [
         { key: 0, label: `用户编号`, visible: true },
         { key: 1, label: `用户名称`, visible: true },        
-        { key: 2, label: `用户昵称`, visible: true },
+        { key: 2, label: `部门`, visible: true },
-        { key: 3, label: `部门`, visible: true },
+        { key: 3, label: `手机号码`, visible: true },
-        { key: 4, label: `手机号码`, visible: true },
+        { key: 4, label: `角色`, visible: true },
         { key: 5, label: `状态`, visible: true },
         { key: 6, label: `创建时间`, visible: true }
       ],
       // 表单校验
       rules: {
         userName: [
-          { required: true, message: "用户名称不能为空", trigger: "blur" },
+          { required: true, message: "用户昵称不能为空", trigger: "blur" },
-          { min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur' }
+          { min: 2, max: 20, message: '用户昵称长度必须介于 2 和 20 之间', trigger: 'blur' }
         ],
-        nickName: [
+        deptId: [
-          { required: true, message: "用户昵称不能为空", trigger: "blur" }
+          { required: true, message: "归属部门不能为空", trigger: "blur" },          
-        ],
-        password: [
-          { required: true, message: "用户密码不能为空", trigger: "blur" },
-          { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }
-        ],
-        email: [
-          {
-            type: "email",
-            message: "请输入正确的邮箱地址",
-            trigger: ["blur", "change"]
-          }
         ],
         phonenumber: [
+          { required: true, message: "手机号码不能为空", trigger: "blur" },
           {
             pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
             message: "请输入正确的手机号码",
             trigger: "blur"
           }
+        ],
+        password: [
+          { required: true, message: "用户密码不能为空", trigger: "blur" },
+          { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }
+        ],       
+        roleId: [
+        { required: true, message: "请选择角色", trigger: "blur" },
         ]
       }
     };
@@ -468,14 +339,28 @@ export default {
     });
   },
   methods: {
+    doInputDept(a,b,c){
+      if(a.id==100){
+        setTimeout(()=>{
+          this.form.deptId=undefined;
+        },400);
+      }else{
+        if(a.data.status=='2'){//公司
+          this.roleOptions=this.oldRoleOptions.filter(d=>{
+            return d.roleName=="公司管理员"||d.roleName=="普通角色";
+          })
+        }
+
+      }
+    },
     /** 查询用户列表 */
     getList() {
       this.loading = true;
       listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-          this.userList = response.rows;
+        this.userList = response.rows;
-          this.total = response.total;
+        this.total = response.total;
-          this.loading = false;
+        this.loading = false;
-        }
+      }
       );
     },
     /** 查询部门下拉树结构 */
@@ -497,11 +382,11 @@ export default {
     // 用户状态修改
     handleStatusChange(row) {
       let text = row.status === "0" ? "启用" : "停用";
-      this.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗？').then(function() {
+      this.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗？').then(function () {
         return changeUserStatus(row.userId, row.status);
       }).then(() => {
         this.$modal.msgSuccess(text + "成功");
-      }).catch(function() {
+      }).catch(function () {
         row.status = row.status === "0" ? "1" : "0";
       });
     },
@@ -566,9 +451,10 @@ export default {
       getUser().then(response => {
         this.postOptions = response.posts;
         this.roleOptions = response.roles;
+        this.oldRoleOptions=response.roles;
         this.open = true;
         this.title = "添加用户";
-        this.form.password = this.initPassword;
+        this.form.password = '';
       });
     },
     /** 修改按钮操作 */
@@ -579,6 +465,7 @@ export default {
         this.form = response.data;
         this.postOptions = response.posts;
         this.roleOptions = response.roles;
+        this.oldRoleOptions=response.roles;
         this.$set(this.form, "postIds", response.postIds);
         this.$set(this.form, "roleIds", response.roleIds);
         this.open = true;
@@ -595,20 +482,22 @@ export default {
         inputPattern: /^.{5,20}$/,
         inputErrorMessage: "用户密码长度必须介于 5 和 20 之间"
       }).then(({ value }) => {
-          resetUserPwd(row.userId, value).then(response => {
+        resetUserPwd(row.userId, value).then(response => {
-            this.$modal.msgSuccess("修改成功，新密码是：" + value);
+          this.$modal.msgSuccess("修改成功，新密码是：" + value);
-          });
+        });
-        }).catch(() => {});
+      }).catch(() => { });
     },
     /** 分配角色操作 */
-    handleAuthRole: function(row) {
+    handleAuthRole: function (row) {
       const userId = row.userId;
       this.$router.push("/system/user-auth/role/" + userId);
     },
     /** 提交按钮 */
-    submitForm: function() {
+    submitForm: function () {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.form.roleIds=[this.form.roleId];
+          this.form.nickName=this.form.userName;
           if (this.form.userId != undefined) {
             updateUser(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
@@ -628,12 +517,12 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const userIds = row.userId || this.ids;
-      this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function () {
         return delUser(userIds);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {