sxyanzhu
/
YanZhuProject
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update code

main
haha 2024-09-02 22:03:50 +08:00
parent 92e9bed75a
commit 0eda1a58a7
3 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yanzhu-mapper/src/main/resources/mapper/project/ProProjectInfoMapper.xml
View File

@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where>
<if test="no != null and no != ''"> and no = #{no}</if>
<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
<if test="deptId != null "> and dept_id = #{deptId}</if>
<if test="deptId != null "> and dept_id in (select dept_id from sys_dept where dept_id=#{deptId} or find_in_set(#{deptId}, ancestors)) </if>
<if test="personName != null and personName != ''"> and person_name like concat('%', #{personName}, '%')</if>
<if test="personPhone != null and personPhone != ''"> and person_phone = #{personPhone}</if>
<if test="projStatus != null and projStatus != ''"> and proj_status = #{projStatus}</if>

7
yanzhu-ui/src/views/project/projectInfo/index.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="app-container">
<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="100px">
<el-form-item label="项目名称" prop="name">
<el-input v-model="queryParams.name" placeholder="请输入项目名称" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
@ -175,13 +175,16 @@ export default {
}
};
},
created() {
created() {
this.getList();
},
methods: {
/** 查询项目信息列表 */
getList() {
this.loading = true;
if(this.$store.state.user.roles.indexOf("admin")==-1){
this.queryParams.deptId=this.$store.state.user.dept.deptId;
}
listProjectInfo(this.queryParams).then(response => {
this.projectInfoList = response.rows;
this.total = response.total;

23
yanzhu-ui/src/views/system/user/index.vue
View File

@ -69,12 +69,14 @@
<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" />
:show-overflow-tooltip="true" />
<el-table-column label="姓名" align="center" key="nickName" prop="nickName"
:show-overflow-tooltip="true" />
<el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[2].visible"
: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"
<el-table-column label="角色" align="center" key="roles" prop="roles" 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>
@ -125,6 +127,13 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="姓名" prop="nickName">
<el-input v-model="form.nickName" placeholder="请输入姓名" minlength="2" maxlength="20" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="归属部门" prop="deptId">
@ -300,6 +309,10 @@ export default {
],
// 表单校验
rules: {
userName: [
{ required: true, message: "用户昵称不能为空", trigger: "blur" },
{ min: 2, max: 20, message: '用户昵称长度必须介于 2 和 20 之间', trigger: 'blur' }
],
userName: [
{ required: true, message: "用户昵称不能为空", trigger: "blur" },
{ min: 2, max: 20, message: '用户昵称长度必须介于 2 和 20 之间', trigger: 'blur' }
@ -474,6 +487,10 @@ export default {
{ required: true, message: "用户昵称不能为空", trigger: "blur" },
{ min: 2, max: 20, message: '用户昵称长度必须介于 2 和 20 之间', trigger: 'blur' }
],
nickName: [
{ required: true, message: "用户昵称不能为空", trigger: "blur" },
{ min: 2, max: 20, message: '用户昵称长度必须介于 2 和 20 之间', trigger: 'blur' }
],
deptId: [
{ required: true, message: "归属部门不能为空", trigger: "blur" },
],
@ -578,7 +595,7 @@ export default {
this.$refs["form"].validate(valid => {
if (valid) {
//this.form.roleIds=[this.form.roleId];
this.form.nickName=this.form.userName;
//this.form.nickName=this.form.userName;
if (this.form.userId != undefined) {
updateUser(this.form).then(response => {
this.$modal.msgSuccess("修改成功");