|
|
@@ -26,7 +26,7 @@
|
|
|
<el-input
|
|
|
:maxlength="20"
|
|
|
v-model="queryParams.username"
|
|
|
- placeholder="请输入账号"
|
|
|
+ placeholder="请输入关键字"
|
|
|
clearable
|
|
|
style="width: 200px"
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
@@ -36,7 +36,7 @@
|
|
|
<el-input
|
|
|
:maxlength="50"
|
|
|
v-model="queryParams.name"
|
|
|
- placeholder="请输入姓名"
|
|
|
+ placeholder="请输入关键字"
|
|
|
clearable
|
|
|
style="width: 200px"
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
@@ -74,7 +74,7 @@
|
|
|
/>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="管理人员" prop="isLock">
|
|
|
+ <el-form-item label="安保部门从业人员" prop="isLock">
|
|
|
<el-switch
|
|
|
v-model="queryParams.onlyManager"
|
|
|
active-text=""
|
|
|
@@ -82,7 +82,7 @@
|
|
|
>
|
|
|
</el-switch>
|
|
|
</el-form-item>
|
|
|
- <el-form-item>
|
|
|
+ <!-- <el-form-item>
|
|
|
<el-button
|
|
|
type="primary"
|
|
|
icon="el-icon-search"
|
|
|
@@ -93,7 +93,7 @@
|
|
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
|
|
|
>重置</el-button
|
|
|
>
|
|
|
- </el-form-item>
|
|
|
+ </el-form-item> -->
|
|
|
<!-- <el-form-item label="创建时间">
|
|
|
<el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
|
|
|
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
|
|
|
@@ -102,13 +102,25 @@
|
|
|
<!-- 按纽 -->
|
|
|
<el-row :gutter="10">
|
|
|
<el-col :span="1.5">
|
|
|
+ <el-button
|
|
|
+ type="primary"
|
|
|
+ icon="el-icon-search"
|
|
|
+ size="mini"
|
|
|
+ @click="handleQuery"
|
|
|
+ >搜索</el-button>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="1.5">
|
|
|
+ <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery"
|
|
|
+ >重置</el-button>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="1.5">
|
|
|
<el-button
|
|
|
type="primary"
|
|
|
icon="el-icon-plus"
|
|
|
size="mini"
|
|
|
@click="handleAdd"
|
|
|
v-hasPermi="['system:user:add']"
|
|
|
- >新增</el-button
|
|
|
+ >新增人员</el-button
|
|
|
>
|
|
|
</el-col>
|
|
|
<!-- <el-col :span="1.5">
|
|
|
@@ -127,7 +139,7 @@
|
|
|
size="mini"
|
|
|
@click="handleImport"
|
|
|
v-hasPermi="['system:user:import']"
|
|
|
- >导入</el-button
|
|
|
+ >导入人员</el-button
|
|
|
>
|
|
|
</el-col>
|
|
|
|
|
|
@@ -139,7 +151,7 @@
|
|
|
size="mini"
|
|
|
@click="handleExport"
|
|
|
v-hasPermi="['system:user:export']"
|
|
|
- >导出用户角色</el-button
|
|
|
+ >导出人员</el-button
|
|
|
>
|
|
|
</el-col>
|
|
|
<el-col :span="1.5">
|
|
|
@@ -179,7 +191,7 @@
|
|
|
align="center"
|
|
|
key="username"
|
|
|
prop="username"
|
|
|
- width="120"
|
|
|
+ width="100"
|
|
|
v-if="columns[0].visible"
|
|
|
/>
|
|
|
<el-table-column
|
|
|
@@ -187,7 +199,7 @@
|
|
|
align="center"
|
|
|
key="name"
|
|
|
prop="name"
|
|
|
- width="120"
|
|
|
+ width="100"
|
|
|
v-if="columns[1].visible"
|
|
|
:show-overflow-tooltip="true"
|
|
|
/>
|
|
|
@@ -195,6 +207,7 @@
|
|
|
<el-table-column
|
|
|
label="所属机构"
|
|
|
align="left"
|
|
|
+ header-align="center"
|
|
|
key="orgName"
|
|
|
prop="orgName"
|
|
|
width="180"
|
|
|
@@ -204,6 +217,7 @@
|
|
|
<el-table-column
|
|
|
label="用户角色"
|
|
|
align="left"
|
|
|
+ header-align="center"
|
|
|
prop="roles"
|
|
|
width="300"
|
|
|
v-if="columns[2].visible"
|
|
|
@@ -231,7 +245,7 @@
|
|
|
key="isLock"
|
|
|
prop="isLock"
|
|
|
v-if="columns[4].visible"
|
|
|
- width="80"
|
|
|
+ width="60"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<dict-tag
|
|
|
@@ -241,12 +255,12 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- label="管理人员"
|
|
|
+ label="安保部门从业人员"
|
|
|
align="center"
|
|
|
key="isManager"
|
|
|
prop="isManager"
|
|
|
v-if="columns[5].visible"
|
|
|
- width="100"
|
|
|
+ width="160"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
{{ scope.row.isManage === "Y" ? "是" : "否" }}
|
|
|
@@ -271,7 +285,8 @@
|
|
|
<el-table-column
|
|
|
label="操作"
|
|
|
align="left"
|
|
|
- width="220"
|
|
|
+ header-align="center"
|
|
|
+ width="300"
|
|
|
fixed="right"
|
|
|
class-name="small-padding fixed-width"
|
|
|
>
|
|
|
@@ -286,8 +301,8 @@
|
|
|
v-hasPermi="['system:user:extend']"
|
|
|
>补充信息</el-button
|
|
|
>
|
|
|
- <span v-else style="display: inline-block;width: 70px;height: 20px;"></span>
|
|
|
- <el-divider direction="vertical"></el-divider>
|
|
|
+ <!-- <span v-else style="display: inline-block;width: 70px;height: 20px;"></span> -->
|
|
|
+ <!-- <el-divider direction="vertical"></el-divider> -->
|
|
|
<el-button
|
|
|
size="mini"
|
|
|
type="text"
|
|
|
@@ -296,8 +311,28 @@
|
|
|
v-hasPermi="['system:user:edit']"
|
|
|
>编辑</el-button
|
|
|
>
|
|
|
- <el-divider direction="vertical"></el-divider>
|
|
|
- <el-dropdown
|
|
|
+
|
|
|
+ <el-button
|
|
|
+ size="mini"
|
|
|
+ type="text"
|
|
|
+ icon="el-icon-delete"
|
|
|
+ v-if="scope.row.source==0"
|
|
|
+ @click="handleDelete(scope.row)"
|
|
|
+ v-hasPermi="['system:user:remove']"
|
|
|
+ >删除</el-button
|
|
|
+ >
|
|
|
+
|
|
|
+ <el-button
|
|
|
+ size="mini"
|
|
|
+ type="text"
|
|
|
+ icon="el-icon-key"
|
|
|
+ v-if="scope.row.source==0"
|
|
|
+ @click="handleResetPwd(scope.row)"
|
|
|
+ v-hasPermi="['system:user:resetPwd']"
|
|
|
+ >重置密码</el-button
|
|
|
+ >
|
|
|
+ <!-- <el-divider direction="vertical"></el-divider> -->
|
|
|
+ <!-- <el-dropdown
|
|
|
size="mini"
|
|
|
@command="(command) => handleCommand(command, scope.row)"
|
|
|
v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
|
|
|
@@ -322,7 +357,7 @@
|
|
|
v-hasPermi="['system:user:remove']"
|
|
|
>删除</el-dropdown-item>
|
|
|
</el-dropdown-menu>
|
|
|
- </el-dropdown>
|
|
|
+ </el-dropdown> -->
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
@@ -347,7 +382,7 @@
|
|
|
v-model="form.username"
|
|
|
placeholder="请输入账号"
|
|
|
:maxlength="20"
|
|
|
- :readonly="form.source == 1"
|
|
|
+ :disabled="form.source == 1"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -371,7 +406,7 @@
|
|
|
v-model="form.name"
|
|
|
placeholder="请输入姓名"
|
|
|
maxlength="30"
|
|
|
- :readonly="form.source == 1"
|
|
|
+ :disabled="form.source == 1"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
@@ -735,7 +770,7 @@ export default {
|
|
|
const strArr = content.toString().split(",");
|
|
|
let rel = "";
|
|
|
strArr.forEach(function (item, index, arr) {
|
|
|
- let ops = `<span style="color: #008CD6;"> ${item} </span> `;
|
|
|
+ let ops = `<span style="color: #606266;"> ${item} </span> `;
|
|
|
rel = rel == "" ? ops : rel + " || " + ops;
|
|
|
});
|
|
|
return rel;
|
zhulu