Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises

liuyg

2021-07-10 8ef98bfd45d97a4c7d494d5a4e51b573df8da268

Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises

 src/views/securityGuard/data.js

@@ -132,6 +132,157 @@
]


export var securityBaseInfoColumns = [{
        label: "所属保安单位",
        prop: "tenantId",
        type: "tree",
        dicUrl: "/api/blade-system/tenant/select",
        props: {
            label: "tenantName",
            value: "tenantId"
        },
        disabled: true,
        span: 24,
    },
    {
        label: "登录账号",
        prop: "account",
        disabled: true
    },
    {
        label: "用户姓名",
        prop: "realName",
        rules: [{
            required: true,
            message: "请输入用户姓名",
            trigger: "blur"
        }, {
            min: 2,
            max: 5,
            message: '姓名长度在2到5个字符'
        }]
    },
    {
        label: "用户昵称",
        prop: "name"
    },
    {
        label: "手机号码",
        prop: "phone",
        overHidden: true,
        rules: [{
            required: true,
            message: "请输入手机号",
            trigger: "blur"
        }]
    },
    {
        label: "电子邮箱",
        prop: "email",
        hide: true,
        overHidden: true
    },
    {
        label: "身份证号",
        prop: "cardid",
        hide: true,
        overHidden: true,
        rules: [{
            required: true,
            message: "请输入身份证号",
            trigger: "blur"
        }]
    },
    {
        label: "籍贯",
        prop: "nativeplace",
        hide: true,
        overHidden: true
    },
    {
        label: "民族",
        prop: "nation",
        hide: true,
        overHidden: true
    },
    {
        label: "最高学历",
        prop: "education",
        type: "select",
        dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
        props: {
            label: "dictValue",
            value: "dictKey"
        },
        dataType: "number",
        slot: true,
        rules: [{
            required: true,
            message: "请选择学历",
            trigger: "blur"
        }]
    },
    {
        label: "政治面貌",
        prop: "politicaloutlook",
        hide: true,
        overHidden: true
    },
    {
        label: "身高",
        prop: "height",
        hide: true,
        overHidden: true
    },
    {
        label: "联系地址",
        prop: "address",
        hide: true,
        overHidden: true
    },
    {
        label: "户口所在地",
        prop: "registered",
        hide: true,
        overHidden: true
    },
    {
        label: "入职时间",
        prop: "rtime",
        type: 'date',
        format: "yyyy-MM-dd",
        valueFormat: "yyyy-MM-dd",
        hide: true,
        overHidden: true
    },
    {
        label: "用户性别",
        prop: "sex",
        type: "select",
        dicData: [{
                label: "男",
                value: 1
            },
            {
                label: "女",
                value: 2
            },
            {
                label: "未知",
                value: 3
            }
        ],
        hide: true
    },
    {
        label: "用户生日",
        type: "date",
        prop: "birthday",
        hide: true
    }
]


//从业记录
export var practitionersColumn = [{
    label: "id",
@@ -175,7 +326,48 @@
    formslot: true,
}]


export var practitionersColumns = [{
    width: 200,
    label: '单位名称',
    prop: "companyname",
    formslot: true,
}, {
    width: 200,
    label: '部门',
    prop: "department",
    formslot: true,
}, {
    width: 200,
    label: '岗位',
    prop: "post",
    formslot: true,
}, {
    width: 200,
    label: '岗位职责',
    prop: "responsibilities",
    formslot: true,
}, {
    width: 200,
    label: '入职时间',
    type: 'date',
    format: "yyyy-MM-dd",
    valueFormat: "yyyy-MM-dd",
    prop: "entryTime",
    formslot: true,
}, {
    width: 200,
    label: '离职时间',
    type: 'date',
    format: "yyyy-MM-dd",
    valueFormat: "yyyy-MM-dd",
    prop: "departureTime",
    formslot: true,
}, {
    width: 200,
    label: '离职原因',
    prop: "leaving",
    formslot: true,
}]

export var trackRecordColumn = [{
    label: "id",
@@ -218,3 +410,132 @@
    prop: "leaving",
    formslot: true,
}]


export var securityFormPageColumn = [{
        label: "用户姓名",
        prop: "realName",
        search: true,
        searchSpan: 4,
        display: false
    },
    {
        label: "性别",
        prop: "sex",
        type: "select",
        slot: true,
        display: false
    },

    {
        label: "籍贯",
        prop: "nativeplace",
        display: false
    },
    {
        label: "民族",
        prop: "nation",
        display: false
    },
    {
        label: "出生日期",
        prop: "birthday",
        type: "date",
        format: "yyyy-MM-dd",
        valueFormat: "yyyy-MM-dd",
        display: false
    },
    {
        label: "学历",
        prop: "education",
        display: false,
        dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
        props: {
            label: "dictValue",
            value: "dictKey"
        },
        type: "select",
        rules: [{
            required: true,
            message: "请选择学历",
            trigger: "blur"
        }],
    },
    {
        label: "联系电话",
        prop: "phone",
        display: false
    },
    {
        label: "邮箱",
        prop: "email",
        display: false,
        width: 150
    },
    {
        label: "入职时间",
        prop: "rtime",
        display: false
    },
    {
        label: "组织机构名称",
        searchLabelWidth: "110",
        // prop: "deptName",
        prop: "deptId",
        type: "tree",
        dicUrl: "/api/blade-system/dept/lazy-tree?parentId=0",
        props: {
            label: "title",
            value: "id",
        },
        slot: true,
        searchSpan: 5,
        display: false,
        search: true,
        width: 260
    },
    {
        label: "岗位",
        prop: "postName",
        slot: true,
        display: false
    },
    // {
    //     label: "入职时间",
    //     prop: "rtime",
    //     type: "datetime",
    //     format: "yyyy-MM-dd",
    //     valueFormat: "yyyy-MM-dd",
    //     searchRange: true,
    //     searchSpan: 6,
    //     hide: true,
    //     addDisplay: false,
    //     editDisplay: false,
    //     viewDisplay: false,
    //     search: true,
    //     rules: [{
    //         required: true,
    //         message: "请输入时间",
    //         trigger: "blur"
    //     }]
    // },
    {
        label: "在职状态",
        prop: "status",
        type: "select",
        dicUrl: "/api/blade-system/dict-biz/dictionary?code=workerState",
        props: {
            label: "dictValue",
            value: "dictKey"
        },
        dataType: "number",
        display: false,
        searchSpan: 3,
        search: true,
        rules: [{
            required: true,
            message: "请选择在职状态",
            trigger: "blur"
        }]
    },
]

 src/views/securityGuard/securityGuard.vue

