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

Merge branch 'main' of http://62.234.3.186:3000/sxyanzhu/YanZhuProject 

# Conflicts:
#	yanzhu-ui/src/views/base/assetsType/index.vue
main
姜玉琦 2024-08-29 22:58:53 +08:00
parent dd04c1adf5 c55cd0599b
commit afc6f5afcc
3 changed files with 65 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
yanzhu-ui/src/views/base/assetsType/index.vue
View File

@ -91,8 +91,8 @@
@pagination="getList" />
<!-- 添加或修改物资类型对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body custom-class="assets-type-dialog" :close-on-click-modal="false"
:close-on-press-escape="false">
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body custom-class="assets-type-dialog"
:close-on-click-modal="false" :close-on-press-escape="false">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="公司名称" v-if="nonAdmin">
<el-input v-model="form.compName" disabled />
@ -117,9 +117,15 @@
<el-form-item label="资产单位" prop="sunit" v-if="form.parentId">
<el-input v-model="form.sunit" placeholder="请输入资产单位" />
</el-form-item>
<<<<<<< HEAD
<div class="div-unit" v-if="form.parentId">
<el-tag v-for="(it, idx) in units" :class="{ 'is-selected': it.sel, 'is-del': it.del }" @close="doCloseTag(it, idx)"
:closable="!it.sys" @click="doSelTag(it)" :key="idx">
=======
<div class="div-unit">
<el-tag v-for="(it, idx) in units" :class="{ 'is-selected': it.sel, 'is-del': it.del }"
@close="doCloseTag(it, idx)" :closable="!it.sys" @click="doSelTag(it)" :key="idx">
>>>>>>> c55cd0599b359c435db26a66f3232d599b2d2048
<i class="el-icon-check"></i>
{{ it.text }}
</el-tag>
@ -291,7 +297,7 @@ export default {
deptId: this.nonAdmin?this.queryParams.defaultDeptId:null,
type: null,
name: null,
sunit: null,
sunit: "",
unit: null,
isDel: null,
createBy: null,
@ -342,6 +348,7 @@ export default {
handleUpdate(row) {
this.reset();
const id = row.id || this.ids
<<<<<<< HEAD
if(row.unit){
let tmps=row.unit.split(",").filter(d=>d);
let uns=this.units.map(d=>d.text).join(",")
@ -358,8 +365,24 @@ export default {
it.sel=(","+row.unit+",").indexOf(","+it.text+",")>=0;
});
}
=======
let tmps = row.unit.split(",").filter(d => d);
let uns = this.units.map(d => d.text).join(",")
tmps.forEach(it => {
if (("," + uns + ",").indexOf("," + it + ",") == -1) {
this.units.push({
text: it,
del: false,
sys: false
})
}
});
this.units.forEach(it => {
it.sel = ("," + row.unit + ",").indexOf("," + it.text + ",") >= 0;
});
>>>>>>> c55cd0599b359c435db26a66f3232d599b2d2048
getAssetsType(id).then(response => {
this.form = {...response.data,sunit:''};
this.form = { ...response.data, sunit: '' };
this.open = true;
this.title = "修改物资类型";
});
@ -483,4 +506,5 @@ export default {
}
}
}
}</style>
}
</style>

85
yanzhu-ui/src/views/system/role/authUser.vue
View File

