fead:医生管理

admin-ui/src/components/dtree.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="head-container" style="margin-top: -7px"><el-input v-model="deptName" placeholder="请输入栏目名称" clearable prefix-icon="el-icon-search" style="margin-bottom: 10px" /></div>
+    <div class="head-container" style="margin-top: -7px"><el-input v-model="deptName" placeholder="请输入科室名称" clearable prefix-icon="el-icon-search" style="margin-bottom: 10px" /></div>
     <div class="head-container" style="height: calc(100vh - 203px); overflow-y: auto">
       <el-tree :data="deptOptions" :props="defaultProps" :current-node-key="value" :expand-on-click-node="false" :default-expanded-keys="idArr" :filter-node-method="filterNode" ref="tree" node-key="id" highlight-current @node-click="handleNodeClick" />
     </div>

admin-ui/src/views/system/dept/edit.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="cmain">
-    <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <el-form ref="form" :model="form" :rules="rules" label-width="100px">
       <el-form-item label="上级科室" prop="parentId" v-if="form.parentId !== 0">
         <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级科室" />
       </el-form-item>
@@ -69,9 +69,6 @@ export default {
       this.form.parentId = this.param.parentId;
       this.form.ancestors = this.param.ancestors;
       this.form.ancestors.push(1);
-      console.log('asd:' + this.form.ancestors);
-      console.log('asd:' + this.form.parentId);
-      this.$forceUpdate();
     }
   },
   methods: {

admin-ui/src/views/system/user/edit.vue

@@ -0,0 +1,128 @@
+<template>
+  <div class="cmain">
+    <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+      <el-row>
+        <el-col :span="12">
+          <el-form-item v-if="form.userId == undefined" label="账号" prop="userName">
+            <el-input v-model="form.userName" placeholder="请输入账号" maxlength="30" auto-complete="456" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item v-if="form.userId == undefined" label="密码">
+            <el-input placeholder="默认密码是123456" maxlength="20" :disabled="true" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="姓名" prop="nickName"><el-input v-model="form.nickName" placeholder="请输入姓名" maxlength="30" /></el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="手机" prop="phonenumber"><el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" /></el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="科室" prop="deptId">
+            <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择所属科室" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="角色">
+            <el-select v-model="form.roleIds" multiple placeholder="请选择角色">
+              <el-option v-for="item in roleOptions" :key="item.roleId" :label="item.roleName" :value="item.roleId" :disabled="item.status == 1"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-form-item label="简介" prop="remark">
+        <editor v-model="form.remark" placeholder="请输入"></editor>
+      </el-form-item>
+    </el-form>
+    <div class="mfooter">
+      <el-button type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="$layer.close(layerid)">取 消</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from '@/api/system/user';
+import Treeselect from '@riophae/vue-treeselect';
+import '@riophae/vue-treeselect/dist/vue-treeselect.css';
+export default {
+  dicts: ['sys_normal_disable'],
+  components: { Treeselect },
+  data() {
+    return {
+      form: {},
+      // 岗位选项
+      postOptions: [],
+      // 角色选项
+      roleOptions: [],
+      deptOptions: [],
+      // 表单校验
+      rules: {
+        userName: [
+          { required: true, message: '账号不能为空', trigger: 'blur' },
+          { min: 2, max: 20, message: '账号长度必须介于 2 和 20 之间', trigger: 'blur' }
+        ],
+        nickName: [{ required: true, message: '姓名不能为空', trigger: 'blur' }],
+        deptId: [{ required: true, message: '科室不能为空', trigger: 'blur' }],
+        phonenumber: [
+          {
+            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+            message: '请输入正确的手机号码',
+            trigger: 'blur'
+          }
+        ]
+      }
+    };
+  },
+  mounted() {
+    if (this.param.id) {
+      getUser(this.param.id).then((response) => {
+        this.form = response.data;
+        this.postOptions = response.posts;
+        this.roleOptions = response.roles;
+        this.form.postIds = response.postIds;
+        this.form.roleIds = response.roleIds;
+        this.form.password = '';
+      });
+    } else {
+      getUser().then((response) => {
+        this.postOptions = response.posts;
+        this.roleOptions = response.roles;
+        this.form.password = 123456;
+      });
+    }
+    this.getDeptTree();
+  },
+  methods: {
+    getDeptTree() {
+      deptTreeSelect().then((response) => {
+        this.deptOptions = response.data;
+      });
+    },
+    submitForm: function () {
+      this.$refs['form'].validate((valid) => {
+        if (valid) {
+          if (this.form.userId != undefined) {
+            updateUser(this.form).then((response) => {
+              this.$modal.msgSuccess('修改成功');
+              this.$layer.close(this.layerid);
+              this.$parent.getList();
+            });
+          } else {
+            addUser(this.form).then((response) => {
+              this.$modal.msgSuccess('新增成功');
+              this.$layer.close(this.layerid);
+              this.$parent.getList();
+            });
+          }
+        }
+      });
+    }
+  }
+};
+</script>

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

@@ -1,538 +1,302 @@
 <template>
-	<div class="app-container">
-		<el-row :gutter="20">
-			<!--部门数据-->
-			<el-col :span="4" :xs="24">
-				<div class="head-container"><el-input v-model="deptName" placeholder="请输入部门名称" clearable prefix-icon="el-icon-search" style="margin-bottom: 20px" /></div>
-				<div class="head-container">
-					<el-tree
-						:data="deptOptions"
-						:props="defaultProps"
-						:expand-on-click-node="false"
-						:filter-node-method="filterNode"
-						ref="tree"
-						default-expand-all
-						highlight-current
-						@node-click="handleNodeClick"
-					/>
-				</div>
-			</el-col>
-			<!--用户数据-->
-			<el-col :span="20" :xs="24">
-				<el-form :model="queryParams" ref="queryForm" :inline="true" >
-					<el-form-item label="账号" prop="userName">
-						<el-input v-model="queryParams.userName" placeholder="请输入账号" clearable @keyup.enter.native="handleQuery" class="se" />
-					</el-form-item>
-					<el-form-item label="手机号" prop="phonenumber">
-						<el-input v-model="queryParams.phonenumber" placeholder="请输入手机号" clearable @keyup.enter.native="handleQuery" class="se" />
-					</el-form-item>
-					<el-form-item label="创建时间">
-						<el-date-picker
-							v-model="dateRange"
-							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" @click="handleQuery">搜索</el-button>
-						<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-					</el-form-item>
-				</el-form>
-				<el-row :gutter="10" class="mb8">
-					<el-col :span="1.5"><el-button type="primary" icon="el-icon-plus" @click="handleAdd" v-hasPermi="['system:user:add']">新增</el-button></el-col>
-					<el-col :span="1.5">
-						<el-button type="success" icon="el-icon-edit" :disabled="single" @click="handleUpdate" v-hasPermi="['system:user:edit']">修改</el-button>
-					</el-col>
-					<el-col :span="1.5">
-						<el-button type="danger" icon="el-icon-delete" :disabled="multiple" @click="handleDelete" v-hasPermi="['system:user:remove']">删除</el-button>
-					</el-col>
-					<el-col :span="1.5"><el-button type="info" icon="el-icon-upload2" @click="handleImport" v-hasPermi="['system:user:import']">导入</el-button></el-col>
-					<el-col :span="1.5"><el-button type="warning" icon="el-icon-download" @click="handleExport" v-hasPermi="['system:user:export']">导出</el-button></el-col>
-
-				</el-row>
-				<el-table border :data="userList" @selection-change="handleSelectionChange" height="calc(100vh - 273px)">
-					<el-table-column type="selection" align="center" width="50" />
-					<el-table-column label="账号" align="center" key="userName" prop="userName" :show-overflow-tooltip="true" width="110" />
-					<el-table-column label="姓名" align="center" key="nickName" prop="nickName" :show-overflow-tooltip="true" width="110" />
-					<el-table-column label="科室" align="center" key="deptName" prop="dept.deptName" :show-overflow-tooltip="true" />
-					<el-table-column label="手机号" align="center" key="phonenumber" prop="phonenumber" width="120" />
-					<el-table-column label="状态" align="center" key="status" width="100">
-						<template slot-scope="scope">
-							<div class="switch">
-								<el-switch v-model="scope.row.status" active-value="0" :width="50" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
-								<span class="zc" v-if="scope.row.status == 0">正常</span>
-								<span class="ty" v-else>停用</span>
-							</div>
-						</template>
-					</el-table-column>
-					<el-table-column label="创建时间" align="center" prop="createTime">
-						<template slot-scope="scope">
-							<span>{{ parseTime(scope.row.createTime) }}</span>
-						</template>
-					</el-table-column>
-					<el-table-column label="操作" align="center" width="160">
-						<template slot-scope="scope" v-if="scope.row.userId !== 1">
-							<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['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']">
-								<span class="el-dropdown-link">
-									<i class="el-icon-d-arrow-right el-icon--right"></i>
-									更多
-								</span>
-								<el-dropdown-menu slot="dropdown">
-									<el-dropdown-item command="handleResetPwd" icon="el-icon-key" v-hasPermi="['system:user:resetPwd']">重置密码</el-dropdown-item>
-									<el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check" v-hasPermi="['system:user:edit']">分配角色</el-dropdown-item>
-								</el-dropdown-menu>
-							</el-dropdown>
-						</template>
-					</el-table-column>
-					<template slot="empty">
-						<el-empty></el-empty>
-					</template>
-				</el-table>
-				<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
-			</el-col>
-		</el-row>
-
-		<!-- 添加或修改用户配置对话框 -->
-		<el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="650px" append-to-body>
-			<el-form ref="form" :model="form" :rules="rules" label-width="80px">
-				<el-row>
-					<el-col :span="12">
-						<el-form-item v-if="form.userId == undefined" label="账号" prop="userName">
-							<el-input v-model="form.userName" placeholder="请输入账号" maxlength="30" />
-						</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="姓名" prop="nickName"><el-input v-model="form.nickName" placeholder="请输入姓名" maxlength="30" /></el-form-item>
-					</el-col>
-					<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-row>
-				<el-row>
-					<el-col :span="12">
-						<el-form-item label="手机" prop="phonenumber"><el-input v-model="form.phonenumber" 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-form-item label="岗位">
-							<el-select v-model="form.postIds" multiple placeholder="请选择岗位">
-								<el-option v-for="item in postOptions" :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-form-item label="科室" prop="deptId">
-							<treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择所属部门" />
-						</el-form-item>
-					</el-col>
-				</el-row>
-				<el-row>
-					<el-col :span="12">
-						<el-form-item label="角色">
-							<el-select v-model="form.roleIds" multiple placeholder="请选择角色">
-								<el-option v-for="item in roleOptions" :key="item.roleId" :label="item.roleName" :value="item.roleId" :disabled="item.status == 1"></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 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-row>
-					<el-col :span="24">
-						<el-form-item label="备注"><el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input></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>
-
-		<!-- 用户导入对话框 -->
-		<el-dialog :title="upload.title" :visible.sync="upload.open" :close-on-click-modal="false" width="400px" append-to-body>
-			<el-upload
-				ref="upload"
-				:limit="1"
-				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">
-					<div class="el-upload__tip" slot="tip">
-						<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>
-				</div>
-			</el-upload>
-			<div slot="footer" class="dialog-footer">
-				<el-button type="primary" @click="submitFileForm">确 定</el-button>
-				<el-button @click="upload.open = false">取 消</el-button>
-			</div>
-		</el-dialog>
-	</div>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <!--部门数据-->
+      <el-col :span="4" :xs="24">
+        <dtree v-model="queryParams.deptId" @handleQuery="handleQuery"></dtree>
+      </el-col>
+      <!--用户数据-->
+      <el-col :span="20" :xs="24">
+        <el-form :model="queryParams" ref="queryForm" :inline="true">
+          <el-form-item label="账号" prop="userName">
+            <el-input v-model="queryParams.userName" placeholder="请输入账号" clearable @keyup.enter.native="handleQuery" class="se" />
+          </el-form-item>
+          <el-form-item label="手机号" prop="phonenumber">
+            <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号" clearable @keyup.enter.native="handleQuery" class="se" />
+          </el-form-item>
+          <el-form-item label="创建时间">
+            <el-date-picker v-model="dateRange" 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" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5"><el-button type="primary" icon="el-icon-plus" @click="handleAdd" v-hasPermi="['system:user:add']">新增</el-button></el-col>
+          <el-col :span="1.5">
+            <el-button type="success" icon="el-icon-edit" :disabled="single" @click="handleUpdate" v-hasPermi="['system:user:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" icon="el-icon-delete" :disabled="multiple" @click="handleDelete" v-hasPermi="['system:user:remove']">删除</el-button>
+          </el-col>
+          <el-col :span="1.5"><el-button type="info" icon="el-icon-upload2" @click="handleImport" v-hasPermi="['system:user:import']">导入</el-button></el-col>
+          <el-col :span="1.5"><el-button type="warning" icon="el-icon-download" @click="handleExport" v-hasPermi="['system:user:export']">导出</el-button></el-col>
+        </el-row>
+        <el-table border :data="userList" @selection-change="handleSelectionChange" height="calc(100vh - 273px)">
+          <el-table-column type="selection" align="center" width="50" />
+          <el-table-column label="账号" align="center" key="userName" prop="userName" :show-overflow-tooltip="true" width="110" />
+          <el-table-column label="姓名" align="center" key="nickName" prop="nickName" :show-overflow-tooltip="true" width="110" />
+          <el-table-column label="手机号" align="center" key="phonenumber" prop="phonenumber" width="120" />
+          <el-table-column label="所属科室" align="center" key="deptName" prop="dept.deptName" :show-overflow-tooltip="true" />
+          <el-table-column label="角色" align="center" width="170">
+            <template slot-scope="scope">
+              <el-tag type="danger" size="mini" style="margin-top: 2px" v-if="scope.row.userName == 'admin'">超级管理员</el-tag>
+              <div v-else>
+                <span v-for="(item, index) in scope.row.rolesGroup.split(',')" style="padding-right: 5px">{{ item }}</span>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="状态" align="center" key="status" width="100">
+            <template slot-scope="scope">
+              <div class="switch">
+                <el-switch v-model="scope.row.status" active-value="0" :width="50" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
+                <span class="zc" v-if="scope.row.status == 0">正常</span>
+                <span class="ty" v-else>停用</span>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="创建时间" align="center" prop="createTime">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.createTime) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center" width="160">
+            <template slot-scope="scope" v-if="scope.row.userId !== 1">
+              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['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']">
+                <span class="el-dropdown-link">
+                  <i class="el-icon-d-arrow-right el-icon--right"></i>
+                  更多
+                </span>
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item command="handleResetPwd" icon="el-icon-key" v-hasPermi="['system:user:resetPwd']">重置密码</el-dropdown-item>
+                  <el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check" v-hasPermi="['system:user:edit']">分配角色</el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </template>
+          </el-table-column>
+          <template slot="empty">
+            <el-empty></el-empty>
+          </template>
+        </el-table>
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
+      </el-col>
+    </el-row>
+    <!-- 用户导入对话框 -->
+    <el-dialog :title="upload.title" :visible.sync="upload.open" :close-on-click-modal="false" width="400px" append-to-body>
+      <el-upload ref="upload" :limit="1" 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">
+          <div class="el-upload__tip" slot="tip">
+            <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>
+        </div>
+      </el-upload>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFileForm">确 定</el-button>
+        <el-button @click="upload.open = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
 import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from '@/api/system/user';
 import { getToken } from '@/utils/auth';