@@ -1,17 +1,25 @@
<template>
  <div class="ours">
    <!-- <add-or-update v-if="addOrUpdateVisiable" ref="addOrUpdate"></add-or-update> -->
    <add-or-update ref="addOrUpdate"></add-or-update>
  <el-row>
    <!-- <el-col :span="5">
      <el-col :span="0" style="display: none">
      <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>
      </el-col>
      <el-col :span="24">
      <basic-container>
        <avue-crud :option="option"
          <avue-crud
            :option="option"
                   :search.sync="search"
                   :table-loading="loading"
                   :data="data"
@@ -30,48 +38,135 @@
                   @current-change="currentChange"
                   @size-change="sizeChange"
                   @refresh-change="refreshChange"
                   @on-load="onLoad">
                  
          <template slot-scope="{ type, size, row }" slot="menu">
            <el-button icon="el-icon-edit" :size="size" :type="type" @click.stop="rowDel(row)">离职登记
            @on-load="onLoad"
          >
            <template slot="menuLeft">
              <el-button
                type="danger"
                style="display: none"
                size="small"
                plain
                icon="el-icon-delete"
                v-if="permission.user_delete"
                @click="handleDelete"
                >注 销
              </el-button>
              <el-button
                type="info"
                style="display: none"
                size="small"
                plain
                v-if="permission.user_role"
                icon="el-icon-user"
                @click="handleGrant"
                >角色配置
              </el-button>
              <el-button
                type="info"
                style="display: none"
                size="small"
                plain
                v-if="permission.user_reset"
                icon="el-icon-refresh"
                @click="handleReset"
                >密码重置
              </el-button>
              <el-button
                type="info"
                style="display: none"
                size="small"
                plain
                v-if="userInfo.role_name.includes('admin')"
                icon="el-icon-setting"
                @click="handlePlatform"
                >平台配置
              </el-button>
              <el-button
                type="success"
                style="display: none"
                size="small"
                plain
                v-if="userInfo.role_name.includes('admin')"
                icon="el-icon-upload2"
                @click="handleImport"
                >导入
              </el-button>
              <el-button
                type="warning"
                style="display: none"
                size="small"
                plain
                v-if="userInfo.role_name.includes('admin')"
                icon="el-icon-download"
                @click="handleExport"
                >导出
            </el-button>
          </template>
          <template slot-scope="{row}"
                    slot="tenantName">

            <template slot-scope="{ type, size, row }" slot="menu">
              <el-button
                icon="el-icon-edit"
                :size="size"
                :type="type"
                @click.stop="addOrUpdateHandle(row)"
                >修改
              </el-button>
              <el-button
                icon="el-icon-edit"
                :size="size"
                :type="type"
                @click.stop="rowDel(row)"
                >离职登记
              </el-button>
            </template>

            <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="status">
            <el-tag
            >{{
              row.status == "0" ? "已离职" : row.status == "1" ? "在职" : "已离职"
              }}
            </el-tag>
          </template>
          <template slot-scope="{ row }" slot="sex">
            <el-tag
            >{{
              row.sex == 1 ? "男" : "女"
              }}
            </el-tag>
          </template>
        </avue-crud>
        <el-dialog title="用户数据导入"
          <el-dialog
            title="用户角色配置"
            append-to-body
            :visible.sync="roleBox"
            width="345px"
          >
            <el-tree
              :data="roleGrantList"
              show-checkbox
              check-strictly
              default-expand-all
              node-key="id"
              ref="treeRole"
              :default-checked-keys="roleTreeObj"
              :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>
            </span>
          </el-dialog>
          <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>
@@ -79,10 +174,13 @@
            </template>
          </avue-form>
        </el-dialog>
        <el-dialog title="用户平台配置"
          <el-dialog
            title="用户平台配置"
                   append-to-body
                   :visible.sync="platformBox">
          <avue-crud :option="platformOption"
            :visible.sync="platformBox"
          >
            <avue-crud
              :option="platformOption"
                     :table-loading="platformLoading"
                     :data="platformData"
                     ref="platformCrud"
@@ -97,13 +195,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>
@@ -111,51 +208,74 @@
      </basic-container>
    </el-col>
  </el-row>
  </div>
</template>

<script>
  import {
  getList,
    getUser,
    getUserPlatform,
  remove,
    update,
    updatePlatform,
    add,
    grant,
    getUserPractitionersInfo
  resetPassword,
  getUserPractitionersInfo,
  } from "@/api/system/user";
    import {getList} from "@/api/securityGuard/securityGuard";
  import {getDeptTree} from "@/api/system/dept";
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";
import { securityFormPageColumn, securityBaseInfoColumns } from "./data";