@ -1,23 +1,13 @@
<template>
<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="userName">
<el-input
v-model="queryParams.userName"
placeholder="请输入用户名称"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable style="width: 240px"
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="手机号码" prop="phonenumber">
<el-input
v-model="queryParams.phonenumber"
placeholder="请输入手机号码"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable style="width: 240px"
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@ -27,34 +17,15 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="openSelectUser"
v-hasPermi="['system:role:add']"
>添加用户</el-button>
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="openSelectUser"
v-hasPermi="['system:role:add']">添加用户</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-circle-close"
size="mini"
:disabled="multiple"
@click="cancelAuthUserAll"
v-hasPermi="['system:role:remove']"
>批量取消授权</el-button>
<el-button type="danger" plain icon="el-icon-circle-close" size="mini" :disabled="multiple"
@click="cancelAuthUserAll" v-hasPermi="['system:role:remove']">批量取消授权</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-close"
size="mini"
@click="handleClose"
>关闭</el-button>
<el-button type="warning" plain icon="el-icon-close" size="mini" @click="handleClose">关闭</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@ -67,7 +38,7 @@
<el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />
<el-table-column label="状态" align="center" prop="status">
<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>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
@ -77,24 +48,14 @@
</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-circle-close"
@click="cancelAuthUser(scope.row)"
v-hasPermi="['system:role:remove']"
>取消授权</el-button>
<el-button size="mini" type="text" icon="el-icon-circle-close" @click="cancelAuthUser(scope.row)"
v-hasPermi="['system:role:remove']">取消授权</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
<select-user ref="select" :roleId="queryParams.roleId" @ok="handleQuery" />
</div>
</template>
@ -143,10 +104,10 @@ export default {
getList() {
this.loading = true;
allocatedUserList(this.queryParams).then(response => {
this.userList = response.rows;
this.total = response.total;
this.loading = false;
}
this.userList = response.rows;
this.total = response.total;
this.loading = false;
}
);
},
// 返回按钮
@ -176,23 +137,23 @@ export default {
/** 取消授权按钮操作 */
cancelAuthUser(row) {
const roleId = this.queryParams.roleId;
this.$modal.confirm('确认要取消该用户"' + row.userName + '"角色吗？').then(function() {
this.$modal.confirm('确认要取消该用户"' + row.userName + '"角色吗？').then(function () {
return authUserCancel({ userId: row.userId, roleId: roleId });
}).then(() => {
this.getList();
this.$modal.msgSuccess("取消授权成功");
}).catch(() => {});
}).catch(() => { });
},
/** 批量取消授权按钮操作 */
cancelAuthUserAll(row) {
const roleId = this.queryParams.roleId;
const userIds = this.userIds.join(",");
this.$modal.confirm('是否取消选中用户授权数据项？').then(function() {
this.$modal.confirm('是否取消选中用户授权数据项？').then(function () {
return authUserCancelAll({ roleId: roleId, userIds: userIds });
}).then(() => {
this.getList();
this.$modal.msgSuccess("取消授权成功");
}).catch(() => {});
}).catch(() => { });
}
}
};

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

@ -128,7 +128,7 @@
<el-row>
<el-col :span="24">
<el-form-item label="归属部门" prop="deptId">
<treeselect ref="treeSel"v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" @select="doInputDept"/>
<treeselect ref="treeSel" v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" @select="doInputDept"/>
</el-form-item>
</el-col>
</el-row>
@ -346,6 +346,7 @@ export default {
this.form.deptId=undefined;
},400);
}else{
debugger
if(a.data.level==1){//公司
this.roleOptions=this.oldRoleOptions.filter(d=>{
return d.roleName=="公司管理员"||d.roleName=="普通角色";
@ -354,13 +355,16 @@ export default {
this.roleOptions=this.oldRoleOptions.filter(d=>{
return d.roleName=="段队管理员"||d.roleName=="普通角色";
});
}else if(a.data.level==300){//项目
}else if(a.data.level==300){//项目
this.roleOptions=this.oldRoleOptions.filter(d=>{
return d.roleName=="项目管理员"||d.roleName=="普通角色";
return [2,3,4,5,8].indexOf(d.roleId)>=0;
});
}else{
let node=this.$refs.treeSel.selectedNodes[0];
let plevel=node.parentNode?.raw?.data?.level||0;
let roles=[2,3,4,5];
this.roleOptions=this.oldRoleOptions.filter(d=>{
return d.roleName=="公司管理员"||d.roleName=="普通角色";
return roles.indexOf(d.roleId)>=0;
});
}
@ -477,7 +481,7 @@ export default {
handleUpdate(row) {
this.reset();
const userId = row.userId || this.ids;
getUser(userId).then(response => {
getUser(userId).then(response => {
this.form = response.data;
this.postOptions = response.posts;
this.roleOptions = response.roles;
@ -491,6 +495,10 @@ export default {
let node=this.$refs.treeSel.getNode(this.form.deptId);
this.$refs.treeSel.select(node);
this.doInputDept(node.raw);
let roles=response.data.roles;
if(roles.length>0){
this.form.roleId=roles[0].roleId;
}
const func=p=>{
p.isExpanded=true;
if(p.parentNode){