代码提交

src/api/company/companyRole.js

@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 查询角色信息列表
+// 查询销售角色列表
 export function listCompanyRole(query) {
   return request({
     url: '/company/companyRole/list',
@@ -9,7 +9,7 @@ export function listCompanyRole(query) {
   })
 }
 
-// 查询角色信息详细
+// 查询销售角色详细
 export function getCompanyRole(roleId) {
   return request({
     url: '/company/companyRole/' + roleId,
@@ -17,7 +17,7 @@ export function getCompanyRole(roleId) {
   })
 }
 
-// 新增角色信息
+// 新增销售角色
 export function addCompanyRole(data) {
   return request({
     url: '/company/companyRole',
@@ -26,7 +26,7 @@ export function addCompanyRole(data) {
   })
 }
 
-// 修改角色信息
+// 修改销售角色
 export function updateCompanyRole(data) {
   return request({
     url: '/company/companyRole',
@@ -35,7 +35,20 @@ export function updateCompanyRole(data) {
   })
 }
 
-// 删除角色信息
+// 修改销售角色状态
+export function changeCompanyRoleStatus(roleId, status) {
+  const data = {
+    roleId,
+    status
+  }
+  return request({
+    url: '/company/companyRole/changeStatus',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除销售角色
 export function delCompanyRole(roleId) {
   return request({
     url: '/company/companyRole/' + roleId,
@@ -43,11 +56,26 @@ export function delCompanyRole(roleId) {
   })
 }
 
-// 导出角色信息
+// 导出销售角色
 export function exportCompanyRole(query) {
   return request({
     url: '/company/companyRole/export',
     method: 'get',
     params: query
   })
-}
+}
+
+// 角色菜单树（含已勾选菜单ID）
+export function companyRoleMenuTreeselect(roleId) {
+  return request({
+    url: '/company/companyMenu/roleMenuTreeselect/' + roleId,
+    method: 'get'
+  })
+}
+
+export function adminRoleOptionselect() {
+  return request({
+    url: '/company/companyRole/adminOptionselect',
+    method: 'get'
+  })
+}

src/api/his/company.js

@@ -138,3 +138,20 @@ export function saveCompanyErpInfo(data) {
     data: data
   })
 }
+
+// 查询公司当前管理员角色
+export function getCompanyAdminRole(companyId) {
+  return request({
+    url: '/his/company/adminRole/' + companyId,
+    method: 'get'
+  })
+}
+
+// 设置公司管理员角色
+export function setCompanyAdminRole(data) {
+  return request({
+    url: '/his/company/setAdminRole',
+    method: 'put',
+    data: data
+  })
+}

src/views/company/companyRole/index.vue

@@ -1,196 +1,92 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" v-show="showSearch" :inline="true">
       <el-form-item label="角色名称" prop="roleName">
-        <el-input
-          v-model="queryParams.roleName"
-          placeholder="请输入角色名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.roleName" placeholder="请输入角色名称" clearable size="small" style="width: 240px" @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="角色权限字符串" prop="roleKey">
-        <el-input
-          v-model="queryParams.roleKey"
-          placeholder="请输入角色权限字符串"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="权限字符" prop="roleKey">
+        <el-input v-model="queryParams.roleKey" placeholder="请输入权限字符" clearable size="small" style="width: 240px" @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="显示顺序" prop="roleSort">
-        <el-input
-          v-model="queryParams.roleSort"
-          placeholder="请输入显示顺序"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="数据范围" prop="dataScope">
-        <el-input
-          v-model="queryParams.dataScope"
-          placeholder="请输入数据范围"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="菜单树选择项是否关联显示" prop="menuCheckStrictly">
-        <el-input
-          v-model="queryParams.menuCheckStrictly"
-          placeholder="请输入菜单树选择项是否关联显示"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部门树选择项是否关联显示" prop="deptCheckStrictly">
-        <el-input
-          v-model="queryParams.deptCheckStrictly"
-          placeholder="请输入部门树选择项是否关联显示"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="角色状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择角色状态" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="角色状态" clearable size="small" style="width: 240px">
+          <el-option v-for="dict in statusOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue" />
         </el-select>
       </el-form-item>
-      <el-form-item label="角色状态" prop="companyId">
-        <el-input
-          v-model="queryParams.companyId"
-          placeholder="请输入角色状态"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
-        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <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"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['company:companyRole:add']"
-        >新增</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['company:companyRole:add']">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['company:companyRole:edit']"
-        >修改</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" v-hasPermi="['company:companyRole:edit']">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['company:companyRole:remove']"
-        >删除</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['company:companyRole:remove']">删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['company:companyRole:export']"
-        >导出</el-button>
-      </el-col>
-	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="companyRoleList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="角色ID" align="center" prop="roleId" />
-      <el-table-column label="角色名称" align="center" prop="roleName" />
-      <el-table-column label="角色权限字符串" align="center" prop="roleKey" />
-      <el-table-column label="显示顺序" align="center" prop="roleSort" />
-      <el-table-column label="数据范围" align="center" prop="dataScope" />
-      <el-table-column label="菜单树选择项是否关联显示" align="center" prop="menuCheckStrictly" />
-      <el-table-column label="部门树选择项是否关联显示" align="center" prop="deptCheckStrictly" />
-      <el-table-column label="角色状态" align="center" prop="status" />
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="备注" align="center" prop="companyId" />
+      <el-table-column label="角色编号" prop="roleId" width="100" />
+      <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" width="150" />
+      <el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true" width="180" />
+      <el-table-column label="显示顺序" prop="roleSort" width="100" />
+      <el-table-column label="状态" align="center" width="100">
+        <template slot-scope="scope">
+          <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <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="['company:companyRole:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['company:companyRole:remove']"
-          >删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['company:companyRole:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['company:companyRole: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" />
+
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-form-item label="角色名称" prop="roleName">
           <el-input v-model="form.roleName" placeholder="请输入角色名称" />
         </el-form-item>
-        <el-form-item label="角色权限字符串" prop="roleKey">
-          <el-input v-model="form.roleKey" placeholder="请输入角色权限字符串" />
-        </el-form-item>
-        <el-form-item label="显示顺序" prop="roleSort">
-          <el-input v-model="form.roleSort" placeholder="请输入显示顺序" />
+        <el-form-item prop="roleKey">
+          <span slot="label">
+            <el-tooltip content="控制器中定义的权限字符" placement="top">
+              <i class="el-icon-question"></i>
+            </el-tooltip>
+            权限字符
+          </span>
+          <el-input v-model="form.roleKey" placeholder="请输入权限字符" />
         </el-form-item>
-        <el-form-item label="数据范围" prop="dataScope">
-          <el-input v-model="form.dataScope" placeholder="请输入数据范围" />
+        <el-form-item label="角色顺序" prop="roleSort">
+          <el-input-number v-model="form.roleSort" controls-position="right" :min="0" />
         </el-form-item>
-        <el-form-item label="菜单树选择项是否关联显示" prop="menuCheckStrictly">
-          <el-input v-model="form.menuCheckStrictly" placeholder="请输入菜单树选择项是否关联显示" />
-        </el-form-item>
-        <el-form-item label="部门树选择项是否关联显示" prop="deptCheckStrictly">
-          <el-input v-model="form.deptCheckStrictly" placeholder="请输入部门树选择项是否关联显示" />
-        </el-form-item>
-        <el-form-item label="角色状态">
+        <el-form-item label="状态">
           <el-radio-group v-model="form.status">
-            <el-radio label="1">请选择字典生成</el-radio>
+            <el-radio v-for="dict in statusOptions" :key="dict.dictValue" :label="dict.dictValue">{{dict.dictLabel}}</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="删除标志" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入删除标志" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        <el-form-item label="菜单权限">
+          <el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>
+          <el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox>
+          <el-checkbox v-model="form.menuCheckStrictly" @change="handleCheckedTreeConnect($event, 'menu')">父子联动</el-checkbox>
+          <el-tree class="tree-border" :data="menuOptions" show-checkbox ref="menu" node-key="id" :check-strictly="!form.menuCheckStrictly" empty-text="加载中，请稍后" :props="defaultProps"></el-tree>
         </el-form-item>
-        <el-form-item label="备注" prop="companyId">
-          <el-input v-model="form.companyId" placeholder="请输入备注" />
+        <el-form-item label="备注">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -202,184 +98,238 @@
 </template>
 
 <script>
-import { listCompanyRole, getCompanyRole, delCompanyRole, addCompanyRole, updateCompanyRole, exportCompanyRole } from "@/api/company/companyRole";
+import {
+  listCompanyRole,
+  getCompanyRole,
+  addCompanyRole,
+  updateCompanyRole,
+  changeCompanyRoleStatus,
+  delCompanyRole,
+  companyRoleMenuTreeselect
+} from "@/api/company/companyRole";
+import { getCompanyList } from "@/api/company/company";
+import { treeselect as menuTreeselect } from "@/api/company/companyMenu";
 
 export default {
   name: "CompanyRole",
   data() {
     return {
-      // 遮罩层
       loading: true,
-      // 选中数组
       ids: [],
-      // 非单个禁用
       single: true,
-      // 非多个禁用
       multiple: true,
-      // 显示搜索条件
       showSearch: true,
-      // 总条数
       total: 0,
-      // 角色信息表格数据
-      companyRoleList: [],
-      // 弹出层标题
+      roleList: [],
+      companyList: [],
+      companyNameMap: {},
       title: "",
-      // 是否显示弹出层
       open: false,
-      // 查询参数
+      menuExpand: false,
+      menuNodeAll: false,
+      statusOptions: [],
+      menuOptions: [],
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        roleName: null,
-        roleKey: null,
-        roleSort: null,
-        dataScope: null,
-        menuCheckStrictly: null,
-        deptCheckStrictly: null,
-        status: null,
-        companyId: null
+        roleName: undefined,
+        roleKey: undefined,
+        status: undefined,
+        companyId: undefined,
+        isAdmin: "1"
       },
-      // 表单参数
       form: {},
-      // 表单校验
+      defaultProps: {
+        children: "children",
+        label: "label"
+      },
       rules: {
-        roleName: [
-          { required: true, message: "角色名称不能为空", trigger: "blur" }
-        ],
-        roleKey: [
-          { required: true, message: "角色权限字符串不能为空", trigger: "blur" }
-        ],
-        roleSort: [
-          { required: true, message: "显示顺序不能为空", trigger: "blur" }
-        ],
-        status: [
-          { required: true, message: "角色状态不能为空", trigger: "blur" }
-        ],
+        roleName: [{ required: true, message: "角色名称不能为空", trigger: "blur" }],
+        roleKey: [{ required: true, message: "权限字符不能为空", trigger: "blur" }],
+        roleSort: [{ required: true, message: "角色顺序不能为空", trigger: "blur" }]
       }
     };
   },
   created() {
+    this.loadCompanyList();
     this.getList();
+    this.getDicts("sys_normal_disable").then(response => {
+      this.statusOptions = response.data;
+    });
   },
   methods: {
-    /** 查询角色信息列表 */
+    loadCompanyList() {
+      getCompanyList().then(response => {
+        this.companyList = response.data || [];
+        const map = {};
+        this.companyList.forEach(item => {
+          map[item.companyId] = item.companyName;
+        });
+        this.companyNameMap = map;
+      });
+    },
     getList() {
       this.loading = true;
       listCompanyRole(this.queryParams).then(response => {
-        this.companyRoleList = response.rows;
+        this.roleList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
     },
-    // 取消按钮
+    getMenuTreeselect() {
+      menuTreeselect().then(response => {
+        this.menuOptions = response.data;
+      });
+    },
+    getMenuAllCheckedKeys() {
+      let checkedKeys = this.$refs.menu.getCheckedKeys();
+      let halfCheckedKeys = this.$refs.menu.getHalfCheckedKeys();
+      checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
+      return checkedKeys;
+    },
+    getRoleMenuTreeselect(roleId) {
+      return companyRoleMenuTreeselect(roleId).then(response => {
+        this.menuOptions = response.menus || [];
+        return response;
+      });
+    },
+    handleStatusChange(row) {
+      let text = row.status === "0" ? "启用" : "停用";
+      this.$confirm('确认要"' + text + '""' + row.roleName + '"角色吗?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+        return changeCompanyRoleStatus(row.roleId, row.status);
+      }).then(() => {
+        this.msgSuccess(text + "成功");
+      }).catch(function() {
+        row.status = row.status === "0" ? "1" : "0";
+      });
+    },
     cancel() {
       this.open = false;
       this.reset();
     },
-    // 表单重置
     reset() {
+      if (this.$refs.menu != undefined) {
+        this.$refs.menu.setCheckedKeys([]);
+      }
+      this.menuExpand = false;
+      this.menuNodeAll = false;
       this.form = {
-        roleId: null,
-        roleName: null,
-        roleKey: null,
-        roleSort: null,
-        dataScope: null,
-        menuCheckStrictly: null,
-        deptCheckStrictly: null,
+        roleId: undefined,
+        companyId: undefined,
+        roleName: undefined,
+        roleKey: undefined,
+        roleSort: 0,
         status: "0",
-        delFlag: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: null,
-        remark: null,
-        companyId: null
+        isAdmin: "1",
+        menuIds: [],
+        menuCheckStrictly: true,
+        remark: undefined
       };
       this.resetForm("form");
     },
-    /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
       this.getList();
     },
-    /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.queryParams.isAdmin = "1";
       this.handleQuery();
     },
-    // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.roleId)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
+      this.ids = selection.map(item => item.roleId);
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
+    },
+    handleCheckedTreeExpand(value, type) {
+      if (type == 'menu') {
+        let treeList = this.menuOptions;
+        for (let i = 0; i < treeList.length; i++) {
+          this.$refs.menu.store.nodesMap[treeList[i].id].expanded = value;
+        }
+      }
+    },
+    handleCheckedTreeNodeAll(value, type) {
+      if (type == 'menu') {
+        this.$refs.menu.setCheckedNodes(value ? this.menuOptions : []);
+      }
+    },
+    handleCheckedTreeConnect(value, type) {
+      if (type == 'menu') {
+        this.form.menuCheckStrictly = value ? true : false;
+      }
     },
-    /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.getMenuTreeselect();
       this.open = true;
-      this.title = "添加角色信息";
+      this.title = "添加销售角色";
+      this.form.isAdmin = "1";
     },
-    /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const roleId = row.roleId || this.ids
+      const roleId = row.roleId || this.ids;
+      const roleMenu = this.getRoleMenuTreeselect(roleId);
       getCompanyRole(roleId).then(response => {
         this.form = response.data;
+        this.form.isAdmin = "1";
         this.open = true;
-        this.title = "修改角色信息";
+        this.$nextTick(() => {
+          roleMenu.then(res => {
+            const checkedKeys = res.checkedKeys || [];
+            checkedKeys.forEach((v) => {
+              this.$nextTick(() => {
+                this.$refs.menu.setChecked(v, true, false);
+              });
+            });
+          });
+        });
       });
+      this.title = "修改销售角色";
     },
-    /** 提交按钮 */
-    submitForm() {
+    submitForm: function() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.roleId != null) {
+          if (this.form.roleId != undefined) {
+            this.form.isAdmin = "1";
+            this.form.companyId = null;
+            this.form.menuIds = this.getMenuAllCheckedKeys();
             updateCompanyRole(this.form).then(response => {
-              if (response.code === 200) {
-                this.msgSuccess("修改成功");
-                this.open = false;
-                this.getList();
-              }
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
             });
           } else {
+            this.form.isAdmin = "1";
+            this.form.companyId = null;
+            this.form.menuIds = this.getMenuAllCheckedKeys();
             addCompanyRole(this.form).then(response => {
-              if (response.code === 200) {
-                this.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
-              }
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
             });
           }
         }
       });
     },