import addOrUpdate from "./securityGuardRegistration.vue";
  export default {
  components: {
    addOrUpdate,
  },
    data() {
    const validatePass = (rule, value, callback) => {
      if (value === "") {
        callback(new Error("请输入密码"));
      } else {
        callback();
      }
    };
    const validatePass2 = (rule, value, callback) => {
      if (value === "") {
        callback(new Error("请再次输入密码"));
      } else if (value !== this.form.password) {
        callback(new Error("两次输入密码不一致!"));
      } else {
        callback();
      }
    };
      return {
        baseUrl:"/map/index.html?ISinit=1",
      floats: false,
        form: {},
        search: {},
        roleBox: false,
        excelBox: false,
        platformBox: false,
        showMap: false,
        initFlag: true,
        selectionList: [],
        query: {},
      addOrUpdateVisiable: false,
        loading: true,
        roleId:"",
        platformLoading: false,
        page: {
          pageSize: 10,
          currentPage: 1,
          total: 0
        total: 0,
        },
        platformPage: {
          pageSize: 10,
          currentPage: 1,
          total: 0
        total: 0,
        },
        init: {
          roleTree: [],
@@ -163,158 +283,59 @@
        },
        props: {
          label: "title",
          value: "key"
        value: "key",
        },
        roleGrantList: [],
        roleTreeObj: [],
        treeDeptId: '',
      treeDeptId: "",
        treeData: [],
      treeOption: {
        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) => {
                return {
                  ...item,
                  leaf: !item.hasChildren,
                };
              })
            );
          });
        },
        addBtn: false,
        menu: false,
        size: "small",
        props: {
          labelText: "标题",
          label: "title",
          value: "value",
          children: "children",
        },
      },
        option: {
          height: 'auto',
          calcHeight: 54,
        height: "auto",
        calcHeight: 80,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,
          border: false,
          stripe: true,
          index: true,
        delBtnText: "注销",
          selection: true,
          viewBtn: true,
          delBtnText:'离职登记',
          editBtnText:'修改',
          menuWidth:200,
          //dialogType: 'drawer',
          dialogClickModal: false,
          column: [
            
           
            {
              label: "用户姓名",
              prop: "realName",
              search: true,
              searchSpan:4,
              display: false
            },
            {
              label: "性别",
              prop: "sex",
              type: "select",
              slot:true,
              display: false
            },
            
             {
              label: "籍贯",
              prop: "nativePlace",
              display: false
            },
             {
              label: "民族",
              prop: "nation",
              display: false
            },
            {
              label: "出生日期",
              prop: "birthday",
              type: "date",
              format: "yyyy-MM-dd",
              valueFormat: "yyyy-MM-dd",
              display: false
            },
            {
              label: "学历",
              prop: "education",
              display: false,
              dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
              props: {
                label: "dictValue",
                value: "dictKey"
              },
              type:"select",
              rules: [{
                required: true,
                message: "请选择学历",
                trigger: "blur"
              }],
            },
            {
              label: "联系电话",
              prop: "phone",
              display: false
            },
            {
              label: "邮箱",
              prop: "email",
              display: false,
              width:150
            },
            {
              label: "入职时间",
              prop: "rtime",
              display: false
            },
            {
              label: "部门名称",
              prop: "deptName",
              slot: true,
              searchSpan:4,
              display: false,
              search:true,
              width:260
            },
            {
              label: "岗位",
              prop: "postName",
              slot: true,
              display: false
            },
            {
              label: "入职时间",
              prop: "rtime",
              type: "datetime",
              format: "yyyy-MM-dd",
              valueFormat: "yyyy-MM-dd",
              searchRange: true,
              searchSpan: 6,
              hide: true,
              addDisplay: false,
              editDisplay: false,
              viewDisplay: false,
              search: true,
              rules: [
                {
                  required: true,
                  message: "请输入时间",
                  trigger: "blur"
                }
              ]
            },
            {
                  label: "在职状态",
                  prop: "status",
                  type: "select",
                  dicUrl: "/api/blade-system/dict-biz/dictionary?code=workerState",
                  props: {
                    label: "dictValue",
                    value: "dictKey"
                  },
                  dataType: "number",
                  display: false,
                  searchSpan:3,
                  search:true,
                  rules: [{
                    required: true,
                    message: "请选择在职状态",
                    trigger: "blur"
                  }]
                },
          ],
        column: securityFormPageColumn,
          group: [
            {
              label: '基础信息',
              prop: 'baseInfo',
            label: "基础信息",
              labelWidth:"110",
              icon: 'el-icon-user-solid',
            prop: "baseInfo",
            icon: "el-icon-user-solid",
              column: [
                {
                  label: "所属保安单位",
@@ -323,121 +344,117 @@
                  dicUrl: "/api/blade-system/tenant/select",
                  props: {
                    label: "tenantName",
                    value: "tenantId"
                  value: "tenantId",
                  },
                  disabled:true,
                hide: !website.tenantMode,
                addDisplay: website.tenantMode,
                editDisplay: website.tenantMode,
                viewDisplay: website.tenantMode,
                rules: [
                  {
                    required: true,
                    message: "请输入所属保安单位",
                    trigger: "click",
                  },
                ],
                  span: 24,
                },
                {
                  label: "登录账号",
                  prop: "account",
                  disabled:true
                rules: [
                  {
                    required: true,
                    message: "请输入登录账号",
                    trigger: "blur",
                  },
                ],
              },
              {
                label: "用户平台",
                type: "select",
                dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
                props: {
                  label: "dictValue",
                  value: "dictKey",
                },
                dataType: "number",
                slot: true,
                prop: "userType",
                rules: [
                  {
                    required: true,
                    message: "请选择用户平台",
                    trigger: "blur",
                  },
                ],
              },
              {
                label: "密码",
                prop: "password",
                hide: true,
                editDisplay: false,
                viewDisplay: false,
                rules: [
                  { required: true, validator: validatePass, trigger: "blur" },
                ],
              },
              {
                label: "确认密码",
                prop: "password2",
                hide: true,
                editDisplay: false,
                viewDisplay: false,
                rules: [
                  { required: true, validator: validatePass2, trigger: "blur" },
                ],
              },
            ],
          },
          {
            label: "详细信息",
            labelWidth: "110",
            prop: "detailInfo",
            icon: "el-icon-s-order",
            column: [
              {
                label: "用户昵称",
                prop: "name",
                hide: true,
                rules: [
                  {
                    required: true,
                    message: "请输入用户昵称",
                    trigger: "blur",
                  },
                ],
                },
                {
                  label: "用户姓名",
                  prop: "realName",
                  rules: [{
                rules: [
                  {
                    required: true,
                    message: "请输入用户姓名",
                    trigger: "blur"
                  }, {
                    min: 2,
                    max: 5,
                    message: '姓名长度在2到5个字符'
                  }]
                    trigger: "blur",
                },
                {
                  label: "用户昵称",
                  prop: "name"
                    min: 2,
                    max: 5,
                    message: "姓名长度在2到5个字符",
                  },
                ],
                },
                {
                  label: "手机号码",
                  prop: "phone",
                  overHidden: true,
                  rules: [{
                    required: true,
                    message: "请输入手机号",
                    trigger: "blur"
                  }]
                },
                {
                  label: "电子邮箱",
                  prop: "email",
                  hide: true,
                  overHidden: true
                },
                {
                  label: "身份证号",
                  prop: "cardid",
                  hide: true,
                  overHidden: true,
                  rules: [{
                    required: true,
                    message: "请输入身份证号",
                    trigger: "blur"
                  }]
                },
                {
                  label: "籍贯",
                  prop: "nativePlace",
                  hide: true,
                  overHidden: true
                },
                {
                  label: "民族",
                  prop: "nation",
                  hide: true,
                  overHidden: true
                },
                {
                  label: "最高学历",
                  prop: "education",
                  type: "select",
                  dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
                  props: {
                    label: "dictValue",
                    value: "dictKey"
                  },
                  dataType: "number",
                  slot: true,
                  rules: [{
                    required: true,
                    message: "请选择学历",
                    trigger: "blur"
                  }]
                },
                {
                  label: "政治面貌",
                  prop: "politicaloutlook",
                  hide: true,
                  overHidden: true
                },
                {
                  label: "身高",
                  prop: "height",
                  hide: true,
                  overHidden: true
                },
                {
                  label: "联系地址",
                  prop: "address",
                  hide: true,
                  overHidden: true
                },
                {
                  label: "户口所在地",
                  prop: "registered",
                  hide: true,
                  overHidden: true
                },
                {
                  label: "入职时间",
                  prop: "rtime",
                  type:'date',
                  format: "yyyy-MM-dd",
                  valueFormat: "yyyy-MM-dd",
                  hide: true,
                  overHidden: true
                },
                {
                  label: "用户性别",
@@ -446,100 +463,104 @@
                  dicData: [
                    {
                      label: "男",
                      value: 1
                    value: 1,
                    },
                    {
                      label: "女",
                      value: 2
                    value: 2,
                    },
                    {
                      label: "未知",
                      value: 3
                    }
                    value: 3,
                  },
                  ],
                  hide: true
                hide: true,
                },
                {
                  label: "用户生日",
                  type: "date",
                  prop: "birthday",
                  hide: true
                }
              ]
                format: "yyyy-MM-dd hh:mm:ss",
                valueFormat: "yyyy-MM-dd hh:mm:ss",
                hide: true,
            },
            {
              label: '从业信息',
              prop: 'detailInfo',
              icon: 'el-icon-s-order',
                label: "账号状态",
                prop: "statusName",
                hide: true,
                display: false,
              },
            ],
          },
          {
            label: "职责信息",
            labelWidth: "110",
            prop: "dutyInfo",
            icon: "el-icon-s-custom",
              column: [
                    {
                    prop: 'UserPractitionersInfo',
                    type: 'dynamic',
                    border: false,
                    span:24,
                    children: {
                        align: 'left',
                        headerAlign: 'center',
                        type:'form',
                        rowAdd:(done)=>{
                            console.log(done,111);
                            done({
                                input:'默认值'
                            });
                label: "用户编号",
                prop: "code",
                        },
                        rowDel:(row,done)=>{
                            console.log(row,222);
                            done();
                        },
                        column: [
                                {
                                    width: 200,
                                    label: '单位名称',
                                    prop: "companyname",
                                    formslot: true,
                                }, {
                                    width: 200,
                                    label: '部门',
                                    prop: "department",
                                    formslot: true,
                                }, {
                                    width: 200,
                                    label: '岗位',
                                    prop: "post",
                                    formslot: true,
                                },  {
                                    width: 200,
                                    label: '岗位职责',
                                    prop: "responsibilities",
                                    formslot: true,
                                },  {
                                    width: 200,
                                    label: '入职时间',
                                    type:'date',
                                    format: "yyyy-MM-dd",
                                    valueFormat: "yyyy-MM-dd",
                                    prop: "entryTime",
                                    formslot: true,
                                },  {
                                    width: 200,
                                    label: '离职时间',
                                    type:'date',
                                    format: "yyyy-MM-dd",
                                    valueFormat: "yyyy-MM-dd",
                                    prop: "departureTime",
                                    formslot: true,
                                },  {
                                    width: 200,
                                    label: '离职原因',
                                    prop: "leaving",
                                    formslot: true,
                                }
                            ]
                        }
                label: "所属角色",
                prop: "roleId",
                multiple: true,
                type: "tree",
                dicData: [],
                props: {
                  label: "title",
                    },
                ]
            }
          ]
                checkStrictly: true,
                slot: true,
                rules: [
                  {
                    required: true,
                    message: "请选择所属角色",
                    trigger: "click",
                  },
                ],
              },
              {
                label: "所属部门",
                prop: "deptId",
                type: "tree",
                multiple: true,
                dicData: [],
                props: {
                  label: "title",
                },
                checkStrictly: true,
                slot: true,
                rules: [
                  {
                    required: true,
                    message: "请选择所属部门",
                    trigger: "click",
                  },
                ],
              },
              {
                label: "所属岗位",
                prop: "postId",
                type: "tree",
                multiple: true,
                dicData: [],
                props: {
                  label: "postName",
                  value: "id",
                },
                rules: [
                  {
                    required: true,
                    message: "请选择所属岗位",
                    trigger: "click",
                  },
                ],
              },
            ],
          },
        ],
        },
        data: [],
        platformQuery: {},