-import Treeselect from '@riophae/vue-treeselect';
-import '@riophae/vue-treeselect/dist/vue-treeselect.css';
-
+import edit from './edit';
 export default {
-	name: 'User',
-	dicts: ['sys_normal_disable', 'sys_user_sex'],
-	components: { Treeselect },
-	data() {
-		return {
-			// 选中数组
-			ids: [],
-			// 非单个禁用
-			single: true,
-			// 非多个禁用
-			multiple: true,
-			// 显示搜索条件
-			showSearch: true,
-			// 总条数
-			total: 0,
-			// 用户表格数据
-			userList: null,
-			// 弹出层标题
-			title: '',
-			// 部门树选项
-			deptOptions: undefined,
-			// 是否显示弹出层
-			open: false,
-			// 部门名称
-			deptName: undefined,
-			// 默认密码
-			initPassword: undefined,
-			// 日期范围
-			dateRange: [],
-			// 岗位选项
-			postOptions: [],
-			// 角色选项
-			roleOptions: [],
-			// 表单参数
-			form: {},
-			defaultProps: {
-				children: 'children',
-				label: 'label'
-			},
-			// 用户导入参数
-			upload: {
-				// 是否显示弹出层（用户导入）
-				open: false,
-				// 弹出层标题（用户导入）
-				title: '',
-				// 是否禁用上传
-				isUploading: false,
-				// 是否更新已经存在的用户数据
-				updateSupport: 0,
-				// 设置上传的请求头部
-				headers: { Authorization: 'Bearer ' + getToken() },
-				// 上传的地址
-				url: process.env.VUE_APP_BASE_API + '/system/user/importData'
-			},
-			// 查询参数
-			queryParams: {
-				pageNum: 1,
-				pageSize: 10,
-				userName: undefined,
-				phonenumber: undefined,
-				status: undefined,
-				deptId: undefined,
-				orderByColumn: 'create_time',
-				isAsc: 'desc'
-			},
-			// 表单校验
-			rules: {
-				userName: [
-					{ required: true, message: '账号不能为空', trigger: 'blur' },
-					{ min: 2, max: 20, message: '账号长度必须介于 2 和 20 之间', trigger: 'blur' }
-				],
-				nickName: [{ 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: [
-					{
-						pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-						message: '请输入正确的手机号码',
-						trigger: 'blur'
-					}
-				]
-			}
-		};
-	},
-	watch: {
-		// 根据名称筛选部门树
-		deptName(val) {
-			this.$refs.tree.filter(val);
-		}
-	},
-	created() {
-		this.getList();
-		this.getDeptTree();
-		this.getConfigKey('sys.user.initPassword').then((response) => {
-			this.initPassword = response.msg;
-		});
-	},
-	methods: {
-		/** 查询用户列表 */
-		getList() {
-			listUser(this.addDateRange(this.queryParams, this.dateRange)).then((response) => {
-				this.userList = response.rows;
-				this.total = response.total;
-			});
-		},
-		/** 查询部门下拉树结构 */
-		getDeptTree() {
-			deptTreeSelect().then((response) => {
-				this.deptOptions = response.data;
-			});
-		},
-		// 筛选节点
-		filterNode(value, data) {
-			if (!value) return true;
-			return data.label.indexOf(value) !== -1;
-		},
-		// 节点单击事件
-		handleNodeClick(data) {
-			this.queryParams.deptId = data.id;
-			this.handleQuery();
-		},
-		// 用户状态修改
-		handleStatusChange(row) {
-			let text = row.status === '0' ? '启用' : '停用';
-			this.$modal
-				.confirm('确认要' + text + '"' + row.userName + '"用户吗？')
-				.then(function () {
-					return changeUserStatus(row.userId, row.status);
-				})
-				.then(() => {
-					this.$modal.msgSuccess(text + '成功');
-				})
-				.catch(function () {
-					row.status = row.status === '0' ? '1' : '0';
-				});
-		},
-		// 取消按钮
-		cancel() {
-			this.open = false;
-			this.reset();
-		},
-		// 表单重置
-		reset() {
-			this.form = {
-				userId: undefined,
-				deptId: undefined,
-				userName: undefined,
-				nickName: undefined,
-				password: undefined,
-				phonenumber: undefined,
-				email: undefined,
-				sex: undefined,
-				status: '0',
-				remark: undefined,
-				postIds: [],
-				roleIds: []
-			};
-			this.resetForm('form');
-		},
-		/** 搜索按钮操作 */
-		handleQuery() {
-			this.queryParams.pageNum = 1;
-			this.getList();
-		},
-		/** 重置按钮操作 */
-		resetQuery() {
-			this.dateRange = [];
-			this.resetForm('queryForm');
-			this.handleQuery();
-		},
-		// 多选框选中数据
-		handleSelectionChange(selection) {
-			this.ids = selection.map((item) => item.userId);
-			this.single = selection.length != 1;
-			this.multiple = !selection.length;
-		},
-		// 更多操作触发
-		handleCommand(command, row) {
-			switch (command) {
-				case 'handleResetPwd':
-					this.handleResetPwd(row);
-					break;
-				case 'handleAuthRole':
-					this.handleAuthRole(row);
-					break;
-				default:
-					break;
-			}
-		},
-		/** 新增按钮操作 */
-		handleAdd() {
-			this.reset();
-			this.open = true;
-			this.title = '添加用户';
-			getUser().then((response) => {
-				this.postOptions = response.posts;
-				this.roleOptions = response.roles;
-				this.form.password = this.initPassword;
-			});
-		},
-		/** 修改按钮操作 */
-		handleUpdate(row) {
-			this.reset();
-			this.open = true;
-			this.title = '修改用户';
-			const userId = row.userId || this.ids;
-			getUser(userId).then((response) => {
-				this.form = response.data;
-				this.postOptions = response.posts;
-				this.roleOptions = response.roles;
-				this.form.postIds = response.postIds;
-				this.form.roleIds = response.roleIds;
-				this.form.password = '';
-			});
-		},
-		/** 重置密码按钮操作 */
-		handleResetPwd(row) {
-			this.$prompt('请输入"' + row.userName + '"的新密码', '提示', {
-				confirmButtonText: '确定',
-				cancelButtonText: '取消',
-				closeOnClickModal: false,
-				inputPattern: /^.{5,20}$/,
-				inputErrorMessage: '用户密码长度必须介于 5 和 20 之间'
-			})
-				.then(({ value }) => {
-					resetUserPwd(row.userId, value).then((response) => {
-						this.$modal.msgSuccess('修改成功，新密码是：' + value);
-					});
-				})
-				.catch(() => {});
-		},
-		/** 分配角色操作 */
-		handleAuthRole: function (row) {
-			const userId = row.userId;
-			this.$router.push('/system/user-auth/role/' + userId);
-		},
-		/** 提交按钮 */
-		submitForm: function () {
-			this.$refs['form'].validate((valid) => {
-				if (valid) {
-					if (this.form.userId != undefined) {
-						updateUser(this.form).then((response) => {
-							this.$modal.msgSuccess('修改成功');
-							this.open = false;
-							this.getList();
-						});
-					} else {
-						addUser(this.form).then((response) => {
-							this.$modal.msgSuccess('新增成功');
-							this.open = false;
-							this.getList();
-						});
-					}
-				}
-			});
-		},
-		/** 删除按钮操作 */
-		handleDelete(row) {
-			const userIds = row.userId || this.ids;
-			this.$modal
-				.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？')
-				.then(function () {
-					return delUser(userIds);
-				})
-				.then(() => {
-					this.getList();
-					this.$modal.msgSuccess('删除成功');
-				})
-				.catch(() => {});
-		},
-		/** 导出按钮操作 */
-		handleExport() {
-			this.download(
-				'system/user/export',
-				{
-					...this.queryParams
-				},
-				`user_${new Date().getTime()}.xlsx`
-			);
-		},
-		/** 导入按钮操作 */
-		handleImport() {
-			this.upload.title = '用户导入';
-			this.upload.open = true;
-		},
-		/** 下载模板操作 */
-		importTemplate() {
-			this.download('system/user/importTemplate', {}, `user_template_${new Date().getTime()}.xlsx`);
-		},
-		// 文件上传中处理
-		handleFileUploadProgress(event, file, fileList) {
-			this.upload.isUploading = true;
-		},
-		// 文件上传成功处理
-		handleFileSuccess(response, file, fileList) {
-			this.upload.open = false;
-			this.upload.isUploading = false;
-			this.$refs.upload.clearFiles();
-			this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + '</div>', '导入结果', {
-				dangerouslyUseHTMLString: true
-			});
-			this.getList();
-		},
-		// 提交上传文件
-		submitFileForm() {
-			this.$refs.upload.submit();
-		}
-	}
+  name: 'User',
+  data() {
+    return {
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 总条数
+      total: 0,
+      // 用户表格数据
+      userList: null,
+      // 日期范围
+      dateRange: [],
+      // 表单参数
+      form: {},
+      // 用户导入参数
+      upload: {
+        // 是否显示弹出层（用户导入）
+        open: false,
+        // 弹出层标题（用户导入）
+        title: '',
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 设置上传的请求头部
+        headers: { Authorization: 'Bearer ' + getToken() },
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + '/system/user/importData'
+      },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        userName: undefined,
+        phonenumber: undefined,
+        status: undefined,
+        deptId: undefined,
+        orderByColumn: 'create_time',
+        isAsc: 'desc'
+      }
+    };
+  },
+  created() {
+    this.getList();
+    this.getConfigKey('sys.user.initPassword').then((response) => {
+      this.initPassword = response.msg;
+    });
+  },
+  methods: {
+    /** 查询用户列表 */
+    getList() {
+      listUser(this.addDateRange(this.queryParams, this.dateRange)).then((response) => {
+        this.userList = response.rows;
+        this.total = response.total;
+      });
+    },
+    // 用户状态修改
+    handleStatusChange(row) {
+      let text = row.status === '0' ? '启用' : '停用';
+      this.$modal
+        .confirm('确认要' + text + '"' + row.userName + '"用户吗？')
+        .then(function () {
+          return changeUserStatus(row.userId, row.status);
+        })
+        .then(() => {
+          this.$modal.msgSuccess(text + '成功');
+        })
+        .catch(function () {
+          row.status = row.status === '0' ? '1' : '0';
+        });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.resetForm('queryForm');
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.userId);
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
+    },
+    // 更多操作触发
+    handleCommand(command, row) {
+      switch (command) {
+        case 'handleResetPwd':
+          this.handleResetPwd(row);
+          break;
+        case 'handleAuthRole':
+          this.handleAuthRole(row);
+          break;
+        default:
+          break;
+      }
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.iframe({ obj: edit, param: {}, title: '新增管理员/医生', width: '55%', height: '78%' });
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      const userId = row.userId || this.ids;
+      this.iframe({ obj: edit, param: { id: userId }, title: '编辑管理员/医生', width: '55%', height: '78%' });
+    },
+    /** 重置密码按钮操作 */
+    handleResetPwd(row) {
+      this.$prompt('请输入"' + row.userName + '"的新密码', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        closeOnClickModal: false,
+        inputPattern: /^.{5,20}$/,
+        inputErrorMessage: '用户密码长度必须介于 5 和 20 之间'
+      })
+        .then(({ value }) => {
+          resetUserPwd(row.userId, value).then((response) => {
+            this.$modal.msgSuccess('修改成功，新密码是：' + value);
+          });
+        })
+        .catch(() => {});
+    },
+    /** 分配角色操作 */
+    handleAuthRole: function (row) {
+      const userId = row.userId;
+      this.$router.push('/system/user-auth/role/' + userId);
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const userIds = row.userId || this.ids;
+      this.$modal
+        .confirm('是否确认删除用户编号为"' + userIds + '"的数据项？')
+        .then(function () {
+          return delUser(userIds);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess('删除成功');
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        'system/user/export',
+        {
+          ...this.queryParams
+        },
+        `user_${new Date().getTime()}.xlsx`
+      );
+    },
+    /** 导入按钮操作 */
+    handleImport() {
+      this.upload.title = '用户导入';
+      this.upload.open = true;
+    },
+    /** 下载模板操作 */
+    importTemplate() {
+      this.download('system/user/importTemplate', {}, `user_template_${new Date().getTime()}.xlsx`);
+    },
+    // 文件上传中处理
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+    },
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      this.upload.open = false;
+      this.upload.isUploading = false;
+      this.$refs.upload.clearFiles();
+      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + '</div>', '导入结果', {
+        dangerouslyUseHTMLString: true
+      });
+      this.getList();
+    },
+    // 提交上传文件
+    submitFileForm() {
+      this.$refs.upload.submit();
+    }
+  }
 };
 </script>