-    /** 删除按钮操作 */
     handleDelete(row) {
       const roleIds = row.roleId || this.ids;
-      this.$confirm('是否确认删除角色信息编号为"' + roleIds + '"的数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delCompanyRole(roleIds);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        }).catch(function() {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$confirm('是否确认导出所有角色信息数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return exportCompanyRole(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-        }).catch(function() {});
+      this.$confirm('是否确认删除角色编号为"' + roleIds + '"的数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function() {
+        return delCompanyRole(roleIds);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      }).catch(function() {});
     }
   }
 };
 </script>
+

src/views/his/company/index.vue

@@ -250,6 +250,13 @@
             @click="handleErpInfo(scope.row)"
             v-hasPermi="['his:storeErpInfo:edit']"
           >设置ERP信息</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-user"
+            @click="handleAdminRole(scope.row)"
+            v-hasPermi="['his:company:edit']"
+          >设置管理员角色</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -693,6 +700,28 @@
       </div>
     </el-dialog>
 
+    <el-dialog title="设置管理员角色" :visible.sync="adminRoleDialogVisible" width="500px" append-to-body :close-on-click-modal="false">
+      <el-form ref="adminRoleForm" :model="adminRoleForm" :rules="adminRoleRules" label-width="110px">
+        <el-form-item label="销售公司">
+          <el-input v-model="adminRoleForm.companyName" disabled />
+        </el-form-item>
+        <el-form-item label="管理员角色" prop="roleId">
+          <el-select v-model="adminRoleForm.roleId" placeholder="请选择平台管理员角色" filterable clearable style="width: 100%">
+            <el-option
+              v-for="item in adminRoleOptions"
+              :key="item.roleId"
+              :label="item.roleName"
+              :value="Number(item.roleId)"
+            />
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitAdminRole" :loading="adminRoleSubmitLoading">保 存</el-button>
+        <el-button @click="adminRoleDialogVisible = false">取 消</el-button>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -714,8 +743,11 @@ import {
   oneClickDisable,
   oneClickEnable,
   getCompanyErpInfo,
-  saveCompanyErpInfo
+  saveCompanyErpInfo,
+  getCompanyAdminRole,
+  setCompanyAdminRole
 } from '@/api/his/company'