@@ -556,31 +577,31 @@
          viewBtn: true,
          dialogClickModal: false,
          menuWidth: 120,
          editBtnText: '配置',
        editBtnText: "配置",
          column: [
            {
              label: "登录账号",
              prop: "account",
              search: true,
              display: false
            display: false,
            },
            {
              label: "所属租户",
            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: "用户平台",
@@ -588,18 +609,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: "用户拓展",
@@ -619,17 +642,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: "数据覆盖",
@@ -640,12 +663,12 @@
              dicData: [
                {
                  label: "否",
                  value: 0
                value: 0,
                },
                {
                  label: "是",
                  value: 1
                }
                value: 1,
              },
              ],
              value: 0,
              slot: true,
@@ -653,32 +676,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"]),
@@ -687,7 +710,7 @@
          addBtn: this.vaildData(this.permission.user_add, false),
          viewBtn: this.vaildData(null, false),
          delBtn: this.vaildData(null, false),
          editBtn: this.vaildData(this.permission.user_edit, false)
        editBtn: this.vaildData(null, false),
        };
      },
      platformPermissionList() {
@@ -695,23 +718,22 @@
          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(",");
      },
    },
    mounted() {
      // 非租户模式默认加载管理组数据
    // 非保安单位模式默认加载管理组数据
      if (!website.tenantMode) {
        this.initData(website.tenantId);
      }

    },
    methods: {
      //行点击事件
@@ -721,36 +743,50 @@
          query: { row: row },
        });
      },
    //新增或修改
    addOrUpdateHandle(row) {
      this.$nextTick(() => {
          this.$refs.addOrUpdate.inits(row.id);
      });
    },
    closeOrUpdateHandle(row) {
      this.floats = row;
    },

    //获取用户信息
    getUserDetail() {
      var that = this;
      //获取用户基本信息
      getUser(this.userId).then((res) => {
        this.form = res.data.data;
        var userInfo = res.data.data;
        //获取用户从业信息
        getUserPractitionersInfo(userInfo.cardid).then((res1) => {
          that.form.UserPractitionersInfo = res1.data.data;
        });
        if (this.form.hasOwnProperty("deptId")) {
          this.form.deptId = this.form.deptId.split(",");
        }
        if (this.form.hasOwnProperty("postId")) {
          this.form.postId = this.form.postId.split(",");
        }
      });
    },
      nodeClick(data) {
        this.treeDeptId = data.id;
        this.page.currentPage = 1;
        this.onLoad(this.page);
      },
      initData(tenantId) {
        getRoleTree(tenantId).then(res => {
          var that = this;
      getRoleTree(tenantId).then((res) => {
          const column = this.findObject(this.option.group, "roleId");
          column.dicData = res.data.data;
          //数组
          var roleData = res.data.data;
          //遍历
          roleData.forEach((item)=>{
            if(item.title=="处警员"){
                that.roleId = item.id;
            }
            if(item.hasChildren){
              //取出title对比
              if(item.title=="处警员"){
                that.roleId = item.id;
              }
            }
          })
        });
        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;
        });
@@ -761,50 +797,56 @@
          this.roleBox = false;
          this.$message({
            type: "success",
            message: "操作成功!"
          message: "操作成功!",
          });
          this.onLoad(this.page);
        });
      },
      rowSave(row, done, loading) {
        row.deptId = row.deptId.join(",");
        row.roleId = this.roleId;
      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(() => {
            row.status="0";
@@ -814,13 +856,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) {
@@ -836,28 +878,49 @@
        this.selectionList = [];
        this.$refs.crud.toggleSelection();
      },
      // handleDelete() {
      //   if (this.selectionList.length === 0) {
      //     this.$message.warning("请选择至少一条数据");
      //     return;
      //   }
      //   this.$confirm("确定将选择用户登记离职?", {
      //     confirmButtonText: "确定",
      //     cancelButtonText: "取消",
      //     type: "warning"
      //   })
      //     .then(() => {
      //       return remove(this.ids);
      //     })
      //     .then(() => {
      //       this.onLoad(this.page);
      //       this.$message({
      //         type: "success",
      //         message: "操作成功!"
      //       });
      //       this.$refs.crud.toggleSelection();
      //     });
      // },
    handleDelete() {
      if (this.selectionList.length === 0) {
        this.$message.warning("请选择至少一条数据");
        return;
      }
      this.$confirm("确定将选择用户注销?", {
        confirmButtonText: "确定",
        cancelButtonText: "取消",
        type: "warning",
      })
        .then(() => {
          return remove(this.ids);
        })
        .then(() => {
          this.onLoad(this.page);
          this.$message({
            type: "success",
            message: "操作成功!",
          });
          this.$refs.crud.toggleSelection();
        });
    },
    handleReset() {
      if (this.selectionList.length === 0) {
        this.$message.warning("请选择至少一条数据");
        return;
      }
      this.$confirm("确定将选择账号密码重置为123456?", {
        confirmButtonText: "确定",
        cancelButtonText: "取消",
        type: "warning",
      })
        .then(() => {
          return resetPassword(this.ids);
        })
        .then(() => {
          this.$message({
            type: "success",
            message: "操作成功!",
          });
          this.$refs.crud.toggleSelection();
        });
    },
      handleGrant() {
        if (this.selectionList.length === 0) {
          this.$message.warning("请选择至少一条数据");
@@ -867,7 +930,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;
        });
@@ -878,7 +941,8 @@
      handleImport() {
        this.excelBox = true;
      },
      uploadAfter(done) {
    uploadAfter(res, done, loading, column) {
      window.console.log(column);
        this.excelBox = false;
        this.refreshChange();
        done();
@@ -887,26 +951,33 @@
        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) {
        var that = this;
        if (["edit", "view"].includes(type)) {
          getUser(this.form.id).then(res => {
        getUser(this.form.id).then((res) => {
            this.form = res.data.data;
            var userInfo = res.data.data;
            //获取用户从业信息
            getUserPractitionersInfo(userInfo.cardid).then(res1 =>{
               that.form.UserPractitionersInfo = res1.data.data;
            })
            if (this.form.hasOwnProperty("deptId")) {
              this.form.deptId = this.form.deptId.split(",");
          }
          if (this.form.hasOwnProperty("roleId")) {
            this.form.roleId = this.form.roleId.split(",");
            }
            if (this.form.hasOwnProperty("postId")) {
              this.form.postId = this.form.postId.split(",");
@@ -927,7 +998,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;
@@ -936,21 +1012,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;
          });
        }
@@ -984,19 +1063,28 @@
      },
      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>

<style>
.ours {
  width: 100%;
  height: 100%;
}
  .box {
    height: 800px;
  }
@@ -1008,4 +1096,16 @@
  .box .el-scrollbar__wrap {
    overflow: scroll;
  }
.floats {
  position: absolute;
  width: 100%;
  height: 100%;
  overflow: scroll;
  top: 0;
  left: 0;
  background-color: rgba(0,0,0,0.5);
  z-index: 500 !important;
  display: flex;
  justify-content: center;
}
</style>

 src/views/securityGuard/securityGuardDetail.vue

@@ -38,17 +38,17 @@
      optionTABS: {
        column: [
          {
            icon: "el-icon-info",
            // icon: "el-icon-info",
            label: "保安员入职登记基本信息",
            prop: "tab1",
          },
          {
            icon: "el-icon-info",
            // icon: "el-icon-info",
            label: "从业记录",
            prop: "tab2",
          },
          {
            icon: "el-icon-info",
            // icon: "el-icon-info",
            label: "现实表现记录",
            prop: "tab3",
          },
@@ -168,7 +168,7 @@
      for (var k in row) {
        this.obj0[k] = row[k];
      }
      this.obj0.title = row.name + "基本信息";
      this.obj0.title = "";
      this.cardid = row.cardid;
      this.name = row.name;
      this.dispatcherCompany = row.dispatcherCompany;

 src/views/securityGuard/securityGuardRegistration.vue

@@ -1,15 +1,18 @@
<template>
  <el-row>
    <el-col>
      <basic-container>
    <el-dialog
      :title="!form.id?'新增':'修改'"
      width="60%"
      modal-append-to-body='false'
      append-to-body='true'
      :close-on-click-model="true"
      :visible.sync="visible"
    >
        <avue-form :option="option" v-model="form" @submit="update">
            <template slot-scope="{row}" slot="input">
                <el-tag>{{row}}</el-tag>
            </template>
        </avue-form>
      </basic-container>
    </el-col>
  </el-row>
    </el-dialog>
</template>

<script>
@@ -17,55 +20,60 @@
    getUser,
    update,
    getUserPractitionersInfo,
    saveOrUpdateUserPractitionersInfo
  saveOrUpdateUserPractitionersInfo,
  } from "@/api/system/user";
  import {getDeptLazyTree} from "@/api/system/dept";

  export default {
  name: "securityGuardRegistration",
    data() {
      return {
        loading: true,
        userId:"",
      visible: false,
        init: {
          deptTree: [],
        },
        props: {
          label: "title",
          value: "key"
        value: "key",
        },
        roleGrantList: [],
        roleTreeObj: [],
        treeDeptId: '',
      treeDeptId: "",
        treeData: [],
        form:{
            UserPractitionersInfo:[]
        UserPractitionersInfo: [],
        title: "标题",
        },
        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,
@@ -77,19 +85,29 @@
          dialogClickModal: false,
          group: [
            {
              label: '基础信息',
            label: "",
            prop: "title",
            type: "title",
            span: 24,
            labelWidth: 140,
            style: {
              fontsize: 24,
            },
          },
          {
            label: "基础信息",
              labelWidth:"110",
              prop: 'baseInfo',
              icon: 'el-icon-user-solid',
            prop: "baseInfo",
            icon: "el-icon-user-solid",
              column: [
                {
                  label: "所属保安单位",
                  prop: "tenantId",
                label: "所属组织机构",
                prop: "deptId",
                  type: "tree",
                  dicUrl: "/api/blade-system/tenant/select",
                dicUrl: "/api/blade-system/dept/lazy-tree?parentId=0",
                  props: {
                    label: "tenantName",
                    value: "tenantId"
                  label: "title",
                  value: "id",
                  },
                  disabled:true,
                  span: 24,
@@ -97,97 +115,100 @@
                {
                  label: "登录账号",
                  prop: "account",
                  disabled:true
                disabled: true,
                },
                {
                  label: "用户姓名",
                  prop: "realName",
                  rules: [{
                rules: [
                  {
                    required: true,
                    message: "请输入用户姓名",
                    trigger: "blur"
                  }, {
                    trigger: "blur",
                  },
                  {
                    min: 2,
                    max: 5,
                    message: '姓名长度在2到5个字符'
                  }]
                    message: "姓名长度在2到5个字符",
                  },
                ],
                },
                {
                  label: "用户昵称",
                  prop: "name"
                prop: "name",
                },
                {
                  label: "手机号码",
                  prop: "phone",
                  overHidden: true,
                  rules: [{
                rules: [
                  {
                    required: true,
                    message: "请输入手机号",
                    trigger: "blur"
                  }]
                    trigger: "blur",
                  },
                ],
                },
                {
                  label: "电子邮箱",
                  prop: "email"
                prop: "email",
                },
                {
                  label: "身份证号",
                  prop: "cardid",
                  hide: true,
                  overHidden: true,
                  rules: [{
                rules: [
                  {
                    required: true,
                    message: "请输入身份证号",
                    trigger: "blur"
                  }]
                    trigger: "blur",
                  },
                ],
                },
                {
                  label: "籍贯",
                  prop: "nativeplace"
                prop: "nativeplace",
                },
                {
                  label: "民族",
                  prop: "nation"
                prop: "nation",
                },
                {
                  label: "最高学历",
                  prop: "education",
                  type: "select",
                  dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
                dicUrl:
                  "/api/blade-system/dict-biz/dictionary?code=educationType",
                  props: {
                    label: "dictValue",
                    value: "dictKey"
                  value: "dictKey",
                  },
                  dataType: "number",
                  slot: true,
                  rules: [{
                    required: true,
                    message: "请选择学历",
                    trigger: "blur"
                  }]
                slot: true
                },
                {
                  label: "政治面貌",
                  prop: "politicaloutlook"
                prop: "politicaloutlook",
                },
                {
                  label: "身高",
                  prop: "height"
                prop: "height",
                },
                {
                  label: "联系地址",
                  prop: "address"
                prop: "address",
                },
                {
                  label: "户口所在地",
                  prop: "registered"
                prop: "registered",
                },
                {
                  label: "入职时间",
                  prop: "rtime",
                  type:'date',
                type: "date",
                  format: "yyyy-MM-dd",
                  valueFormat: "yyyy-MM-dd"
                valueFormat: "yyyy-MM-dd",
                },
                {
                  label: "用户性别",
@@ -196,43 +217,43 @@
                  dicData: [
                    {
                      label: "男",
                      value: 1
                    value: 1,
                    },
                    {
                      label: "女",
                      value: 2
                    value: 2,
                    },
                    {
                      label: "未知",
                      value: 3
                    }
                  ]
                    value: 3,
                  },
                ],
                },
                {
                  label: "用户生日",
                  type: "date",
                  prop: "birthday"
                }
              ]
                prop: "birthday",
              },
            ],
            },
            {
              label: '从业信息',
              prop: 'detailInfo',
              icon: 'el-icon-s-order',
            label: "从业信息",
            prop: "detailInfo",
            icon: "el-icon-s-order",
              column: [
                    {
                    prop: 'UserPractitionersInfo',
                    type: 'dynamic',
                prop: "UserPractitionersInfo",
                type: "dynamic",
                    border: false,
                    span:24,
                    children: {
                        align: 'left',
                        headerAlign: 'center',
                        type:'form',
                  align: "left",
                  headerAlign: "center",
                  type: "form",
                        rowAdd:(done)=>{
                            console.log(done,111);
                            done({
                                input:'默认值'
                      input: "默认值",
                            });
                        },
                        rowDel:(row,done)=>{
@@ -242,90 +263,100 @@
                        column: [
                                {
                                    width: 200,
                                    label: '单位名称',
                      label: "单位名称",
                                    prop: "companyname",
                                    formslot: true,
                                }, {
                    },
                    {
                                    width: 200,
                                    label: '部门',
                      label: "部门",
                                    prop: "department",
                                    formslot: true,
                                }, {
                    },
                    {
                                    width: 200,
                                    label: '岗位',
                      label: "岗位",
                                    prop: "post",
                                    formslot: true,
                                },  {
                    },
                    {
                                    width: 200,
                                    label: '岗位职责',
                      label: "岗位职责",
                                    prop: "responsibilities",
                                    formslot: true,
                                },  {
                    },
                    {
                                    width: 200,
                                    label: '入职时间',
                                    type:'date',
                      label: "入职时间",
                      type: "date",
                                    format: "yyyy-MM-dd",
                                    valueFormat: "yyyy-MM-dd",
                                    prop: "entryTime",
                                    formslot: true,
                                },  {
                    },
                    {
                                    width: 200,
                                    label: '离职时间',
                                    type:'date',
                      label: "离职时间",
                      type: "date",
                                    format: "yyyy-MM-dd",
                                    valueFormat: "yyyy-MM-dd",
                                    prop: "departureTime",
                                    formslot: true,
                                },  {
                    },
                    {
                                    width: 200,
                                    label: '离职原因',
                      label: "离职原因",
                                    prop: "leaving",
                                    formslot: true,
                                }
                            ]
                        }
                    },

                ]
            }
          ]
                  ],
        },
        data: []
              },
            ],
          },
        ],
      },
      data: [],
      };
    },
    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: {
    },
  computed: {},
    mounted() {
      //获取userId
      this.userId = JSON.parse(window.localStorage.getItem("saber-userInfo")).content.user_id;
    this.userId = JSON.parse(
      window.localStorage.getItem("saber-userInfo")
    ).content.user_id;
      //获取用户信息
      this.getUserDetail();
    },
    methods: {
    inits(id) {
      this.form.id = id || 0;
      this.visible = true;
    },
      //获取用户信息
      getUserDetail(){
         var that = this;
          //获取用户基本信息
         getUser(this.userId).then(res => {
      getUser(this.userId).then((res) => {
            this.form = res.data.data;
            var userInfo = res.data.data;
            //获取用户从业信息
            getUserPractitionersInfo(userInfo.cardid).then(res1 =>{
        getUserPractitionersInfo(userInfo.cardid).then((res1) => {
               that.form.UserPractitionersInfo = res1.data.data;
            })
        });
            if (this.form.hasOwnProperty("deptId")) {
              this.form.deptId = this.form.deptId.split(",");
            }
@@ -339,7 +370,7 @@
        const userPractitionersList = [];
        var userPractitionersInfo = row.UserPractitionersInfo;
        if(userPractitionersInfo.length>0){
            userPractitionersInfo.forEach(item => {
        userPractitionersInfo.forEach((item) => {
                const info = {
                    companyname: item.companyname,
                    department: item.department,
@@ -349,34 +380,37 @@
                    leaving: item.leaving,
                    cardid:row.cardid,
                    post: item.post,
                    responsibilities: item.responsibilities
                }
            responsibilities: item.responsibilities,
          };
                userPractitionersList.push(info);
            });
        }
        var IdCardNo = row.cardid; 
        row.deptId = row.deptId.join(",");
        row.postId = row.postId.join(",");
        update(row).then(() => {
      update(row).then(
        () => {
           const experience = {
               cardid:IdCardNo,
               userPractitionersInfo:userPractitionersList
           }
            userPractitionersInfo: userPractitionersList,
          };
           //更新从业信息
            saveOrUpdateUserPractitionersInfo(experience).then(()=>{
                this.$message({
                    type: "success",
                    message: "操作成功!"
              message: "操作成功!",
                 });
            })
          });
           this.loading = false;
          done();
        }, error => {
        },
        (error) => {
          window.console.log(error,111);
          loading();
        });
      }
    }
      );
    },
  },
  };
