Merge remote-tracking branch 'origin/master'

zengh

2021-07-19 41c261e6d789c9ce29ec00b238137d5959b24389

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/examination/examination.vue

 src/views/examination/examination.vue

@@ -1,6 +1,7 @@
<template>
    <basic-container>
        <avue-crud :option="option"
    <avue-crud
      :option="option"
                   :search.sync="search"
                   :table-loading="loading"
                   :data="data"
@@ -18,89 +19,98 @@
                   @current-change="currentChange"
                   @size-change="sizeChange"
                   @refresh-change="refreshChange"
                   @on-load="onLoad">
      @on-load="onLoad"
    >
            <template slot="menuLeft">
                <el-button type="danger"
        <el-button
          type="danger"
                           size="small"
                           plain
                           icon="el-icon-delete"
                           v-if="permission.examination_delete"
                           @click="handleDelete">删 除
          @click="handleDelete"
          >删 除
                </el-button>
            </template>
            <template slot-scope="{row}"
                      slot="tenantName">
      <template slot-scope="{ row }" slot="tenantName">
                <el-tag>{{row.tenantName}}</el-tag>
            </template>
            <template slot-scope="{row}"
                      slot="roleName">
      <template slot-scope="{ row }" slot="roleName">
                <el-tag>{{row.roleName}}</el-tag>
            </template>
            <template slot-scope="{row}"
                      slot="deptName">
      <template slot-scope="{ row }" slot="deptName">
                <el-tag>{{row.deptName}}</el-tag>
            </template>
            <template slot-scope="{row}"
                      slot="userTypeName">
      <template slot-scope="{ row }" slot="userTypeName">
                <el-tag>{{row.userTypeName}}</el-tag>
            </template>
            <template slot-scope="{ row }"
                      slot="examination_type">
                <el-tag>{{
              row.examination_type == "0" ? "正常" : row.examination_type == "1" ? "异常" : "正常"
      <template slot-scope="{ row }" slot="examination_type">
        <el-tag
          >{{
            row.examination_type == "0"
              ? "正常"
              : row.examination_type == "1"
              ? "异常"
              : "异常"
              }}
                </el-tag>
            </template>
            <template slot-scope="{ row }"
                      slot="online_status">
                <el-tag>{{
              row.online_status == "0" ? "离线" : row.online_status == "1" ? "在线" : "离线"
      <template slot-scope="{ row }" slot="online_status">
        <el-tag
          >{{
            row.online_status == "0"
              ? "离线"
              : row.online_status == "1"
              ? "在线"
              : "离线"
              }}
                </el-tag>
            </template>

        </avue-crud>
        <el-dialog title="用户角色配置"
    <el-dialog
      title="用户角色配置"
                   append-to-body
                   :visible.sync="roleBox"
                   width="345px">

            <el-tree :data="roleGrantList"
      width="345px"
    >
      <el-tree
        :data="roleGrantList"
                     show-checkbox
                     check-strictly
                     default-expand-all
                     node-key="id"
                     ref="treeRole"
                     :default-checked-keys="roleTreeObj"
                     :props="props">
        :props="props"
      >
            </el-tree>

            <span slot="footer"
                  class="dialog-footer">
      <span slot="footer" class="dialog-footer">
                <el-button @click="roleBox = false">取 消</el-button>
                <el-button type="primary"
                           @click="submitRole">确 定</el-button>
        <el-button type="primary" @click="submitRole">确 定</el-button>
            </span>
        </el-dialog>
        <el-dialog title="用户数据导入"
    <el-dialog
      title="用户数据导入"
                   append-to-body
                   :visible.sync="excelBox"
                   width="555px">
            <avue-form :option="excelOption"
      width="555px"
    >
      <avue-form
        :option="excelOption"
                       v-model="excelForm"
                       :upload-after="uploadAfter">
        :upload-after="uploadAfter"
      >
                <template slot="excelTemplate">
                    <el-button type="primary"
                               @click="handleTemplate">
          <el-button type="primary" @click="handleTemplate">
                        点击下载<i class="el-icon-download el-icon--right"></i>
                    </el-button>
                </template>
            </avue-form>
        </el-dialog>
        <el-dialog title="用户平台配置"
                   append-to-body
                   :visible.sync="platformBox">
            <avue-crud :option="platformOption"
    <el-dialog title="用户平台配置" append-to-body :visible.sync="platformBox">
      <avue-crud
        :option="platformOption"
                       :table-loading="platformLoading"
                       :data="platformData"
                       ref="platformCrud"
@@ -115,13 +125,12 @@
                       @current-change="platformCurrentChange"
                       @size-change="platformSizeChange"
                       @refresh-change="platformRefreshChange"
                       @on-load="platformOnLoad">
                <template slot-scope="{row}"
                          slot="tenantName">
        @on-load="platformOnLoad"
      >
        <template slot-scope="{ row }" slot="tenantName">
                    <el-tag>{{row.tenantName}}</el-tag>
                </template>
                <template slot-scope="{row}"
                          slot="userTypeName">
        <template slot-scope="{ row }" slot="userTypeName">
                    <el-tag>{{row.userTypeName}}</el-tag>
                </template>
            </avue-crud>
@@ -139,29 +148,29 @@
    updatePlatform,
    add,
    grant,
    resetPassword
  resetPassword,
} from "@/api/system/examination";
import { getDeptTree, getDeptLazyTree } from "@/api/system/dept";
import { getRoleTree } from "@/api/system/role";
import { getPostList } from "@/api/system/post";
import { mapGetters } from "vuex";
import website from '@/config/website';
import { getToken } from '@/util/auth';
import website from "@/config/website";
import { getToken } from "@/util/auth";

export default {
    data () {
        const validatePass = (rule, value, callback) => {
            if (value === '') {
                callback(new Error('请输入密码'));
      if (value === "") {
        callback(new Error("请输入密码"));
            } else {
                callback();
            }
        };
        const validatePass2 = (rule, value, callback) => {
            if (value === '') {
                callback(new Error('请再次输入密码'));
      if (value === "") {
        callback(new Error("请再次输入密码"));
            } else if (value !== this.form.password) {
                callback(new Error('两次输入密码不一致!'));
        callback(new Error("两次输入密码不一致!"));
            } else {
                callback();
            }
@@ -180,12 +189,12 @@
            page: {
                pageSize: 10,
                currentPage: 1,
                total: 0
        total: 0,
            },
            platformPage: {
                pageSize: 10,
                currentPage: 1,
                total: 0
        total: 0,
            },
            init: {
                roleTree: [],
@@ -193,14 +202,14 @@
            },
            props: {
                label: "title",
                value: "key"
        value: "key",
            },
            roleGrantList: [],
            roleTreeObj: [],
            treeDeptId: '',
      treeDeptId: "",
            treeData: [],
            option: {
                height: 'auto',
        height: "auto",
                calcHeight: 54,
                tip: false,
                searchShow: true,
@@ -216,7 +225,7 @@
                        label: "登录账号",
                        prop: "account",
                        search: true,
                        display: false
            display: false,
                    },
                    // {
                    //   label: "所属客户",
@@ -229,32 +238,52 @@
                        label: "姓名",
                        prop: "realName",
                        search: true,
                        display: false
            display: false,
                    },
                    {
                        label: "性别",
                        prop: "sexName",
                        display: false
            display: false,
                    },
                    {
                        label: "联系方式",
                        prop: "phone",
                        display: false
            display: false,
                    },
                    {
                        label: "所属角色",
                        prop: "roleName",
                        slot: true,
                        display: false
            display: false,
                    },
                    {
                        label: "工作单位",
                        prop: "deptName",
                        slot: true,
                        display: false,
                        width: 260
            width: 260,
                    },

          //   {
          //     label: "行政区",
          //     prop: "regionId",
          //     type: "tree",
          //     props: {
          //       label: "name",
          //       value: "code",
          //     },
          //     dicUrl: "/api/blade-system/region/select?code=3601",
          //     // hide: true,
          //     addDisplay: true,
          //     editDisplay: true,
          //     viewDisplay: true,
          //     rules: [
          //       {
          //         required: true,
          //         message: "请选择行政区",
          //         trigger: "blur",
          //       },
          //     ],
          //   },
                    {
                        label: "审查状态",
                        prop: "examination_type",
@@ -270,25 +299,27 @@
                            {
                                label: "异常",
                                value: "1",
                            }]
                    }, {
              },
            ],
          },
          {
                        label: "审查明细",
                        prop: "examination_mx",
                        display: false
            display: false,
                    },
                    {
                        label: "工作状态",
                        prop: "work_status",
                        slot: true,
                        hide: true,
                        display: false
            display: false,
                    },
                ],
                group: [
                    {
                        label: '基础信息',
                        prop: 'baseInfo',
                        icon: 'el-icon-user-solid',
            label: "基础信息",
            prop: "baseInfo",
            icon: "el-icon-user-solid",
                        column: [
                            // {
                            //   label: "所属客户",
@@ -313,11 +344,34 @@
                            {
                                label: "登录账号",
                                prop: "account",
                                rules: [{
                rules: [
                  {
                                    required: true,
                                    message: "请输入登录账号",
                                    trigger: "blur"
                                }],
                    trigger: "blur",
                  },
                ],
              },
              {
                label: "行政区",
                prop: "regionId",
                type: "tree",
                props: {
                  label: "name",
                  value: "code",
                },
                dicUrl: "/api/blade-system/region/select?code=3601",
                hide: true,
                addDisplay: true,
                editDisplay: true,
                viewDisplay: true,
                rules: [
                  {
                    required: true,
                    message: "请选择行政区",
                    trigger: "blur",
                  },
                ],
                            },
                            {
                                label: "用户平台",
@@ -325,73 +379,84 @@
                                dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
                                props: {
                                    label: "dictValue",
                                    value: "dictKey"
                  value: "dictKey",
                                },
                                dataType: "number",
                                slot: true,
                                prop: "userType",
                                rules: [{
                rules: [
                  {
                                    required: true,
                                    message: "请选择用户平台",
                                    trigger: "blur"
                                }]
                    trigger: "blur",
                  },
                ],
                            },
                            {
                                label: '密码',
                                prop: 'password',
                label: "密码",
                prop: "password",
                                hide: true,
                                editDisplay: false,
                                viewDisplay: false,
                                rules: [{ required: true, validator: validatePass, trigger: 'blur' }]
                rules: [
                  { required: true, validator: validatePass, trigger: "blur" },
                ],
                            },
                            {
                                label: '确认密码',
                                prop: 'password2',
                label: "确认密码",
                prop: "password2",
                                hide: true,
                                editDisplay: false,
                                viewDisplay: false,
                                rules: [{ required: true, validator: validatePass2, trigger: 'blur' }]
                rules: [
                  { required: true, validator: validatePass2, trigger: "blur" },
                ],
                            },
                        ]
            ],
                    },
                    {
                        label: '详细信息',
                        prop: 'detailInfo',
                        icon: 'el-icon-s-order',
            label: "详细信息",
            prop: "detailInfo",
            icon: "el-icon-s-order",
                        column: [
                            {
                                label: "用户昵称",
                                prop: "name",
                                hide: true,
                                rules: [{
                rules: [
                  {
                                    required: true,
                                    message: "请输入用户昵称",
                                    trigger: "blur"
                                }]
                    trigger: "blur",
                  },
                ],
                            },
                            {
                                label: "用户姓名",
                                prop: "realName",
                                rules: [{
                rules: [
                  {
                                    required: true,
                                    message: "请输入用户姓名",
                                    trigger: "blur"
                                }, {
                    trigger: "blur",
                  },
                  {
                                    min: 2,
                                    max: 5,
                                    message: '姓名长度在2到5个字符'
                                }]
                    message: "姓名长度在2到5个字符",
                  },
                ],
                            },
                            {
                                label: "手机号码",
                                prop: "phone",
                                overHidden: true
                overHidden: true,
                            },
                            {
                                label: "电子邮箱",
                                prop: "email",
                                hide: true,
                                overHidden: true
                overHidden: true,
                            },
                            {
                                label: "用户性别",
@@ -400,18 +465,18 @@
                                dicData: [
                                    {
                                        label: "男",
                                        value: 1
                    value: 1,
                                    },
                                    {
                                        label: "女",
                                        value: 2
                    value: 2,
                                    },
                                    {
                                        label: "未知",
                                        value: 3
                                    }
                    value: 3,
                  },
                                ],
                                hide: true
                hide: true,
                            },
                            {
                                label: "用户生日",
@@ -419,20 +484,20 @@
                                prop: "birthday",
                                format: "yyyy-MM-dd hh:mm:ss",
                                valueFormat: "yyyy-MM-dd hh:mm:ss",
                                hide: true
                hide: true,
                            },
                            {
                                label: "账号状态",
                                prop: "statusName",
                                hide: true,
                                display: false
                            }
                        ]
                display: false,
              },
            ],
                    },
                    {
                        label: '职责信息',
                        prop: 'dutyInfo',
                        icon: 'el-icon-s-custom',
            label: "职责信息",
            prop: "dutyInfo",
            icon: "el-icon-s-custom",
                        column: [
                            {
                                label: "用户编号",
@@ -445,15 +510,17 @@
                                type: "tree",
                                dicData: [],
                                props: {
                                    label: "title"
                  label: "title",
                                },
                                checkStrictly: true,
                                slot: true,
                                rules: [{
                rules: [
                  {
                                    required: true,
                                    message: "请选择所属角色",
                                    trigger: "click"
                                }]
                    trigger: "click",
                  },
                ],
                            },
                            {
                                label: "所属部门",
@@ -462,15 +529,17 @@
                                //multiple: true,
                                dicData: [],
                                props: {
                                    label: "title"
                  label: "title",
                                },
                                checkStrictly: true,
                                slot: true,
                                rules: [{
                rules: [
                  {
                                    required: true,
                                    message: "请选择所属部门",
                                    trigger: "click"
                                }]
                    trigger: "click",
                  },
                ],
                            },
                            {
                                label: "所属岗位",
@@ -480,13 +549,12 @@
                                dicData: [],
                                props: {
                                    label: "postName",
                                    value: "id"
                  value: "id",
                                },

                            },
                        ]
            ],
                    },
                ]
        ],
            },
            data: [],
            platformQuery: {},