+import { adminRoleOptionselect } from '@/api/company/companyRole'
 import { getFollowDoctorList } from '@/api/his/doctor'
 import { docList } from '@/api/his/doctor'
 import { getVoiceApiList } from '@/api/company/companyVoiceApi'
@@ -925,6 +957,18 @@ export default {
           { required: true, message: '请输入推荐收货地址', trigger: 'blur' }
         ]
       },
+      // 设置管理员角色弹窗
+      adminRoleDialogVisible: false,
+      adminRoleSubmitLoading: false,
+      adminRoleOptions: [],
+      adminRoleForm: {
+        companyId: null,
+        companyName: '',
+        roleId: null
+      },
+      adminRoleRules: {
+        roleId: [{ required: true, message: '请选择管理员角色', trigger: 'change' }]
+      }
     }
   },
   created() {
@@ -1393,7 +1437,57 @@ export default {
       }).catch(() => {
         this.batchLoading = false
       })
-    }
+    },
+
+    /** 设置管理员角色 */
+    handleAdminRole(row) {
+      this.adminRoleForm = {
+        companyId: row.companyId,
+        companyName: row.companyName || '',
+        roleId: null
+      };
+      this.adminRoleOptions = [];
+      this.adminRoleDialogVisible = true;
+      this.$nextTick(() => {
+        if (this.$refs.adminRoleForm) {
+          this.$refs.adminRoleForm.clearValidate();
+        }
+      });
+      Promise.all([
+        adminRoleOptionselect(),
+        getCompanyAdminRole(row.companyId)
+      ]).then(([optRes, roleRes]) => {
+        this.adminRoleOptions = (optRes && optRes.data) ? optRes.data : [];
+        const currentRoleId = roleRes && roleRes.data ? roleRes.data.roleId : null;
+        const currentIsAdmin = roleRes && roleRes.data ? roleRes.data.isAdmin : null;
+        // 非平台管理员角色，或不在下拉选项中：置空，禁止显示数字ID
+        if (currentRoleId == null || currentRoleId === '' || String(currentIsAdmin) !== '1') {
+          this.adminRoleForm.roleId = null;
+          return;
+        }
+        const matchedOption = this.adminRoleOptions.find(item => Number(item.roleId) === Number(currentRoleId));
+        this.adminRoleForm.roleId = matchedOption ? Number(matchedOption.roleId) : null;
+      });
+    },
+    /** 保存管理员角色 */
+    submitAdminRole() {
+      this.$refs.adminRoleForm.validate(valid => {
+        if (!valid) {
+          return;
+        }
+        this.adminRoleSubmitLoading = true;
+        setCompanyAdminRole({
+          companyId: this.adminRoleForm.companyId,
+          roleId: this.adminRoleForm.roleId
+        }).then(() => {
+          this.msgSuccess("设置成功");
+          this.adminRoleDialogVisible = false;
+          this.getList();
+        }).finally(() => {
+          this.adminRoleSubmitLoading = false;
+        });
+      });
+    },
   }
 }
 </script>