admin-ui/src/views/system/user/profile/index.vue

@@ -12,27 +12,27 @@
             </div>
             <ul class="list-group list-group-striped">
               <li class="list-group-item">
-                <svg-icon icon-class="user" />用户名称
+                登录账户
                 <div class="pull-right">{{ user.userName }}</div>
               </li>
-              <li class="list-group-item">
-                <svg-icon icon-class="phone" />手机号码
+              <li class="list-group-item" v-if="!user.companyId">
+                手机号码
                 <div class="pull-right">{{ user.phonenumber }}</div>
               </li>
-              <li class="list-group-item">
-                <svg-icon icon-class="email" />用户邮箱
+              <li class="list-group-item" v-if="!user.companyId">
+                用户邮箱
                 <div class="pull-right">{{ user.email }}</div>
               </li>
-              <li class="list-group-item">
-                <svg-icon icon-class="tree" />所属部门
+              <li class="list-group-item" v-if="!user.companyId">
+                所属部门
                 <div class="pull-right" v-if="user.dept">{{ user.dept.deptName }} / {{ postGroup }}</div>
               </li>
               <li class="list-group-item">
-                <svg-icon icon-class="peoples" />所属角色
+                所属角色
                 <div class="pull-right">{{ roleGroup }}</div>
               </li>
               <li class="list-group-item">