@@ -503,31 +571,31 @@
                viewBtn: true,
                dialogClickModal: false,
                menuWidth: 120,
                editBtnText: '配置',
        editBtnText: "配置",
                column: [
                    {
                        label: "登录账号",
                        prop: "account",
                        search: true,
                        display: false
            display: false,
                    },
                    {
                        label: "所属租户",
                        prop: "tenantName",
                        slot: true,
                        display: false
            display: false,
                    },
                    {
                        label: "用户姓名",
                        prop: "realName",
                        search: true,
                        display: false
            display: false,
                    },
                    {
                        label: "用户平台",
                        prop: "userTypeName",
                        slot: true,
                        display: false
            display: false,
                    },
                    {
                        label: "用户平台",
@@ -535,18 +603,20 @@
                        dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
                        props: {
                            label: "dictValue",
                            value: "dictKey"
              value: "dictKey",
                        },
                        dataType: "number",
                        search: true,
                        hide: true,
                        display: false,
                        prop: "userType",
                        rules: [{
            rules: [
              {
                            required: true,
                            message: "请选择用户平台",
                            trigger: "blur"
                        }]
                trigger: "blur",
              },
            ],
                    },
                    {
                        label: "用户拓展",
@@ -566,17 +636,17 @@
                emptyBtn: false,
                column: [
                    {
                        label: '模板上传',
                        prop: 'excelFile',
                        type: 'upload',
            label: "模板上传",
            prop: "excelFile",
            type: "upload",
                        drag: true,
                        loadText: '模板上传中，请稍等',
            loadText: "模板上传中，请稍等",
                        span: 24,
                        propsHttp: {
                            res: 'data'
              res: "data",
                        },
                        tip: '请上传 .xls,.xlsx 标准格式文件',
                        action: "/api/blade-user/import-user"
            tip: "请上传 .xls,.xlsx 标准格式文件",
            action: "/api/blade-user/import-user",
                    },
                    {
                        label: "数据覆盖",
@@ -587,12 +657,12 @@
                        dicData: [
                            {
                                label: "否",
                                value: 0
                value: 0,
                            },
                            {
                                label: "是",
                                value: 1
                            }
                value: 1,
              },
                        ],
                        value: 0,
                        slot: true,
@@ -600,32 +670,32 @@
                            {
                                required: true,
                                message: "请选择是否覆盖",
                                trigger: "blur"
                            }
                        ]
                trigger: "blur",
              },
            ],
                    },
                    {
                        label: '模板下载',
                        prop: 'excelTemplate',
            label: "模板下载",
            prop: "excelTemplate",
                        formslot: true,
                        span: 24,
                    }
                ]
            }
          },
        ],
      },
        };
    },
    watch: {
        'form.tenantId' () {
            if (this.form.tenantId !== '' && this.initFlag) {
    "form.tenantId"() {
      if (this.form.tenantId !== "" && this.initFlag) {
                this.initData(this.form.tenantId);
            }
        },
        'excelForm.isCovered' () {
            if (this.excelForm.isCovered !== '') {
    "excelForm.isCovered"() {
      if (this.excelForm.isCovered !== "") {
                const column = this.findObject(this.excelOption.column, "excelFile");
                column.action = `/api/blade-user/import-user?isCovered=${this.excelForm.isCovered}`;
            }
        }
    },
    },
    computed: {
        ...mapGetters(["userInfo", "permission"]),
@@ -634,7 +704,7 @@
                addBtn: this.vaildData(this.permission.examination_add, true),
                viewBtn: this.vaildData(this.permission.examination_view, false),
                delBtn: this.vaildData(this.permission.examination_delete, true),
                editBtn: this.vaildData(this.permission.examination_edit, true)
        editBtn: this.vaildData(this.permission.examination_edit, true),
            };
        },
        platformPermissionList () {
@@ -642,12 +712,12 @@
                addBtn: false,
                viewBtn: false,
                delBtn: false,
                editBtn: this.vaildData(this.permission.examination_edit, false)
        editBtn: this.vaildData(this.permission.examination_edit, false),
            };
        },
        ids () {
            let ids = [];
            this.selectionList.forEach(ele => {
      this.selectionList.forEach((ele) => {
                ids.push(ele.id);
            });
            return ids.join(",");
@@ -666,15 +736,15 @@
            this.onLoad(this.page);
        },
        initData (tenantId) {
            getRoleTree(tenantId).then(res => {
      getRoleTree(tenantId).then((res) => {
                const column = this.findObject(this.option.group, "roleId");
                column.dicData = res.data.data;
            });
            getDeptTree(tenantId).then(res => {
      getDeptTree(tenantId).then((res) => {
                const column = this.findObject(this.option.group, "deptId");
                column.dicData = res.data.data;
            });
            getPostList(tenantId).then(res => {
      getPostList(tenantId).then((res) => {
                const column = this.findObject(this.option.group, "postId");
                column.dicData = res.data.data;
            });
@@ -685,7 +755,7 @@
                this.roleBox = false;
                this.$message({
                    type: "success",
                    message: "操作成功!"
          message: "操作成功!",
                });
                this.onLoad(this.page);
            });
@@ -694,41 +764,47 @@
            row.deptId = row.deptId.join(",");
            row.roleId = row.roleId.join(",");
            row.postId = row.postId.join(",");
            add(row).then(() => {
      add(row).then(
        () => {
                this.initFlag = false;
                this.onLoad(this.page);
                this.$message({
                    type: "success",
                    message: "操作成功!"
            message: "操作成功!",
                });
                done();
            }, error => {
        },
        (error) => {
                window.console.log(error);
                loading();
            });
        }
      );
        },
        rowUpdate (row, index, done, loading) {
            row.deptId = row.deptId.join(",");
            row.roleId = row.roleId.join(",");
            row.postId = row.postId.join(",");
            update(row).then(() => {
      update(row).then(
        () => {
                this.initFlag = false;
                this.onLoad(this.page);
                this.$message({
                    type: "success",
                    message: "操作成功!"
            message: "操作成功!",
                });
                done();
            }, error => {
        },
        (error) => {
                window.console.log(error);
                loading();
            });
        }
      );
        },
        rowDel (row) {
            this.$confirm("确定将选择数据删除?", {
                confirmButtonText: "确定",
                cancelButtonText: "取消",
                type: "warning"
        type: "warning",
            })
                .then(() => {
                    return remove(row.id);
@@ -737,13 +813,13 @@
                    this.onLoad(this.page);
                    this.$message({
                        type: "success",
                        message: "操作成功!"
            message: "操作成功!",
                    });
                });
        },
        searchReset () {
            this.query = {};
            this.treeDeptId = '';
      this.treeDeptId = "";
            this.onLoad(this.page);
        },
        searchChange (params, done) {
@@ -767,7 +843,7 @@
            this.$confirm("确定将选择数据删除?", {
                confirmButtonText: "确定",
                cancelButtonText: "取消",
                type: "warning"
        type: "warning",
            })
                .then(() => {
                    return remove(this.ids);
@@ -776,7 +852,7 @@
                    this.onLoad(this.page);
                    this.$message({
                        type: "success",
                        message: "操作成功!"
            message: "操作成功!",
                    });
                    this.$refs.crud.toggleSelection();
                });
@@ -789,7 +865,7 @@
            this.$confirm("确定将选择账号密码重置为123456?", {
                confirmButtonText: "确定",
                cancelButtonText: "取消",
                type: "warning"
        type: "warning",
            })
                .then(() => {
                    return resetPassword(this.ids);
@@ -797,7 +873,7 @@
                .then(() => {
                    this.$message({
                        type: "success",
                        message: "操作成功!"
            message: "操作成功!",
                    });
                    this.$refs.crud.toggleSelection();
                });
@@ -811,7 +887,7 @@
            if (this.selectionList.length === 1) {
                this.roleTreeObj = this.selectionList[0].roleId.split(",");
            }
            getRoleTree().then(res => {
      getRoleTree().then((res) => {
                this.roleGrantList = res.data.data;
                this.roleBox = true;
            });
@@ -831,17 +907,27 @@
            this.$confirm("是否导出用户数据?", "提示", {
                confirmButtonText: "确定",
                cancelButtonText: "取消",
                type: "warning"
        type: "warning",
            }).then(() => {
                window.open(`/api/blade-user/export-user?${this.website.tokenHeader}=${getToken()}&account=${this.search.account}&realName=${this.search.realName}`);
        window.open(
          `/api/blade-user/export-user?${
            this.website.tokenHeader
          }=${getToken()}&account=${this.search.account}&realName=${
            this.search.realName
          }`
        );
            });
        },
        handleTemplate () {
            window.open(`/api/blade-user/export-template?${this.website.tokenHeader}=${getToken()}`);
      window.open(
        `/api/blade-user/export-template?${
          this.website.tokenHeader
        }=${getToken()}`
      );
        },
        beforeOpen (done, type) {
            if (["edit", "view"].includes(type)) {
                getUser(this.form.id).then(res => {
        getUser(this.form.id).then((res) => {
                    this.form = res.data.data;
                    if (this.form.hasOwnProperty("deptId")) {
                        this.form.deptId = this.form.deptId.split(",");
@@ -868,7 +954,12 @@
        },
        onLoad (page, params = {}) {
            this.loading = true;
            getList(page.currentPage, page.pageSize, Object.assign(params, this.query), this.treeDeptId).then(res => {
      getList(
        page.currentPage,
        page.pageSize,
        Object.assign(params, this.query),
        this.treeDeptId
      ).then((res) => {
                const data = res.data.data;
                this.page.total = data.total;
                this.data = data.records;
@@ -877,21 +968,24 @@
            });
        },
        platformRowUpdate (row, index, done, loading) {
            updatePlatform(row.id, row.userType, row.userExt).then(() => {
      updatePlatform(row.id, row.userType, row.userExt).then(
        () => {
                this.platformOnLoad(this.platformPage);
                this.$message({
                    type: "success",
                    message: "操作成功!"
            message: "操作成功!",
                });
                done();
            }, error => {
        },
        (error) => {
                window.console.log(error);
                loading();
            });
        }
      );
        },
        platformBeforeOpen (done, type) {
            if (["edit", "view"].includes(type)) {
                getUserPlatform(this.platformForm.id).then(res => {
        getUserPlatform(this.platformForm.id).then((res) => {
                    this.platformForm = res.data.data;
                });
            }
@@ -925,15 +1019,20 @@
        },
        platformOnLoad (page, params = {}) {
            this.platformLoading = true;
            getList(page.currentPage, page.pageSize, Object.assign(params, this.query), this.treeDeptId).then(res => {
      getList(
        page.currentPage,
        page.pageSize,
        Object.assign(params, this.query),
        this.treeDeptId
      ).then((res) => {
                const data = res.data.data;
                this.platformPage.total = data.total;
                this.platformData = data.records;
                this.platformLoading = false;
                this.selectionClear();
            });
        }
    }
    },
  },
};
</script>


 src/views/system/user.vue

@@ -4,14 +4,19 @@
      <div class="box">
        <el-scrollbar>
          <basic-container>
            <avue-tree :option="treeOption" :data="treeData" @node-click="nodeClick"/>
            <avue-tree
              :option="treeOption"
              :data="treeData"
              @node-click="nodeClick"
            />
          </basic-container>
        </el-scrollbar>
      </div>
    </el-col>
    <el-col :span="19">
      <basic-container>
        <avue-crud :option="option"
        <avue-crud
          :option="option"
                   :search.sync="search"
                   :table-loading="loading"
                   :data="data"
@@ -29,101 +34,122 @@
                   @current-change="currentChange"
                   @size-change="sizeChange"
                   @refresh-change="refreshChange"
                   @on-load="onLoad">
          @on-load="onLoad"
        >
          <template slot="menuLeft">
            <el-button type="danger"
            <el-button
              type="danger"
                       size="small"
                       plain
                       icon="el-icon-delete"
                       v-if="permission.user_delete"
                       @click="handleDelete">删 除
              @click="handleDelete"
              >删 除
            </el-button>
            <el-button type="info"
            <el-button
              type="info"
                       size="small"
                       plain
                       v-if="permission.user_role"
                       icon="el-icon-user"
                       @click="handleGrant">角色配置
              @click="handleGrant"
              >角色配置
            </el-button>
            <el-button type="info"
            <el-button
              type="info"
                       size="small"
                       plain
                       v-if="permission.user_reset"
                       icon="el-icon-refresh"
                       @click="handleReset">密码重置
              @click="handleReset"
              >密码重置
            </el-button>
            <el-button type="info"
            <el-button
              type="info"
                       size="small"
                       plain
                       v-if="userInfo.role_name.includes('admin')"
                       icon="el-icon-setting"
                       @click="handlePlatform">平台配置
              @click="handlePlatform"
              >平台配置
            </el-button>
            <el-button type="success"
            <el-button
              type="success"
                       size="small"
                       plain
                       v-if="userInfo.role_name.includes('admin')"
                       icon="el-icon-upload2"
                       @click="handleImport">导入
              @click="handleImport"
              >导入
            </el-button>
            <el-button type="warning"
            <el-button
              type="warning"
                       size="small"
                       plain
                       v-if="userInfo.role_name.includes('admin')"
                       icon="el-icon-download"
                       @click="handleExport">导出
              @click="handleExport"
              >导出
            </el-button>
          </template>
          <template slot-scope="{row}"
                    slot="tenantName">
          <template slot-scope="{ row }" slot="tenantName">
            <el-tag>{{row.tenantName}}</el-tag>
          </template>
          <template slot-scope="{row}"
                    slot="roleName">
          <template slot-scope="{ row }" slot="roleName">
            <el-tag>{{row.roleName}}</el-tag>
          </template>
          <template slot-scope="{row}"
                    slot="deptName">
          <template slot-scope="{ row }" slot="deptName">
            <el-tag>{{row.deptName}}</el-tag>
          </template>
          <template slot-scope="{row}"
                    slot="userTypeName">
          <template slot-scope="{ row }" slot="userTypeName">
            <el-tag>{{row.userTypeName}}</el-tag>
          </template>
          <template slot-scope="{ row }" slot="online_status">
            <el-tag
            >{{
              row.online_status == "0" ? "离线" : row.online_status == "1" ? "在线" : "离线"
                row.online_status == "0"
                  ? "离线"
                  : row.online_status == "1"
                  ? "在线"
                  : "离线"
              }}
            </el-tag>
          </template>
        </avue-crud>
        <el-dialog title="用户角色配置"
        <el-dialog
          title="用户角色配置"
                   append-to-body
                   :visible.sync="roleBox"
                   width="345px">

          <el-tree :data="roleGrantList"
          width="345px"
        >
          <el-tree
            :data="roleGrantList"
                   show-checkbox
                   check-strictly
                   default-expand-all
                   node-key="id"
                   ref="treeRole"
                   :default-checked-keys="roleTreeObj"
                   :props="props">
            :props="props"
          >
          </el-tree>

          <span slot="footer" class="dialog-footer">
            <el-button @click="roleBox = false">取 消</el-button>
            <el-button type="primary"
                       @click="submitRole">确 定</el-button>
            <el-button type="primary" @click="submitRole">确 定</el-button>
          </span>
        </el-dialog>
        <el-dialog title="用户数据导入"
        <el-dialog
          title="用户数据导入"
                   append-to-body
                   :visible.sync="excelBox"
                   width="555px">
          <avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter">
          width="555px"
        >
          <avue-form
            :option="excelOption"
            v-model="excelForm"
            :upload-after="uploadAfter"
          >
            <template slot="excelTemplate">
              <el-button type="primary" @click="handleTemplate">
                点击下载<i class="el-icon-download el-icon--right"></i>
@@ -131,10 +157,14 @@
            </template>
          </avue-form>
        </el-dialog>
        <el-dialog title="用户平台配置"
        <el-dialog
          title="用户平台配置"
                   append-to-body
          :visible.sync="platformBox"
        >
                   :visible.sync="platformBox">
          <avue-crud :option="platformOption"
          <avue-crud
            :option="platformOption"
                     :table-loading="platformLoading"
                     :data="platformData"
                     ref="platformCrud"
@@ -149,13 +179,12 @@
                     @current-change="platformCurrentChange"
                     @size-change="platformSizeChange"
                     @refresh-change="platformRefreshChange"
                     @on-load="platformOnLoad">
            <template slot-scope="{row}"
                      slot="tenantName">
            @on-load="platformOnLoad"
          >
            <template slot-scope="{ row }" slot="tenantName">
              <el-tag>{{row.tenantName}}</el-tag>
            </template>
            <template slot-scope="{row}"
                      slot="userTypeName">
            <template slot-scope="{ row }" slot="userTypeName">
              <el-tag>{{row.userTypeName}}</el-tag>
            </template>
          </avue-crud>
@@ -175,29 +204,29 @@
    updatePlatform,
    add,
    grant,
    resetPassword
  resetPassword,
  } from "@/api/system/user";
  import {getDeptTree, getDeptLazyTree} from "@/api/system/dept";
  import {getRoleTree} from "@/api/system/role";
  import {getPostList} from "@/api/system/post";
  import {mapGetters} from "vuex";
  import website from '@/config/website';
  import {getToken} from '@/util/auth';
import website from "@/config/website";
import { getToken } from "@/util/auth";

  export default {
    data() {
      const validatePass = (rule, value, callback) => {
        if (value === '') {
          callback(new Error('请输入密码'));
      if (value === "") {
        callback(new Error("请输入密码"));
        } else {
          callback();
        }
      };
      const validatePass2 = (rule, value, callback) => {
        if (value === '') {
          callback(new Error('请再次输入密码'));
      if (value === "") {
        callback(new Error("请再次输入密码"));
        } else if (value !== this.form.password) {
          callback(new Error('两次输入密码不一致!'));
        callback(new Error("两次输入密码不一致!"));
        } else {
          callback();
        }
@@ -216,12 +245,12 @@
        page: {
          pageSize: 10,
          currentPage: 1,
          total: 0
        total: 0,
        },
        platformPage: {
          pageSize: 10,
          currentPage: 1,
          total: 0
        total: 0,
        },
        init: {
          roleTree: [],
@@ -229,38 +258,40 @@
        },
        props: {
          label: "title",
          value: "key"
        value: "key",
        },
        roleGrantList: [],
        roleTreeObj: [],
        treeDeptId: '',
      treeDeptId: "",
        treeData: [],
        treeOption: {
          nodeKey: 'id',
        nodeKey: "id",
          lazy: true,
          treeLoad: function (node, resolve) {
            const parentId = (node.level === 0) ? 0 : node.data.id;
            getDeptLazyTree(parentId).then(res => {
              resolve(res.data.data.map(item => {
          const parentId = node.level === 0 ? 0 : node.data.id;
          getDeptLazyTree(parentId).then((res) => {
            resolve(
              res.data.data.map((item) => {
                return {
                  ...item,
                  leaf: !item.hasChildren
                }
              }))
                  leaf: !item.hasChildren,
                };
              })
            );
            });
          },
          addBtn: false,
          menu: false,
          size: 'small',
        size: "small",
          props: {
            labelText: '标题',
            label: 'title',
            value: 'value',
            children: 'children'
          }
          labelText: "标题",
          label: "title",
          value: "value",
          children: "children",
        },
        },
        option: {
          height: 'auto',
        height: "auto",
          calcHeight: 54,
          tip: false,
          searchShow: true,
@@ -276,55 +307,54 @@
              label: "登录账号",
              prop: "account",
              search: true,
              display: false
            display: false,
            },
            {
              label: "所属客户",
              prop: "tenantName",
              slot: true,
              display: false,
              width:200
            width: 200,
            },
            {
              label: "用户姓名",
              prop: "realName",
              search: true,
              display: false
            display: false,
            },
            {
              label: "所属角色",
              prop: "roleName",
              slot: true,
              display: false
            display: false,
            },
            {
              label: "所属部门",
              prop: "deptName",
              slot: true,
              display: false,
              width:260
            width: 260,
            },

            {
              label: "用户平台",
              prop: "userTypeName",
              slot: true,
              display: false
            }
            , {
            display: false,
          },
          {
              label: "在线状态",
              prop: "online_status",
              slot: true,
              hide: true,
              display: false
            }
            ,
            display: false,
          },
            {
              label: "工作状态",
              prop: "work_status",
              slot: true,
              hide: true,
              display: false
            display: false,
            },
            {
              label: "用户平台",
@@ -332,25 +362,27 @@
              dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
              props: {
                label: "dictValue",
                value: "dictKey"
              value: "dictKey",
              },
              dataType: "number",
              search: true,
              hide: true,
              display: false,
              prop: "userType",
              rules: [{
            rules: [
              {
                required: true,
                message: "请选择用户平台",
                trigger: "blur"
              }]
                trigger: "blur",
              },
            ],
            },
          ],
          group: [
            {
              label: '基础信息',
              prop: 'baseInfo',
              icon: 'el-icon-user-solid',
            label: "基础信息",
            prop: "baseInfo",
            icon: "el-icon-user-solid",
              column: [
                {
                  label: "所属客户",
@@ -359,27 +391,52 @@
                  dicUrl: "/api/blade-system/tenant/select",
                  props: {
                    label: "tenantName",
                    value: "tenantId"
                  value: "tenantId",
                  },
                  hide: !website.tenantMode,
                  addDisplay: website.tenantMode,
                  editDisplay: website.tenantMode,
                  viewDisplay: website.tenantMode,
                  rules: [{
                rules: [
                  {
                    required: true,
                    message: "请输入所属租户",
                    trigger: "click"
                  }],
                  span: 24,
                    trigger: "click",
                  },
                ],
                // span: 24,
              },
              {
                label: "行政区",
                prop: "regionId",
                type: "select",
                props: {
                  label: "name",
                  value: "code",
                },
                dicUrl: "/api/blade-system/region/select?code=3601",
                hide: true,
                addDisplay: true,
                editDisplay: true,
                viewDisplay: true,
                rules: [
                  {
                    required: true,
                    message: "请选择行政区",
                    trigger: "blur",
                  },
                ],
                },
                {
                  label: "登录账号",
                  prop: "account",
                  rules: [{
                rules: [
                  {
                    required: true,
                    message: "请输入登录账号",
                    trigger: "blur"
                  }],
                    trigger: "blur",
                  },
                ],
                },
                {
                  label: "用户平台",
@@ -387,73 +444,84 @@
                  dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
                  props: {
                    label: "dictValue",
                    value: "dictKey"
                  value: "dictKey",
                  },
                  dataType: "number",
                  slot: true,
                  prop: "userType",
                  rules: [{
                rules: [
                  {
                    required: true,
                    message: "请选择用户平台",
                    trigger: "blur"
                  }]
                    trigger: "blur",
                  },
                ],
                },
                {
                  label: '密码',
                  prop: 'password',
                label: "密码",
                prop: "password",
                  hide: true,
                  editDisplay: false,
                  viewDisplay: false,
                  rules: [{required: true, validator: validatePass, trigger: 'blur'}]
                rules: [
                  { required: true, validator: validatePass, trigger: "blur" },
                ],
                },
                {
                  label: '确认密码',
                  prop: 'password2',
                label: "确认密码",
                prop: "password2",
                  hide: true,
                  editDisplay: false,
                  viewDisplay: false,
                  rules: [{required: true, validator: validatePass2, trigger: 'blur'}]
                rules: [
                  { required: true, validator: validatePass2, trigger: "blur" },
                ],
                },
              ]
            ],
            },
            {
              label: '详细信息',
              prop: 'detailInfo',
              icon: 'el-icon-s-order',
            label: "详细信息",
            prop: "detailInfo",
            icon: "el-icon-s-order",
              column: [
                {
                  label: "用户昵称",
                  prop: "name",
                  hide: true,
                  rules: [{
                rules: [
                  {
                    required: true,
                    message: "请输入用户昵称",
                    trigger: "blur"
                  }]
                    trigger: "blur",
                  },
                ],
                },
                {
                  label: "用户姓名",
                  prop: "realName",
                  rules: [{
                rules: [
                  {
                    required: true,
                    message: "请输入用户姓名",
                    trigger: "blur"
                  }, {
                    trigger: "blur",
                  },
                  {
                    min: 2,
                    max: 5,
                    message: '姓名长度在2到5个字符'
                  }]
                    message: "姓名长度在2到5个字符",
                  },
                ],
                },
                {
                  label: "手机号码",
                  prop: "phone",
                  overHidden: true
                overHidden: true,
                },
                {
                  label: "电子邮箱",
                  prop: "email",
                  hide: true,
                  overHidden: true
                overHidden: true,
                },
                {
                  label: "用户性别",
@@ -462,18 +530,18 @@
                  dicData: [
                    {
                      label: "男",
                      value: 1
                    value: 1,
                    },
                    {
                      label: "女",
                      value: 2
                    value: 2,
                    },
                    {
                      label: "未知",
                      value: 3
                    }
                    value: 3,
                  },
                  ],
                  hide: true
                hide: true,
                },
                {
                  label: "用户生日",
@@ -481,20 +549,20 @@
                  prop: "birthday",
                  format: "yyyy-MM-dd hh:mm:ss",
                  valueFormat: "yyyy-MM-dd hh:mm:ss",
                  hide: true
                hide: true,
                },
                {
                  label: "账号状态",
                  prop: "statusName",
                  hide: true,
                  display: false
                }
              ]
                display: false,
              },
            ],
            },
            {
              label: '职责信息',
              prop: 'dutyInfo',
              icon: 'el-icon-s-custom',
            label: "职责信息",
            prop: "dutyInfo",
            icon: "el-icon-s-custom",
              column: [
                {
                  label: "用户编号",
@@ -507,15 +575,17 @@
                  type: "tree",
                  dicData: [],
                  props: {
                    label: "title"
                  label: "title",
                  },
                  checkStrictly: true,
                  slot: true,
                  rules: [{
                rules: [
                  {
                    required: true,
                    message: "请选择所属角色",
                    trigger: "click"
                  }]
                    trigger: "click",
                  },
                ],
                },
                {
                  label: "所属部门",
@@ -524,15 +594,17 @@
                  //multiple: true,
                  dicData: [],
                  props: {
                    label: "title"
                  label: "title",
                  },
                  checkStrictly: true,
                  slot: true,
                  rules: [{
                rules: [
                  {
                    required: true,
                    message: "请选择所属部门",
                    trigger: "click"
                  }]
                    trigger: "click",
                  },
                ],
                },
                {
                  label: "所属岗位",
@@ -542,13 +614,12 @@
                  dicData: [],
                  props: {
                    label: "postName",
                    value: "id"
                  value: "id",
                  },

                },
              ]
            ],
            },
          ]
        ],
        },
        data: [],
        platformQuery: {},
@@ -565,31 +636,31 @@
          viewBtn: true,
          dialogClickModal: false,
          menuWidth: 120,
          editBtnText: '配置',
        editBtnText: "配置",
          column: [
            {
              label: "登录账号",
              prop: "account",
              search: true,
              display: false
            display: false,
            },
            {
              label: "所属租户",
              prop: "tenantName",
              slot: true,
              display: false
            display: false,
            },
            {
              label: "用户姓名",
              prop: "realName",
              search: true,
              display: false
            display: false,
            },
            {
              label: "用户平台",
              prop: "userTypeName",
              slot: true,
              display: false
            display: false,
            },
            {
              label: "用户平台",
@@ -597,18 +668,20 @@
              dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
              props: {
                label: "dictValue",
                value: "dictKey"
              value: "dictKey",
              },
              dataType: "number",
              search: true,
              hide: true,
              display: false,
              prop: "userType",
              rules: [{
            rules: [
              {
                required: true,
                message: "请选择用户平台",
                trigger: "blur"
              }]
                trigger: "blur",
              },
            ],
            },
            {
              label: "用户拓展",
@@ -628,17 +701,17 @@
          emptyBtn: false,
          column: [
            {
              label: '模板上传',
              prop: 'excelFile',
              type: 'upload',
            label: "模板上传",
            prop: "excelFile",
            type: "upload",
              drag: true,
              loadText: '模板上传中，请稍等',
            loadText: "模板上传中，请稍等",
              span: 24,
              propsHttp: {
                res: 'data'
              res: "data",
              },
              tip: '请上传 .xls,.xlsx 标准格式文件',
              action: "/api/blade-user/import-user"
            tip: "请上传 .xls,.xlsx 标准格式文件",
            action: "/api/blade-user/import-user",
            },
            {
              label: "数据覆盖",
@@ -649,12 +722,12 @@
              dicData: [
                {
                  label: "否",
                  value: 0
                value: 0,
                },
                {
                  label: "是",
                  value: 1
                }
                value: 1,
              },
              ],
              value: 0,
              slot: true,
@@ -662,32 +735,32 @@
                {
                  required: true,
                  message: "请选择是否覆盖",
                  trigger: "blur"
                }
              ]
                trigger: "blur",
              },
            ],
            },
            {
              label: '模板下载',
              prop: 'excelTemplate',
            label: "模板下载",
            prop: "excelTemplate",
              formslot: true,
              span: 24,
            }
          ]
        }
          },
        ],
      },
      };
    },
    watch: {
      'form.tenantId'() {
        if (this.form.tenantId !== '' && this.initFlag) {
    "form.tenantId"() {
      if (this.form.tenantId !== "" && this.initFlag) {
          this.initData(this.form.tenantId);
        }
      },
      'excelForm.isCovered'() {
        if (this.excelForm.isCovered !== '') {
    "excelForm.isCovered"() {
      if (this.excelForm.isCovered !== "") {
          const column = this.findObject(this.excelOption.column, "excelFile");
          column.action = `/api/blade-user/import-user?isCovered=${this.excelForm.isCovered}`;
        }
      }
    },
    },
    computed: {
      ...mapGetters(["userInfo", "permission"]),
@@ -696,7 +769,7 @@
          addBtn: this.vaildData(this.permission.user_add, false),
          viewBtn: this.vaildData(this.permission.user_view, false),
          delBtn: this.vaildData(this.permission.user_delete, false),
          editBtn: this.vaildData(this.permission.user_edit, false)
        editBtn: this.vaildData(this.permission.user_edit, false),
        };
      },
      platformPermissionList() {
@@ -704,12 +777,12 @@
          addBtn: false,
          viewBtn: false,
          delBtn: false,
          editBtn: this.vaildData(this.permission.user_edit, false)
        editBtn: this.vaildData(this.permission.user_edit, false),
        };
      },
      ids() {
        let ids = [];
        this.selectionList.forEach(ele => {
      this.selectionList.forEach((ele) => {
          ids.push(ele.id);
        });
        return ids.join(",");
@@ -728,15 +801,15 @@
        this.onLoad(this.page);
      },
      initData(tenantId) {
        getRoleTree(tenantId).then(res => {
      getRoleTree(tenantId).then((res) => {
          const column = this.findObject(this.option.group, "roleId");
          column.dicData = res.data.data;
        });
        getDeptTree(tenantId).then(res => {
      getDeptTree(tenantId).then((res) => {
          const column = this.findObject(this.option.group, "deptId");
          column.dicData = res.data.data;
        });
        getPostList(tenantId).then(res => {
      getPostList(tenantId).then((res) => {
          const column = this.findObject(this.option.group, "postId");
          column.dicData = res.data.data;
        });
@@ -747,7 +820,7 @@
          this.roleBox = false;
          this.$message({
            type: "success",
            message: "操作成功!"
          message: "操作成功!",
          });
          this.onLoad(this.page);
        });
@@ -756,41 +829,47 @@
        row.deptId = row.deptId.join(",");
        row.roleId = row.roleId.join(",");
        row.postId = row.postId.join(",");
        add(row).then(() => {
      add(row).then(
        () => {
          this.initFlag = false;
          this.onLoad(this.page);
          this.$message({
            type: "success",
            message: "操作成功!"
            message: "操作成功!",
          });
          done();
        }, error => {
        },
        (error) => {
          window.console.log(error);
          loading();
        });
        }
      );
      },
      rowUpdate(row, index, done, loading) {
        row.deptId = row.deptId.join(",");
        row.roleId = row.roleId.join(",");
        row.postId = row.postId.join(",");
        update(row).then(() => {
      update(row).then(
        () => {
          this.initFlag = false;
          this.onLoad(this.page);
          this.$message({
            type: "success",
            message: "操作成功!"
            message: "操作成功!",
          });
          done();
        }, error => {
        },
        (error) => {
          window.console.log(error);
          loading();
        });
        }
      );
      },
      rowDel(row) {
        this.$confirm("确定将选择数据删除?", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        type: "warning",
        })
          .then(() => {
            return remove(row.id);
@@ -799,13 +878,13 @@
            this.onLoad(this.page);
            this.$message({
              type: "success",
              message: "操作成功!"
            message: "操作成功!",
            });
          });
      },
      searchReset() {
        this.query = {};
        this.treeDeptId = '';
      this.treeDeptId = "";
        this.onLoad(this.page);
      },
      searchChange(params, done) {
@@ -829,7 +908,7 @@
        this.$confirm("确定将选择数据删除?", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        type: "warning",
        })
          .then(() => {
            return remove(this.ids);
@@ -838,7 +917,7 @@
            this.onLoad(this.page);
            this.$message({
              type: "success",
              message: "操作成功!"
            message: "操作成功!",
            });
            this.$refs.crud.toggleSelection();
          });
@@ -851,7 +930,7 @@
        this.$confirm("确定将选择账号密码重置为123456?", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        type: "warning",
        })
          .then(() => {
            return resetPassword(this.ids);
@@ -859,7 +938,7 @@
          .then(() => {
            this.$message({
              type: "success",
              message: "操作成功!"
            message: "操作成功!",
            });
            this.$refs.crud.toggleSelection();
          });
@@ -873,7 +952,7 @@
        if (this.selectionList.length === 1) {
          this.roleTreeObj = this.selectionList[0].roleId.split(",");
        }
        getRoleTree().then(res => {
      getRoleTree().then((res) => {
          this.roleGrantList = res.data.data;
          this.roleBox = true;
        });
@@ -893,17 +972,27 @@
        this.$confirm("是否导出用户数据?", "提示", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        type: "warning",
        }).then(() => {
          window.open(`/api/blade-user/export-user?${this.website.tokenHeader}=${getToken()}&account=${this.search.account}&realName=${this.search.realName}`);
        window.open(
          `/api/blade-user/export-user?${
            this.website.tokenHeader
          }=${getToken()}&account=${this.search.account}&realName=${
            this.search.realName
          }`
        );
        });
      },
      handleTemplate() {
        window.open(`/api/blade-user/export-template?${this.website.tokenHeader}=${getToken()}`);
      window.open(
        `/api/blade-user/export-template?${
          this.website.tokenHeader
        }=${getToken()}`
      );
      },
      beforeOpen(done, type) {
        if (["edit", "view"].includes(type)) {
          getUser(this.form.id).then(res => {
        getUser(this.form.id).then((res) => {
            this.form = res.data.data;
            if (this.form.hasOwnProperty("deptId")) {
              this.form.deptId = this.form.deptId.split(",");
@@ -930,7 +1019,12 @@
      },
      onLoad(page, params = {}) {
        this.loading = true;
        getList(page.currentPage, page.pageSize, Object.assign(params, this.query), this.treeDeptId).then(res => {
      getList(
        page.currentPage,
        page.pageSize,
        Object.assign(params, this.query),
        this.treeDeptId
      ).then((res) => {
          const data = res.data.data;
          this.page.total = data.total;
          this.data = data.records;
@@ -939,21 +1033,24 @@
        });
      },
      platformRowUpdate(row, index, done, loading) {
        updatePlatform(row.id, row.userType, row.userExt).then(() => {
      updatePlatform(row.id, row.userType, row.userExt).then(
        () => {
          this.platformOnLoad(this.platformPage);
          this.$message({
            type: "success",
            message: "操作成功!"
            message: "操作成功!",
          });
          done();
        }, error => {
        },
        (error) => {
          window.console.log(error);
          loading();
        });
        }
      );
      },
      platformBeforeOpen(done, type) {
        if (["edit", "view"].includes(type)) {
          getUserPlatform(this.platformForm.id).then(res => {
        getUserPlatform(this.platformForm.id).then((res) => {
            this.platformForm = res.data.data;
          });
        }
@@ -987,15 +1084,20 @@
      },
      platformOnLoad(page, params = {}) {
        this.platformLoading = true;
        getList(page.currentPage, page.pageSize, Object.assign(params, this.query), this.treeDeptId).then(res => {
      getList(
        page.currentPage,
        page.pageSize,
        Object.assign(params, this.query),
        this.treeDeptId
      ).then((res) => {
          const data = res.data.data;
          this.platformPage.total = data.total;
          this.platformData = data.records;
          this.platformLoading = false;
          this.selectionClear();
        });
      }
    }
    },
  },
  };
</script>