</script>

@@ -400,4 +434,29 @@
  /* .el-form-item__content{
      margin-left: 0px !important;
  } */


.addorupdatetitle{
  position: absolute;
  left: 10px;
  top: 70px;
  width: 10px;
  height: 10px;
  font-size: 10px;
  cursor: pointer;

}
.xx {
  position: absolute;
  right: 50px;
  top: 70px;
  height: 10px;
  font-size: 24px;
  z-index: 600;
}
.flaots {
  width: 70%;
  padding-top: 50px;
  position: absolute;
}
</style>

 src/views/system/user.vue

@@ -273,7 +273,7 @@
              display: false
            },
            {
              label: "所属保安单位",
              label: "所属组织机构",
              prop: "tenantName",
              slot: true,
              display: false
@@ -290,37 +290,43 @@
              slot: true,
              display: false
            },
            {
              label: "所属部门",
              prop: "deptName",
              slot: true,
              display: false
            },
            {
              label: "用户平台",
              prop: "userTypeName",
              slot: true,
              display: false
            },
            {
              label: "用户平台",
              type: "select",
              dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
              props: {
                label: "dictValue",
                value: "dictKey"
              },
              dataType: "number",
              search: true,
              hide: true,
              display: false,
              prop: "userType",
              rules: [{
                required: true,
                message: "请选择用户平台",
                trigger: "blur"
              }]
            },
            // {
            //   label: "所属部门",
            //   prop: "deptName",
            //   slot: true,
            //   display: false
            // },
            // {
            //   label: "用户平台",
            //   prop: "userTypeName",
            //   addDisplay:false,
            //   viewDisplay:false,
            //   editDisplay:false,
            //   slot: true,
            //   display: false
            // },
            // {
            //   label: "用户平台",
            //   type: "select",
            //   dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
            //   props: {
            //     label: "dictValue",
            //     value: "dictKey"
            //   },
            //   dataType: "number",
            //   search: true,
            //   hide: true,
            //   addDisplay:false,
            //   viewDisplay:false,
            //   editDisplay:false,
            //   display: false,
            //   prop: "userType",
            //   rules: [{
            //     required: true,
            //     message: "请选择用户平台",
            //     trigger: "blur"
            //   }]
            // },
          ],
          group: [
            {
@@ -330,13 +336,13 @@
              icon: 'el-icon-user-solid',
              column: [
                {
                  label: "所属保安单位",
                  prop: "tenantId",
                  label: "所属组织机构",
                  prop: "deptId",
                  type: "tree",
                  dicUrl: "/api/blade-system/tenant/select",
                  dicUrl: "/api/blade-system/dept/lazy-tree?parentId=0",
                  props: {
                    label: "tenantName",
                    value: "tenantId"
                    label: "title",
                    value: "id",
                  },
                  hide: !website.tenantMode,
                  addDisplay: website.tenantMode,
@@ -344,7 +350,7 @@
                  viewDisplay: website.tenantMode,
                  rules: [{
                    required: true,
                    message: "请输入所属保安单位",
                    message: "所属组织机构",
                    trigger: "click"
                  }],
                  span: 24,
@@ -358,23 +364,23 @@
                    trigger: "blur"
                  }],
                },
                {
                  label: "用户平台",
                  type: "select",
                  dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
                  props: {
                    label: "dictValue",
                    value: "dictKey"
                  },
                  dataType: "number",
                  slot: true,
                  prop: "userType",
                  rules: [{
                    required: true,
                    message: "请选择用户平台",
                    trigger: "blur"
                  }]
                },
                // {
                //   label: "用户平台",
                //   type: "select",
                //   dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
                //   props: {
                //     label: "dictValue",
                //     value: "dictKey"
                //   },
                //   dataType: "number",
                //   slot: true,
                //   prop: "userType",
                //   rules: [{
                //     required: true,
                //     message: "请选择用户平台",
                //     trigger: "blur"
                //   }]
                // },
                {
                  label: '密码',
                  prop: 'password',
@@ -496,23 +502,23 @@
                    trigger: "click"
                  }]
                },
                {
                  label: "所属部门",
                  prop: "deptId",
                  type: "tree",
                  multiple: true,
                  dicData: [],
                  props: {
                    label: "title"
                  },
                  checkStrictly: true,
                  slot: true,
                  rules: [{
                    required: true,
                    message: "请选择所属部门",
                    trigger: "click"
                  }]
                },
                // {
                //   label: "所属部门",
                //   prop: "deptId",
                //   type: "tree",
                //   multiple: true,
                //   dicData: [],
                //   props: {
                //     label: "title"
                //   },
                //   checkStrictly: true,
                //   slot: true,
                //   rules: [{
                //     required: true,
                //     message: "请选择所属部门",
                //     trigger: "click"
                //   }]
                // },
                {
                  label: "所属岗位",
                  prop: "postId",
@@ -523,11 +529,11 @@
                    label: "postName",
                    value: "id"
                  },
                  rules: [{
                    required: true,
                    message: "请选择所属岗位",
                    trigger: "click"
                  }],
                  // rules: [{
                  //   required: true,
                  //   message: "请选择所属岗位",
                  //   trigger: "click"
                  // }],
                },
              ]
            },

 保安服务企业管理.zip

Binary files differ