-                <svg-icon icon-class="date" />创建日期
+                创建日期
                 <div class="pull-right">{{ user.createTime }}</div>
               </li>
             </ul>
@@ -59,20 +59,20 @@
 </template>
 
 <script>
-import userAvatar from "./userAvatar";
-import userInfo from "./userInfo";
-import resetPwd from "./resetPwd";
-import { getUserProfile } from "@/api/system/user";
+import userAvatar from './userAvatar';
+import userInfo from './userInfo';
+import resetPwd from './resetPwd';
+import { getUserProfile } from '@/api/system/user';
 
 export default {
-  name: "Profile",
+  name: 'Profile',
   components: { userAvatar, userInfo, resetPwd },
   data() {
     return {
       user: {},
       roleGroup: {},
       postGroup: {},
-      activeTab: "userinfo"
+      activeTab: 'userinfo'
     };
   },
   created() {
@@ -80,7 +80,7 @@ export default {
   },
   methods: {
     getUser() {
-      getUserProfile().then(response => {
+      getUserProfile().then((response) => {
         this.user = response.data;
         this.roleGroup = response.roleGroup;
         this.postGroup = response.postGroup;

admin-ui/src/views/system/user/profile/resetPwd.vue

@@ -1,29 +1,29 @@
 <template>
   <el-form ref="form" :model="user" :rules="rules" label-width="80px">
     <el-form-item label="旧密码" prop="oldPassword">
-      <el-input v-model="user.oldPassword" placeholder="请输入旧密码" type="password" show-password/>
+      <el-input v-model="user.oldPassword" placeholder="请输入旧密码" type="password" show-password />
     </el-form-item>
     <el-form-item label="新密码" prop="newPassword">
-      <el-input v-model="user.newPassword" placeholder="请输入新密码" type="password" show-password/>
+      <el-input v-model="user.newPassword" placeholder="请输入新密码" type="password" show-password />
     </el-form-item>
     <el-form-item label="确认密码" prop="confirmPassword">
-      <el-input v-model="user.confirmPassword" placeholder="请确认新密码" type="password" show-password/>
+      <el-input v-model="user.confirmPassword" placeholder="请确认新密码" type="password" show-password />
     </el-form-item>
     <el-form-item>
-      <el-button type="primary" size="mini" @click="submit">保存</el-button>
-      <el-button type="danger" size="mini" @click="close">关闭</el-button>
+      <el-button type="primary" @click="submit">保存</el-button>
+      <el-button type="danger" @click="close">关闭</el-button>
     </el-form-item>
   </el-form>
 </template>
 
 <script>
-import { updateUserPwd } from "@/api/system/user";
+import { updateUserPwd } from '@/api/system/user';
 
 export default {
   data() {
     const equalToPassword = (rule, value, callback) => {
       if (this.user.newPassword !== value) {
-        callback(new Error("两次输入的密码不一致"));
+        callback(new Error('两次输入的密码不一致'));
       } else {
         callback();
       }
@@ -36,26 +36,24 @@ export default {
       },
       // 表单校验
       rules: {
-        oldPassword: [
-          { required: true, message: "旧密码不能为空", trigger: "blur" }
-        ],
+        oldPassword: [{ required: true, message: '旧密码不能为空', trigger: 'blur' }],
         newPassword: [
-          { required: true, message: "新密码不能为空", trigger: "blur" },
-          { min: 6, max: 20, message: "长度在 6 到 20 个字符", trigger: "blur" }
+          { required: true, message: '新密码不能为空', trigger: 'blur' },
+          { min: 6, max: 20, message: '长度在 6 到 20 个字符', trigger: 'blur' }
         ],
         confirmPassword: [
-          { required: true, message: "确认密码不能为空", trigger: "blur" },
-          { required: true, validator: equalToPassword, trigger: "blur" }
+          { required: true, message: '确认密码不能为空', trigger: 'blur' },
+          { required: true, validator: equalToPassword, trigger: 'blur' }
         ]
       }
     };
   },
   methods: {
     submit() {
-      this.$refs["form"].validate(valid => {
+      this.$refs['form'].validate((valid) => {
         if (valid) {
-          updateUserPwd(this.user.oldPassword, this.user.newPassword).then(response => {
-            this.$modal.msgSuccess("修改成功");
+          updateUserPwd(this.user.oldPassword, this.user.newPassword).then((response) => {
+            this.$modal.msgSuccess('修改成功');
           });
         }
       });

admin-ui/src/views/system/user/profile/userInfo.vue

@@ -1,29 +1,29 @@
 <template>
   <el-form ref="form" :model="user" :rules="rules" label-width="80px">
-    <el-form-item label="用户昵称" prop="nickName">
+    <el-form-item label="姓名" prop="nickName">
       <el-input v-model="user.nickName" maxlength="30" />
-    </el-form-item> 
-    <el-form-item label="手机号码" prop="phonenumber">
+    </el-form-item>
+    <el-form-item label="手机" prop="phonenumber">
       <el-input v-model="user.phonenumber" maxlength="11" />
     </el-form-item>
-    <el-form-item label="邮箱" prop="email">
+    <el-form-item label="邮箱" prop="email" v-if="!user.companyId">
       <el-input v-model="user.email" maxlength="50" />
     </el-form-item>
-    <el-form-item label="性别">
+    <el-form-item label="性别" v-if="!user.companyId">
       <el-radio-group v-model="user.sex">
         <el-radio label="0">男</el-radio>
         <el-radio label="1">女</el-radio>
       </el-radio-group>
     </el-form-item>
     <el-form-item>
-      <el-button type="primary" size="mini" @click="submit">保存</el-button>
-      <el-button type="danger" size="mini" @click="close">关闭</el-button>
+      <el-button type="primary" @click="submit">保存</el-button>
+      <el-button type="danger" @click="close">关闭</el-button>
     </el-form-item>
   </el-form>
 </template>
 
 <script>
-import { updateUserProfile } from "@/api/system/user";
+import { updateUserProfile } from '@/api/system/user';
 
 export default {
   props: {
@@ -35,23 +35,20 @@ export default {
     return {
       // 表单校验
       rules: {
-        nickName: [
-          { required: true, message: "用户昵称不能为空", trigger: "blur" }
-        ],
+        nickName: [{ required: true, message: '用户昵称不能为空', trigger: 'blur' }],
         email: [
-          { required: true, message: "邮箱地址不能为空", trigger: "blur" },
+          { required: true, message: '邮箱地址不能为空', trigger: 'blur' },
           {
-            type: "email",
-            message: "请输入正确的邮箱地址",
-            trigger: ["blur", "change"]
+            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"
+            message: '请输入正确的手机号码',
+            trigger: 'blur'
           }
         ]
       }
@@ -59,10 +56,13 @@ export default {
   },
   methods: {
     submit() {
-      this.$refs["form"].validate(valid => {
+      this.$refs['form'].validate((valid) => {
         if (valid) {
-          updateUserProfile(this.user).then(response => {
-            this.$modal.msgSuccess("修改成功");
+          updateUserProfile(this.user).then((response) => {
+            this.$modal.msgSuccess('修改成功');
+            setTimeout(() => {
+              location.reload(true);
+            }, 1000);
           });
         }
       });

app/pages/doctor/index.vue

@@ -1,19 +1,56 @@
 <template>
-	<view>
-		
+	<view class="msilde">
+		<view class="left">
+			<u-collapse accordion @open="current = -1">
+				<u-collapse-item :title="d.deptName" name="Docs guide" v-for="(d, index) in list" :key="d.deptName">
+					<view :class="{ active: index == current }" v-for="(i, index) in d.children" :key="i.deptName" class="item" @click="selected(i, index)">{{ i.deptName }}</view>
+				</u-collapse-item>
+			</u-collapse>
+		</view>
+		<view class="right">
+			<view class="list">
+				<view v-for="(item, index) in doctor_list" :key="index" class="item">
+					<image src="../../static/tx.jpg" mode="widthFix" class="head"></image>
+					<view class="name">{{ item.name }}</view>
+				</view>
+			</view>
+		</view>
 	</view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				
-			};
+export default {
+	data() {
+		return {
+			doctor_list: {},
+			current: -1,
+			list: []
+		};
+	},
+	onLoad(e) {
+		this.getData();
+	},
+	methods: {
+		getData() {
+			this.http.request({
+				url: '/app/department/list',
+				success: (res) => {
+					this.list = res.data.data;
+				}
+			});
+		},
+		selected(item, index) {
+			this.current = index;
+			this.http.request({
+				url: '/app/doctor/list',
+				data: { deptId: item.deptId },
+				success: (res) => {
+					this.doctor_list = res.data.data;
+				}
+			});
 		}
 	}
+};
 </script>
 
-<style lang="scss">
-
-</style>
+<style lang="scss"></style>

app/pages/index/index.vue

@@ -18,7 +18,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="item" @click="go()">
+			<view class="item" @click="go('/pages/doctor/index')">
 				<view class="out">
 					<view class="int">
 						<view class="icon" style="color: rgb(72, 154, 253)">&#xe6a3;</view>

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -1,24 +1,5 @@
 package com.ruoyi.web.controller.system;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletResponse;
-
-import com.ruoyi.framework.web.service.SysPermissionService;
-import org.apache.commons.lang3.ArrayUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
@@ -31,10 +12,22 @@ import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.web.service.SysPermissionService;
 import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.system.service.ISysPostService;
 import com.ruoyi.system.service.ISysRoleService;
 import com.ruoyi.system.service.ISysUserService;
+import org.apache.commons.lang3.ArrayUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 用户信息
@@ -67,6 +60,9 @@ public class SysUserController extends BaseController {
     public TableDataInfo list(SysUser user) {
         startPage();
         List<SysUser> list = userService.selectUserList(user);
+        for (SysUser sys : list) {
+            sys.setRolesGroup(userService.selectUserRoleGroup(sys.getUserName()));
+        }
         return getDataTable(list);
     }
 

ruoyi-admin/src/main/java/com/ruoyi/web/work/api/Api_DoctorController.java

@@ -0,0 +1,31 @@
+package com.ruoyi.web.work.api;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.service.ISysUserService;
+import com.ruoyi.web.work.api.config.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/app/doctor")
+public class Api_DoctorController extends BaseController {
+
+    @Autowired
+    private ISysUserService userService;
+
+    @GetMapping("/list")
+    public AjaxResult list(Long deptId) {
+        return AjaxResult.success(userService.selectDoctor(deptId));
+    }
+
+    @GetMapping(value = "/detail/{id}")
+    public AjaxResult detail(@PathVariable("id") Long id) {
+        return AjaxResult.success(userService.detail(id));
+    }
+
+
+}
+

ruoyi-admin/src/main/java/com/ruoyi/web/work/api/config/InterceptorConfig.java

@@ -23,6 +23,7 @@ public class InterceptorConfig implements WebMvcConfigurer {
         registration.excludePathPatterns("/app/user/login"); //排除
         registration.excludePathPatterns("/app/home/**"); //排除
         registration.excludePathPatterns("/app/knowledge/**"); //排除
+        registration.excludePathPatterns("/app/doctor/**"); //排除
         registration.excludePathPatterns("/app/department/**"); //排除
         registration.excludePathPatterns("/app/common/type/*"); //排除
         registration.excludePathPatterns("/app/common/introduction/*"); //排除

ruoyi-admin/src/main/resources/application.yml

@@ -153,6 +153,6 @@ xss:
   # 过滤开关
   enabled: true
   # 排除链接（多个用逗号分隔）
-  excludes: /system/notice,/system/dept
+  excludes: /system/notice,/system/dept,/system/user
   # 匹配链接
   urlPatterns: /system/*,/monitor/*,/tool/*

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -1,17 +1,19 @@
 package com.ruoyi.common.core.domain.entity;
 
-import java.util.Date;
-import java.util.List;
-import javax.validation.constraints.*;
-
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.annotation.Excel.ColumnType;
 import com.ruoyi.common.annotation.Excel.Type;
 import com.ruoyi.common.annotation.Excels;
 import com.ruoyi.common.core.domain.BaseEntity;
 import com.ruoyi.common.xss.Xss;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import java.util.Date;
+import java.util.List;
 
 /**
  * 用户对象 sys_user
@@ -125,6 +127,16 @@ public class SysUser extends BaseEntity {
      */
     private Long roleId;
 
+    private String rolesGroup;
+
+    public String getRolesGroup() {
+        return rolesGroup;
+    }
+
+    public void setRolesGroup(String rolesGroup) {
+        this.rolesGroup = rolesGroup;
+    }
+
     public SysUser() {
 
     }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

@@ -1,19 +1,21 @@
 package com.ruoyi.system.mapper;
 
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
 import com.ruoyi.common.core.domain.entity.SysUser;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * 用户表 数据层
- * 
+ *
  * @author ruoyi
  */
-public interface SysUserMapper
-{
+public interface SysUserMapper {
     /**
      * 根据条件分页查询用户列表
-     * 
+     *
      * @param sysUser 用户信息
      * @return 用户信息集合信息
      */
@@ -21,7 +23,7 @@ public interface SysUserMapper
 
     /**
      * 根据条件分页查询已配用户角色列表
-     * 
+     *
      * @param user 用户信息
      * @return 用户信息集合信息
      */
@@ -29,7 +31,7 @@ public interface SysUserMapper
 
     /**
      * 根据条件分页查询未分配用户角色列表
-     * 
+     *
      * @param user 用户信息
      * @return 用户信息集合信息
      */
@@ -37,7 +39,7 @@ public interface SysUserMapper
 
     /**
      * 通过用户名查询用户
-     * 
+     *
      * @param userName 用户名
      * @return 用户对象信息
      */
@@ -45,7 +47,7 @@ public interface SysUserMapper
 
     /**
      * 通过用户ID查询用户
-     * 
+     *
      * @param userId 用户ID
      * @return 用户对象信息
      */
@@ -53,7 +55,7 @@ public interface SysUserMapper
 
     /**
      * 新增用户信息
-     * 
+     *
      * @param user 用户信息
      * @return 结果
      */
@@ -61,7 +63,7 @@ public interface SysUserMapper
 
     /**
      * 修改用户信息
-     * 
+     *
      * @param user 用户信息
      * @return 结果
      */
@@ -69,16 +71,16 @@ public interface SysUserMapper
 
     /**
      * 修改用户头像
-     * 
+     *
      * @param userName 用户名
-     * @param avatar 头像地址
+     * @param avatar   头像地址
      * @return 结果
      */
     public int updateUserAvatar(@Param("userName") String userName, @Param("avatar") String avatar);
 
     /**
      * 重置用户密码
-     * 
+     *
      * @param userName 用户名
      * @param password 密码
      * @return 结果
@@ -87,7 +89,7 @@ public interface SysUserMapper
 
     /**
      * 通过用户ID删除用户
-     * 
+     *
      * @param userId 用户ID
      * @return 结果
      */
@@ -95,7 +97,7 @@ public interface SysUserMapper
 
     /**
      * 批量删除用户信息
-     * 
+     *
      * @param userIds 需要删除的用户ID
      * @return 结果
      */
@@ -103,7 +105,7 @@ public interface SysUserMapper
 
     /**
      * 校验用户名称是否唯一
-     * 
+     *
      * @param userName 用户名称
      * @return 结果
      */
@@ -124,4 +126,11 @@ public interface SysUserMapper
      * @return 结果
      */
     public SysUser checkEmailUnique(String email);
+
+
+    @Select("SELECT user_id AS id,nick_name AS name,avatar FROM sys_user WHERE dept_id=#{deptId} AND status='0'  ORDER BY user_id DESC")
+    List<Map<String, Object>> selectDoctor(@Param("deptId") Long deptId);
+
+    @Select("SELECT nick_name AS name,avatar,remark FROM sys_user WHERE user_id=#{userId} AND status='0'")
+    Map<String, Object> detail(@Param("userId") Long userId);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

@@ -1,8 +1,10 @@
 package com.ruoyi.system.service;
 
-import java.util.List;
-
 import com.ruoyi.common.core.domain.entity.SysUser;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * 用户 业务层
@@ -203,4 +205,19 @@ public interface ISysUserService {
      * @return 结果
      */
     public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
+
+    /**
+     * 根据部门查询医生
+     * @param deptId
+     * @return
+     */
+   List<Map<String, Object>> selectDoctor(Long deptId);
+
+    /**
+     * 医生详情
+     * @param userId
+     * @return
+     */
+    Map<String, Object> detail(@Param("userId") Long userId);
+
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -1,16 +1,5 @@
 package com.ruoyi.system.service.impl;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-import javax.validation.Validator;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
 import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.domain.entity.SysRole;
@@ -23,13 +12,21 @@ import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.system.domain.SysPost;
 import com.ruoyi.system.domain.SysUserPost;
 import com.ruoyi.system.domain.SysUserRole;
-import com.ruoyi.system.mapper.SysPostMapper;
-import com.ruoyi.system.mapper.SysRoleMapper;
-import com.ruoyi.system.mapper.SysUserMapper;
-import com.ruoyi.system.mapper.SysUserPostMapper;
-import com.ruoyi.system.mapper.SysUserRoleMapper;
+import com.ruoyi.system.mapper.*;
 import com.ruoyi.system.service.ISysConfigService;
 import com.ruoyi.system.service.ISysUserService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import javax.validation.Validator;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 用户 业务层处理
@@ -487,4 +484,14 @@ public class SysUserServiceImpl implements ISysUserService {
         }
         return successMsg.toString();
     }
+
+    @Override
+    public List<Map<String, Object>> selectDoctor(Long deptId) {
+        return userMapper.selectDoctor(deptId);
+    }
+
+    @Override
+    public Map<String, Object> detail(Long userId) {
+        return userMapper.detail(userId);
+    }
 }

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

@@ -57,7 +57,7 @@ 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,d.dept_name,from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
 		where u.del_flag = '0'
 		<if test="userId != null and userId != 0">