From 18eb8dc2074411e9a63390d03cc9893b5cc962c7 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Thu, 16 Sep 2021 09:43:29 +0800
Subject: [PATCH] 保安公司智能分期 + 其他

---
 src/api/social/social.js                            |    2 
 src/views/securityUnitChild/social.vue              |   59 
 src/views/securityGuard/securityGuard.vue           |    2 
 src/views/securityAnalysis/child/situation.vue      |    2 
 src/views/system/userCompany.vue                    | 1088 ++++++++++++++++
 src/views/system/user.vue                           |   30 
 src/views/dispatch/dispatch.vue                     |   24 
 src/views/securityAnalysis/child/certificate.vue    |    2 
 src/views/system/userOld.vue                        | 1082 ++++++++++++++++
 src/views/securityAnalysis/child/socialSecurity.vue |  584 ++++++++
 src/views/securityAnalysis/child/dispatch.vue       |    4 
 src/views/securityAnalysis/index.vue                |   56 
 src/views/securityAnalysis/child/assignment.vue     | 1045 ++++++++++++--
 13 files changed, 3,731 insertions(+), 249 deletions(-)

diff --git a/src/api/social/social.js b/src/api/social/social.js
index 2d876a3..8a2f440 100644
--- a/src/api/social/social.js
+++ b/src/api/social/social.js
@@ -14,7 +14,7 @@
 
 export const getList = (current, size, params) => {
   return request({
-    url: '/api/social/list',
+    url: '/api/social/page',
     method: 'get',
     params: {
       ...params,
diff --git a/src/views/dispatch/dispatch.vue b/src/views/dispatch/dispatch.vue
index be8376c..0cd6099 100644
--- a/src/views/dispatch/dispatch.vue
+++ b/src/views/dispatch/dispatch.vue
@@ -429,12 +429,24 @@
   },
   created() {
     if (this.userInfo.role_name == "保安公司管理员") {
-      const deptColumn = this.findObject(this.option.column, "deptId");
-      deptColumn.search = false;
-      deptColumn.addDisplay = false;
-      deptColumn.editDisplay = false;
-      deptColumn.viewDisplay = false;
-      deptColumn.hide = true;
+      // const deptColumn = this.findObject(this.option.column, "deptId");
+      // // deptColumn.search = false;
+      // deptColumn.addDisplay = false;
+      // deptColumn.editDisplay = false;
+      // deptColumn.viewDisplay = false;
+      // deptColumn.hide = true;
+      // this.option.column[2];
+      this.option.column[2].search = false;
+      this.option.column[2].addDisplay = false;
+      this.option.column[2].editDisplay = false;
+      this.option.column[2].viewDisplay = false;
+      this.option.column[2].hide = true;
+    } else {
+      this.option.column[2].search = true;
+      this.option.column[2].addDisplay = true;
+      this.option.column[2].editDisplay = true;
+      this.option.column[2].viewDisplay = true;
+      this.option.column[2].hide = false;
     }
   },
   computed: {
diff --git a/src/views/securityAnalysis/child/assignment.vue b/src/views/securityAnalysis/child/assignment.vue
index f4b6ac8..7c72a76 100644
--- a/src/views/securityAnalysis/child/assignment.vue
+++ b/src/views/securityAnalysis/child/assignment.vue
@@ -1,127 +1,308 @@
 <template>
-  <div class="certificateTJ">
-    <avue-crud
-      :option="option1"
-      :data="data1"
-      :page.sync="page1"
-      :table-loading="loading1"
-      @on-load="getPractitionersPageInfo(page1)"
-      @search-change="searchChange"
-      @search-reset="searchReset"
-      @refresh-change="refreshChange"
+  <basic-container>
+    <div class="dispatchChildoperable">
+      <avue-crud
+        :option="option1"
+        :data="data1"
+        :page.sync="page1"
+        ref="crudrec1"
+        v-model="form1"
+        :table-loading="loading1"
+        :before-open="beforeOpen"
+        @row-save="rowSave1"
+        @search-change="searchChange1"
+        @search-reset="searchReset1"
+        @row-update="rowUpdate1"
+        @row-del="rowDel1"
+        @selection-change="selectionChange1"
+        @refresh-change="refreshChange1"
+      >
+        <template slot-scope="{ type, row }" slot="menu">
+          <el-button
+            icon="el-icon-check"
+            size="small"
+            :type="type"
+            @click="openClick(row, page2)"
+            >派遣轨迹</el-button
+          >
+        </template>
+      </avue-crud>
+    </div>
+    <el-dialog
+      title="提示"
+      :visible.sync="dialogVisible"
+      width="80%"
+      top="10vh"
+      append-to-body
     >
-    </avue-crud>
-  </div>
+      <avue-crud
+        :option="option2"
+        :data="data2"
+        :page.sync="page2"
+        ref="crudrec2"
+        v-model="form2"
+        :table-loading="loading2"
+        @selection-change="selectionChange2"
+        @search-change="searchChange2"
+        @row-save="rowSave2"
+        @search-reset="searchReset2"
+        @row-update="rowUpdate2"
+        @row-del="rowDel2"
+        @refresh-change="refreshChange2"
+      >
+        <!-- :before-open="beforeOpen"
+        -->
+        <!-- <template slot-scope="{ type, row }" slot="menu">
+          <el-button
+            icon="el-icon-check"
+            size="small"
+            :type="type"
+            @click="openClick(row)"
+            >派遣轨迹</el-button
+          >
+        </template> -->
+      </avue-crud>
+    </el-dialog>
+  </basic-container>
 </template>
 
 <script>
-import { getdata1 } from "@/api/dispatch/dispatch";
+import {
+  getdata1,
+  adddata1,
+  update1,
+  remove1,
+  getDispatcherUnitByDeptId,
+  overDispatcher,
+} from "@/api/dispatch/dispatch";
+import { update, getListByDeptId } from "@/api/system/user";
+import { mapState } from "vuex";
+
 export default {
   props: ["card"],
   data() {
-    var jurisdiction =
-      this.card.jurisdiction == "1123598813738675201"
-        ? "1372091709474910209"
-        : this.card.jurisdiction;
     return {
-      securityid1: "",
-      ExperienceVisible: false,
-      loading1: true,
+      dialogVisible: false,
+      dialogId: "",
+      dialogData: [],
+
+      deptCategory: "",
+      deptId: "",
+
+      loading1: true, //派遣记录
+      selectionList1: [],
       page1: {
         pageSize: 10,
         currentPage: 1,
         total: 0,
       },
+      form1: {},
       query1: {},
       data1: [],
       option1: {
-        addBtn: false,
-        searchShowBtn: false,
-        columnBtn: false,
-        // refreshBtn: false,
         // card: true,
-        menu: false,
-        height: 450,
-        widtd: "auto",
-        // calcHeight: 54,
-        border: true, //liu
-        stripe: true,
-        // tip: false,
+        tip: false,
         index: true,
-        // dialogClickModal: false,
-        // headerAlign: "center",
+        // menu: false,
+        searchSize: "mini",
+        searchMenuSpan: 8,
+        height: 450,
+        cellBtn: false,
+        delBtnText: "结束派遣",
+        editBtnText: "更改派遣",
+        addTitle: "记录添加",
+        addBtnText: "记录添加",
+        // addBtn: false,
+        menuWidth: 256,
         align: "center",
+        selection: true,
         column: [
-          //派遣服务公司登记
+          // },
           {
-            label: "派遣单位名称",
-            prop: "name",
-            search: true,
-            searchLabelWidth: 110,
-            overHidden: true,
-            searchSpan: 4,
-            width: 210,
-            // span: 12,
-            labelWidth: 118,
+            label: "派遣单位",
+            prop: "dispatcherCompany",
+            // addDisplay: false,
+            // editDisplay: false,
+            // search: true,
+            // labelWidth: 120,
+            // searchSpan: 4,
+            minWidth: 210,
+            addDisplay: false,
+            editDisplay: false,
           },
-          {
-            label: "派遣单位地址",
-            prop: "address",
-            search: false,
-            searchLabelWidth: 110,
-            overHidden: true,
-            searchSpan: 4,
-            width: 210,
-            // span: 12,
-            labelWidth: 118,
-          },
-
           {
             label: "保安公司",
             prop: "deptId",
+            search: true,
+            labelWidth: 120,
             type: "tree",
-            overHidden: true,
-            dicUrl:
-              "/api/blade-system/dept/security_lazy-tree?jurisdiction=" +
-              jurisdiction,
+            searchSpan: 4,
+            cascaderItem: ["userIds"],
             props: {
               label: "title",
               value: "id",
             },
-            // hide: true,
-            // hide: !website.tenantMode,
-            // addDisplay: website.tenantMode,
-            // editDisplay: website.tenantMode,
-            // viewDisplay: website.tenantMode,
+            width: 180,
+            dicUrl: `/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697`,
             rules: [
               {
                 required: true,
-                message: "请选择保安公司",
+                message: "请输入保安公司",
+                trigger: "blur",
+              },
+            ],
+          },
+          {
+            label: "派遣单位",
+            prop: "dispatcherUnitId",
+            labelWidth: 120,
+            searchLabelWidth: 80,
+            // dicUrl: "/api/dispatcherUnit/page-tree?deptId={{key}}",
+            props: {
+              label: "name",
+              value: "id",
+            },
+            hide: true,
+            searchSpan: 4,
+            search: true,
+            overHidden: true,
+            type: "tree",
+            rules: [
+              {
+                required: true,
+                message: "请输入派遣单位",
+                trigger: "blur",
+              },
+            ],
+          },
+          {
+            label: "保安员",
+            prop: "userIds",
+            type: "tree",
+            width: 70,
+            labelWidth: 120,
+            searchSpan: 3,
+            search: true,
+            hide: true,
+            props: {
+              label: "realName",
+              value: "id",
+            },
+            // dicUrl: `/api/blade-user/page-security-units?dispatch=1&deptId={{key}}`,
+            dicUrl: `/api/blade-user/page-security-units?status=1&deptId={{key}}`,
+            dicData: [],
+            rules: [
+              {
+                required: true,
+                message: "请选择保安",
+                trigger: "blur",
+              },
+            ],
+          },
+          {
+            label: "保安员",
+            prop: "securityName",
+            type: "tree",
+            width: 70,
+            labelWidth: 120,
+            addDisplay: false,
+            editDisplay: false,
+            // hide: true,
+            // props: {
+            //   label: "realName",
+            //   value: "id",
+            // },
+            // dicUrl: `/api/blade-user/page-security-units?dispatch=1&deptId={{key}}`,
+            dicData: [],
+            rules: [
+              {
+                required: true,
+                message: "请选择保安",
+                trigger: "blur",
+              },
+            ],
+          },
+
+          {
+            label: "身份证",
+            prop: "idCardNo",
+            labelWidth: 120,
+            overHidden: true,
+            addDisplay: false,
+            editDisplay: false,
+            rules: [
+              {
+                required: true,
+                message: "请输入身份证",
                 trigger: "click",
               },
             ],
-            labelWidth: 118,
-            width: 230,
-            searchLabelWidth: 80,
-            search: true,
-            searchSpan: 4,
-            // editDisplay: false,
-            // addDisplay: false,
-            // hide: true,
-            // span: 11,
-          },
-          {
-            label: "保安服务类型",
-            prop: "serveType",
             // search: true,
-            searchLabelWidth: 110,
-            searchSpan: 4,
-            overHidden: true,
-            // span: 12,
-            labelWidth: 118,
+            // searchSpan: 4,
+            // overHidden: true
+          },
+          // {
+          //     label: "派遣人",
+          //     prop: "dispatcher",
+          //     // search: true,
+          //     // searchSpan: 4,
+          //     // overHidden: true
+          // },
+          {
+            label: "派遣地址",
+            prop: "dispatcheraddress",
+            labelWidth: 120,
+            rules: [
+              {
+                required: true,
+                message: "请输入派遣地址",
+                trigger: "click",
+              },
+            ],
+            // search: true,
+            // searchSpan: 4,
+            // overHidden: true
           },
           {
-            label: "合同生效时间",
+            label: "开始时间",
+            prop: "dispatchertime",
+            type: "date",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd",
+            labelWidth: 120,
+            searchSpan: 5,
+            // search: true,
+            overHidden: true,
+            rules: [
+              {
+                required: true,
+                message: "请输入派遣时间",
+                trigger: "click",
+              },
+            ],
+            // overHidden: true
+          },
+          {
+            label: "结束时间",
+            prop: "endTime",
+            type: "date",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd",
+            labelWidth: 120,
+            overHidden: true,
+            rules: [
+              {
+                required: true,
+                message: "请输入结束时间",
+                trigger: "click",
+              },
+            ],
+            // search: true,
+            // searchSpan: 4,
+            // overHidden: true
+          },
+          {
+            label: "派遣时间",
             prop: "releaseTimeRange",
             type: "date",
             format: "yyyy-MM-dd",
@@ -129,7 +310,6 @@
             searchValue: [this.getStartTime(), this.getEndTime()],
             searchRange: true,
             searchSpan: 5,
-            searchLabelWidth: 110,
             hide: true,
             addDisplay: false,
             editDisplay: false,
@@ -143,92 +323,240 @@
               },
             ],
           },
-          // {
-          //   label: " 派遣人数",
-          //   prop: "num",
-          //   labelWidth: 118,
+        ],
+      },
+      loading2: true, //单个人派遣记录
+      vals: [],
+      selectionList2: [],
+      page2: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0,
+      },
+      form2: {},
+      query2: {},
+      data2: [],
+      option2: {
+        // card: true,
+        tip: false,
+        index: true,
+        // menu: false,
+        searchSize: "mini",
+        searchMenuSpan: 8,
+        height: 450,
+        cellBtn: false,
+        delBtnText: "结束派遣",
+        editBtnText: "更改派遣",
+        addTitle: "记录添加",
+        addBtnText: "记录添加",
+        // addBtn: false,
+        menuWidth: 256,
+        align: "center",
+        selection: true,
+        column: [
           // },
           {
-            label: "合同开始时间",
-            prop: "startTime",
-            labelWidth: 118,
-            type: "date",
-            format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd",
+            label: "派遣单位",
+            prop: "dispatcherCompany",
+            // addDisplay: false,
+            // editDisplay: false,
             // search: true,
+            // labelWidth: 120,
             // searchSpan: 4,
-            // overHidden: true
+            minWidth: 210,
+            addDisplay: false,
+            editDisplay: false,
           },
           {
-            label: "合同结束时间",
-            prop: "endTime",
-            labelWidth: 118,
-            type: "date",
-            format: "yyyy-MM-dd",
-            valueFormat: "yyyy-MM-dd",
-            // search: true,
-            // searchSpan: 4,
-            // overHidden: true
-          },
-          {
-            label: " 负责人",
-            prop: "linkman",
-            labelWidth: 118,
-          },
-          {
-            label: "负责人联系方式",
-            prop: "phone",
-            labelWidth: 118,
-            width: 110,
-          },
-          {
-            label: "所属辖区",
-            prop: "jurisdiction",
-            hide: true,
-            searchLabelWidth: 80,
+            label: "保安公司",
+            prop: "deptId",
             search: true,
-            searchSpan: 4,
-            overHidden: true,
-            labelWidth: 118,
+            labelWidth: 120,
             type: "tree",
-            dicUrl: "/api/jurisdiction/lazy-tree",
+            searchSpan: 4,
+            cascaderItem: ["userIds"],
             props: {
               label: "title",
               value: "id",
             },
-            checkStrictly: true,
-            slot: true,
+            width: 180,
+            dicUrl: `/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697`,
             rules: [
               {
                 required: true,
-                message: "请选择所属辖区",
-                trigger: "click",
+                message: "请输入保安公司",
+                trigger: "blur",
               },
             ],
           },
           {
-            label: "所属辖区",
-            prop: "jurisdictionName",
-            // multiple: true,
+            label: "派遣单位",
+            prop: "dispatcherUnitId",
+            labelWidth: 120,
             searchLabelWidth: 80,
-            addDisplay: false,
-            editDisplay: false,
-            viewDisplay: false,
-            overHidden: true,
-            labelWidth: 118,
-            type: "tree",
-            dicUrl: "/api/jurisdiction/lazy-tree",
+            // dicUrl: "/api/dispatcherUnit/page-tree?deptId={{key}}",
             props: {
-              label: "title",
+              label: "name",
               value: "id",
             },
-            checkStrictly: true,
-            slot: true,
+            hide: true,
+            searchSpan: 4,
+            search: true,
+            overHidden: true,
+            type: "tree",
             rules: [
               {
                 required: true,
-                message: "请选择所属辖区",
+                message: "请输入派遣单位",
+                trigger: "blur",
+              },
+            ],
+          },
+          {
+            label: "保安员",
+            prop: "userIds",
+            type: "tree",
+            width: 70,
+            labelWidth: 120,
+            searchSpan: 3,
+            // search: true,
+            hide: true,
+            props: {
+              label: "realName",
+              value: "id",
+            },
+            // dicUrl: `/api/blade-user/page-security-units?dispatch=1&deptId={{key}}`,
+            dicUrl: `/api/blade-user/page-security-units?status=1&deptId={{key}}`,
+            dicData: [],
+            rules: [
+              {
+                required: true,
+                message: "请选择保安",
+                trigger: "blur",
+              },
+            ],
+          },
+          {
+            label: "保安员",
+            prop: "securityName",
+            type: "tree",
+            width: 70,
+            labelWidth: 120,
+            addDisplay: false,
+            editDisplay: false,
+            // hide: true,
+            // props: {
+            //   label: "realName",
+            //   value: "id",
+            // },
+            // dicUrl: `/api/blade-user/page-security-units?dispatch=1&deptId={{key}}`,
+            dicData: [],
+            rules: [
+              {
+                required: true,
+                message: "请选择保安",
+                trigger: "blur",
+              },
+            ],
+          },
+
+          {
+            label: "身份证",
+            prop: "idCardNo",
+            labelWidth: 120,
+            overHidden: true,
+            addDisplay: false,
+            editDisplay: false,
+            rules: [
+              {
+                required: true,
+                message: "请输入身份证",
                 trigger: "click",
+              },
+            ],
+            // search: true,
+            // searchSpan: 4,
+            // overHidden: true
+          },
+          // {
+          //     label: "派遣人",
+          //     prop: "dispatcher",
+          //     // search: true,
+          //     // searchSpan: 4,
+          //     // overHidden: true
+          // },
+          {
+            label: "派遣地址",
+            prop: "dispatcheraddress",
+            labelWidth: 120,
+            rules: [
+              {
+                required: true,
+                message: "请输入派遣地址",
+                trigger: "click",
+              },
+            ],
+            // search: true,
+            // searchSpan: 4,
+            // overHidden: true
+          },
+          {
+            label: "开始时间",
+            prop: "dispatchertime",
+            type: "date",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd",
+            labelWidth: 120,
+            searchSpan: 5,
+            // search: true,
+            overHidden: true,
+            rules: [
+              {
+                required: true,
+                message: "请输入派遣时间",
+                trigger: "click",
+              },
+            ],
+            // overHidden: true
+          },
+          {
+            label: "结束时间",
+            prop: "endTime",
+            type: "date",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd",
+            labelWidth: 120,
+            overHidden: true,
+            rules: [
+              {
+                required: true,
+                message: "请输入结束时间",
+                trigger: "click",
+              },
+            ],
+            // search: true,
+            // searchSpan: 4,
+            // overHidden: true
+          },
+          {
+            label: "派遣时间",
+            prop: "releaseTimeRange",
+            type: "date",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd",
+            searchValue: [this.getStartTime(), this.getEndTime()],
+            searchRange: true,
+            searchSpan: 5,
+            hide: true,
+            addDisplay: false,
+            editDisplay: false,
+            viewDisplay: false,
+            search: true,
+            rules: [
+              {
+                required: true,
+                message: "请输入时间",
+                trigger: "blur",
               },
             ],
           },
@@ -236,7 +564,309 @@
       },
     };
   },
+  created() {
+    if (this.userInfo.role_name == "保安公司管理员") {
+      console.log("保安公司管理员登入");
+      const deptColumn = this.findObject(this.option1.column, "deptId");
+      deptColumn.search = false;
+    } else {
+      const deptColumn = this.findObject(
+        this.option1.column,
+        "dispatcherUnitId"
+      );
+      deptColumn.search = false;
+    }
+  },
+  computed: {
+    // },
+    ids1() {
+      let ids1 = [];
+      this.selectionList1.forEach((ele) => {
+        ids1.push(ele.id);
+      });
+      return ids1.join(",");
+    },
+    ...mapState({
+      userInfo: (state) => state.user.userInfo,
+    }),
+    deps() {
+      return this.form.deptId;
+    },
+  },
+
   methods: {
+    openClick(val, page, params = {}) {
+      this.vals = val;
+      this.dialogVisible = true;
+      params["userIds"] = val.userIds;
+      //默认查询已派遣的，派遣结束，未派遣的不显示
+      params["dispatch"] = 0;
+      var values;
+      const { releaseTimeRange } = this.query1;
+      if (releaseTimeRange) {
+        values = {
+          ...params,
+          beginTime: releaseTimeRange[0],
+          overTime: releaseTimeRange[1],
+          ...this.query,
+        };
+        values.releaseTimeRange = null;
+      } else {
+        values = {
+          ...params,
+          ...this.query,
+        };
+      }
+
+      if (this.userInfo.role_name == "保安公司管理员") {
+        // const deptColumn = this.findObject(this.option1.column, "deptId");
+        // deptColumn.disabled = true;
+        // // deptColumn.search = false; //会报错
+        // deptColumn.value = this.userInfo.dept_id;
+        this.option2.column[1].search = false;
+        this.option2.column[1].value = this.userInfo.dept_id;
+        this.option2.column[1].disabled = true;
+        // this.option2.column[3].disabled = true;
+        this.option2.column[3].value = val.userIds;
+        this.initData(2, 2);
+      } else {
+        this.option2.column[1].search = true;
+        // deptColumn.disabled = false;
+        this.initData(1, 2);
+      }
+      getdata1(
+        page.currentPage,
+        page.pageSize,
+        // Object.assign(params, this.query2)
+        values
+      ).then((res) => {
+        const data = res.data.data;
+        this.page2.total = data.total;
+        this.data2 = data.records;
+        this.loading2 = false;
+        //     // this.$nextTick(() => this.$refs.crudrec1.dicInit("cascader"));
+        //     // console.log(this.form, 111111);
+      });
+      //   console.log(val);
+    },
+    refreshChange2() {
+      // console.log(4534)
+      this.openClick(this.vals, this.page2, this.query2);
+    },
+    searchChange2(params, done) {
+      this.query2 = params;
+      this.page2.currentPage = 1;
+      this.refreshChange2();
+      done();
+    },
+    rowSave2(form, done, loading) {
+      // if(this.userInfo.role_name=="保安公司管理员"){
+      //   const userColumn = this.findObject(this.option1.column, "userIds");
+      //   userColumn.dicUrl = "/api/blade-user/page-security-units?deptId="+this.userInfo.dept_id;
+      // }
+
+      adddata1(form).then(
+        (res) => {
+          this.refreshChange2();
+          this.onLoad1(this.page1);
+          this.$message({
+            type: "success",
+            message: "操作成功!",
+          });
+          done();
+        },
+        (error) => {
+          window.console.log(error);
+          loading();
+        }
+      );
+      // }
+    },
+    searchReset2() {
+      this.query2 = {};
+      this.refreshChange2();
+    },
+    rowUpdate2(row, index, done, loading) {
+      // if(this.userInfo.role_name=="保安公司管理员"){
+      //   const userColumn = this.findObject(this.option1.column, "userIds");
+      //   userColumn.dicUrl = "/api/blade-user/page-security-units?deptId="+this.userInfo.dept_id;
+      // }
+      update1(row).then(
+        () => {
+          this.refreshChange2();
+          this.onLoad1(this.page1);
+          this.$message({
+            type: "success",
+            message: "操作成功!",
+          });
+          done();
+        },
+        (error) => {
+          window.console.log(error);
+          loading();
+        }
+      );
+    },
+    rowDel2(row) {
+      this.$confirm("确定结束当前派遣?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          console.log(row);
+          return overDispatcher(row);
+        })
+        .then(() => {
+          this.refreshChange2();
+          this.onLoad1(this.page1);
+          this.$message({
+            type: "success",
+            message: "操作成功!",
+          });
+        });
+    },
+
+    handleChangeTABS(column) {
+      this.typeTABS = column;
+      if (column.prop == "tab1") {
+        this.loading1 = false;
+        // this.onLoad(this.page);
+      } else if (column.prop == "tab2") {
+        // this.loading = false;
+        console.log(document.getElementsByClassName("el-card__body")[0]);
+        this.onLoad1(this.page1); //第二个表格不会自动执行
+      }
+      // this.$message.success(JSON.stringify(column));
+    },
+
+    //派遣记录
+    sizeChange1(val) {
+      this.page1.currentPage = 1;
+      this.page1.pageSize = val;
+      // this.getData();
+      this.onLoad1(this.page1, this.query1);
+    },
+    currentChange1(val) {
+      this.page1.currentPage = val;
+      // this.getData();
+      this.onLoad1(this.page1, this.query1);
+    },
+    rowSave1(form, done, loading) {
+      // if(this.userInfo.role_name=="保安公司管理员"){
+      //   const userColumn = this.findObject(this.option1.column, "userIds");
+      //   userColumn.dicUrl = "/api/blade-user/page-security-units?deptId="+this.userInfo.dept_id;
+      // }
+
+      adddata1(form).then(
+        (res) => {
+          this.onLoad1(this.page1);
+          this.$message({
+            type: "success",
+            message: "操作成功!",
+          });
+          done();
+        },
+        (error) => {
+          window.console.log(error);
+          loading();
+        }
+      );
+      // }
+    },
+    searchChange1(params, done) {
+      this.query1 = params;
+      this.page1.currentPage = 1;
+      this.onLoad1(this.page1, params);
+      done();
+    },
+    searchReset1() {
+      this.query = {};
+      this.onLoad1(this.page1);
+    },
+    rowUpdate1(row, index, done, loading) {
+      // if(this.userInfo.role_name=="保安公司管理员"){
+      //   const userColumn = this.findObject(this.option1.column, "userIds");
+      //   userColumn.dicUrl = "/api/blade-user/page-security-units?deptId="+this.userInfo.dept_id;
+      // }
+      update1(row).then(
+        () => {
+          this.onLoad1(this.page1);
+          this.$message({
+            type: "success",
+            message: "操作成功!",
+          });
+          done();
+        },
+        (error) => {
+          window.console.log(error);
+          loading();
+        }
+      );
+    },
+    rowDel1(row) {
+      this.$confirm("确定结束当前派遣?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          return overDispatcher(row);
+        })
+        .then(() => {
+          this.onLoad1(this.page1);
+          this.$message({
+            type: "success",
+            message: "操作成功!",
+          });
+        });
+    },
+    selectionChange1(list) {
+      this.selectionList1 = list;
+      // console.log(this.selectionList1.length);
+    },
+    handleDelete1() {
+      console.log(this.selectionList1);
+      if (this.selectionList1.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          return remove1(this.ids1);
+        })
+        .then(() => {
+          this.onLoad1(this.page1);
+          this.$message({
+            type: "success",
+            message: "操作成功!",
+          });
+          this.$refs.crudrec1.toggleSelection();
+        });
+    },
+    refreshChange1() {
+      // console.log(4534)
+      this.onLoad1(this.page1, this.query1);
+    },
+
+    // beforeOpen(done, type) {
+    //   var that = this;
+    //   if (["add", "edit", "view"].includes(type)) {
+    //     if (this.userInfo.role_name == "保安公司管理员") {
+    //       getListByDeptId(that.userInfo.dept_id).then((res) => {
+    //         const userColumn = that.findObject(this.option1.column, "userIds");
+    //         userColumn.dicData = res.data.data;
+    //       });
+    //     }
+    //   }
+    //   this.initFlag = true;
+    //   done();
+    // },
+
     getStartTime() {
       if (
         this.$route.query.startTime != undefined &&
@@ -257,70 +887,109 @@
       }
       return "";
     },
-    getPractitionersPageInfo(page, params = {}) {
-      // this.card.jurisdiction = "130";
-      // this.card.this.card = "1425365571343515649";
-      // if (params.hold == undefined) {
-      //   params.hold = 1;
-      // }
-      if (this.card.jurisdiction != "" || this.card.jurisdiction != undefined) {
-        if (this.query1.deptId != "" || this.query1.deptId != undefined) {
-          this.card.deptId = this.query1.deptId;
-        }
-        this.option1.column[2].search = true;
-      } else {
-        this.option1.column[2].search = false;
-      }
-      if (this.card.jurisdiction == 1123598813738675201) {
+    //
+    onLoad1(page, params = {}) {
+      this.loading1 = true;
+      var values;
+      //默认查询已派遣的，派遣结束，未派遣的不显示
+      params["dispatch"] = 0;
+      if (this.card.jurisdiction == 1372091709474910209) {
         this.card.jurisdiction = "";
       }
-      // console.log(this.query1);
-      const releaseTimeRange = this.query1.releaseTimeRange;
+      const { releaseTimeRange } = this.query1;
       if (releaseTimeRange) {
-        params = {
+        values = {
           ...params,
           beginTime: releaseTimeRange[0],
           overTime: releaseTimeRange[1],
-          status: 1,
-          ...this.query1,
+          ...this.query,
           ...this.card,
         };
-        // values.releaseTimeRange = null;
+        values.releaseTimeRange = null;
       } else {
-        params = {
+        values = {
           ...params,
-          ...this.query1,
-          status: 1,
+          ...this.query,
           ...this.card,
         };
       }
-      console.log(params);
-      getdata1(page.currentPage, page.pageSize, params).then((res) => {
-        // console.log(res.data.data.records);
+
+      if (this.userInfo.role_name == "保安公司管理员") {
+        const deptColumn = this.findObject(this.option1.column, "deptId");
+        deptColumn.disabled = true;
+        // deptColumn.search = false; //会报错
+        deptColumn.value = this.userInfo.dept_id;
+        this.initData(2);
+      } else {
+        this.initData(1);
+      }
+
+      getdata1(
+        page.currentPage,
+        page.pageSize,
+        // Object.assign(params, this.query)
+        values
+      ).then((res) => {
         const data = res.data.data;
-        this.data1 = data.records;
         this.page1.total = data.total;
+        this.data1 = data.records;
         this.loading1 = false;
+        // this.$nextTick(() => this.$refs.crudrec1.dicInit("cascader"));
+        // console.log(this.form, 111111);
       });
     },
-    refreshChange() {
-      this.getPractitionersPageInfo(this.page1, this.query1);
+    initData(type, d = 1) {
+      var that = this;
+      if (type == 1) {
+        getDispatcherUnitByDeptId(null).then((res) => {
+          const dispatcherUnitIdColumn = that.findObject(
+            this["option" + d].column,
+            "dispatcherUnitId"
+          );
+          //   console.log(res.data.data, 111);
+          dispatcherUnitIdColumn.dicData = res.data.data;
+        });
+      }
+      if (type == 2) {
+        getDispatcherUnitByDeptId(that.userInfo.dept_id).then((res) => {
+          const dispatcherUnitIdColumn = that.findObject(
+            this["option" + d].column,
+            "dispatcherUnitId"
+          );
+          dispatcherUnitIdColumn.dicData = res.data.data;
+        });
+        getListByDeptId(that.userInfo.dept_id, 1).then((res) => {
+          const userIdsColumn = that.findObject(
+            this["option" + d].column,
+            "userIds"
+          );
+          userIdsColumn.dicData = res.data.data;
+        });
+      }
     },
-    searchChange(params, done) {
-      this.query1 = params;
-      this.page1.currentPage = 1;
-      this.refreshChange();
-      done();
-    },
-    searchReset() {
-      this.query1 = {};
-      this.page1.currentPage = 1;
-      this.refreshChange();
-      // console.log(212);
-    },
+  },
+  //  watch: {
+  //   // "form.deptId"() {
+  //   //   this.initData();
+  //   // }
+  //   deps(){
+  //     console.log(this.deps,5646646)
+  //   }
+  // },
+  mounted() {
+    this.onLoad1(this.page1, this.query1);
   },
 };
 </script>
 
-<style scoped>
-</style>
\ No newline at end of file
+<style lang="scss" scoped>
+.dispatch {
+  width: 100%;
+  height: 100%;
+  //   border: 1px solid #000;
+  box-sizing: border-box;
+}
+.el-collapse-item {
+  padding-top: 15px !important;
+}
+</style>
diff --git a/src/views/securityAnalysis/child/certificate.vue b/src/views/securityAnalysis/child/certificate.vue
index 17f4a35..6d21504 100644
--- a/src/views/securityAnalysis/child/certificate.vue
+++ b/src/views/securityAnalysis/child/certificate.vue
@@ -167,7 +167,7 @@
   },
   methods: {
     getPractitionersPageInfo(page, params = {}) {
-      if (this.card.jurisdiction == 1123598813738675201) {
+      if (this.card.jurisdiction == 1372091709474910209) {
         this.card.jurisdiction = "";
       }
       // if (params.hold == undefined) {
diff --git a/src/views/securityAnalysis/child/dispatch.vue b/src/views/securityAnalysis/child/dispatch.vue
index 727d05c..1dc10e9 100644
--- a/src/views/securityAnalysis/child/dispatch.vue
+++ b/src/views/securityAnalysis/child/dispatch.vue
@@ -20,7 +20,7 @@
   props: ["card"],
   data() {
     var jurisdiction =
-      this.card.jurisdiction == "1123598813738675201"
+      this.card.jurisdiction == "1372091709474910209"
         ? "1372091709474910209"
         : this.card.jurisdiction;
     return {
@@ -304,7 +304,7 @@
       } else {
         this.option1.column[2].search = false;
       }
-      if (this.card.jurisdiction == 1123598813738675201) {
+      if (this.card.jurisdiction == 1372091709474910209) {
         this.card.jurisdiction = "";
       }
       // console.log(this.query1);
diff --git a/src/views/securityAnalysis/child/situation.vue b/src/views/securityAnalysis/child/situation.vue
index a62f10a..3d18c18 100644
--- a/src/views/securityAnalysis/child/situation.vue
+++ b/src/views/securityAnalysis/child/situation.vue
@@ -163,7 +163,7 @@
   },
   methods: {
     getPractitionersPageInfo(page, params = {}) {
-      if (this.card.jurisdiction == 1123598813738675201) {
+      if (this.card.jurisdiction == 1372091709474910209) {
         this.card.jurisdiction = "";
       }
       // if (params.hold == undefined) {
diff --git a/src/views/securityAnalysis/child/socialSecurity.vue b/src/views/securityAnalysis/child/socialSecurity.vue
new file mode 100644
index 0000000..20a398b
--- /dev/null
+++ b/src/views/securityAnalysis/child/socialSecurity.vue
@@ -0,0 +1,584 @@
+<template>
+  <basic-container>
+    <avue-crud
+      :option="option"
+      :table-loading="loading"
+      :data="data"
+      :page.sync="page"
+      :permission="permissionList"
+      :before-open="beforeOpen"
+      v-model="form"
+      ref="crud"
+      @row-update="rowUpdate"
+      @row-save="rowSave"
+      @row-del="rowDel"
+      @search-change="searchChange"
+      @search-reset="searchReset"
+      @selection-change="selectionChange"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+      @refresh-change="refreshChange"
+      @on-load="onLoad"
+    >
+      <template slot="menuLeft">
+        <el-button
+          type="danger"
+          size="small"
+          icon="el-icon-delete"
+          plain
+          v-if="seess"
+          @click="handleDelete"
+          >删 除
+          <!-- v-if="permission.social_delete" -->
+        </el-button>
+        <el-button
+          type="success"
+          size="small"
+          plain
+          icon="el-icon-upload2"
+          v-if="seess"
+          @click="handleImport"
+          >批量导入
+        </el-button>
+      </template>
+    </avue-crud>
+    <el-dialog
+      title="用户数据导入"
+      append-to-body
+      :visible.sync="excelBox"
+      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>
+          </el-button>
+        </template>
+      </avue-form>
+    </el-dialog>
+  </basic-container>
+</template>
+
+<script>
+import {
+  getuseList,
+  getList,
+  getDetail,
+  add,
+  update,
+  remove,
+} from "@/api/social/social";
+import { mapGetters } from "vuex";
+import { getToken } from "@/util/auth";
+export default {
+  props: ["card"],
+  data() {
+    var card = this.card;
+    var deptid,
+      sees = true,
+      baoan = "namb",
+      baoanSearch = {
+        type: "tree",
+        change: (res) => {
+          this.changes(res);
+        },
+      },
+      jurisdiction;
+    if (this.card.jurisdiction == "") {
+      // deptid = this.userInfo
+      // console.log(this.$store.getters.userInfo.dept_id);
+      jurisdiction = "";
+      deptid = card.deptid;
+    } else {
+      jurisdiction = card.jurisdiction;
+      baoan = "realname";
+      (baoanSearch = {}), (deptid = "");
+      sees = false;
+    }
+    return {
+      seess: sees,
+      deptid: deptid,
+      jurisdiction: jurisdiction,
+
+      form: { cardid: "" },
+
+      query: {},
+      loading: true,
+      excelBox: false,
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0,
+      },
+      selectionList: [],
+      option: {
+        height: "auto",
+        calcHeight: 30,
+        tip: false,
+        searchShow: true,
+        align: "center",
+        searchMenuSpan: 6,
+        border: true,
+        index: true,
+        height: 430,
+        addBtn: sees,
+        viewBtn: true,
+        menu: false,
+        selection: true,
+        dialogClickModal: false,
+        column: [
+          {
+            label: "姓名",
+            prop: baoan,
+
+            width: 65,
+            labelWidth: 110,
+            dicUrl: "/api/blade-user/page-security-unit?deptId=" + deptid,
+            props: {
+              label: "realName",
+              value: "id",
+            },
+            search: true,
+            searchLabelWidth: 45,
+            searchSpan: 4,
+            ...baoanSearch,
+            rules: [
+              {
+                required: true,
+                message: "请输入姓名",
+                trigger: "blur",
+              },
+            ],
+          },
+          {
+            label: "性别",
+            prop: "sex",
+            width: 55,
+            type: "select",
+            dicData: [
+              {
+                label: "男",
+                value: 1,
+              },
+              {
+                label: "女",
+                value: 2,
+              },
+              {
+                label: "未知",
+                value: 3,
+              },
+            ],
+            labelWidth: 110,
+            addDisabled: true,
+            editDisabled: true,
+            // rules: [
+            //   {
+            //     required: true,
+            //     message: "请输入性别",
+            //     trigger: "blur",
+            //   },
+            // ],
+          },
+          {
+            label: "民族",
+            prop: "nation",
+            addDisabled: true,
+            editDisabled: true,
+            width: 55,
+            labelWidth: 110,
+            // rules: [
+            //   {
+            //     required: true,
+            //     message: "请输入民族",
+            //     trigger: "blur",
+            //   },
+            // ],
+          },
+          // {
+          //   label: "出生日期",
+          //   labelWidth: 110,
+          //   width: 90,
+          //   // addDisabled: true,
+          //   // editDisabled: true,
+          //   prop: "birthday",
+          //   type: "date",
+          //   format: "yyyy-MM-dd",
+          //   valueFormat: "yyyy-MM-dd",
+          //   rules: [
+          //     {
+          //       required: true,
+          //       message: "请输入出生日期",
+          //       trigger: "blur",
+          //     },
+          //   ],
+          // },
+          {
+            label: "联系电话",
+            prop: "telephone",
+            labelWidth: 110,
+            addDisabled: true,
+            editDisabled: true,
+            width: 98,
+            // rules: [
+            //   {
+            //     required: true,
+            //     message: "请输入联系电话",
+            //     trigger: "blur",
+            //   },
+            // ],
+          },
+          {
+            label: "身份证号",
+            prop: "cardid",
+            labelWidth: 110,
+            addDisabled: true,
+            editDisabled: true,
+            width: 150,
+            rules: [
+              {
+                required: true,
+                message: "请输入身份证号",
+                trigger: "blur",
+              },
+            ],
+          },
+          {
+            label: "户籍所在地址",
+            prop: "residence",
+            labelWidth: 110,
+            overHidden: true,
+            addDisabled: true,
+            editDisabled: true,
+            // rules: [
+            //   {
+            //     required: true,
+            //     message: "请输入户籍所在地址",
+            //     trigger: "blur",
+            //   },
+            // ],
+          },
+          // {
+          //   label: "居住地址  ",
+          //   prop: "address",
+          //   overHidden: true,
+          //   addDisabled: true,
+          //   editDisabled: true,
+          //   labelWidth: 110,
+          //   rules: [
+          //     {
+          //       required: true,
+          //       message: "请输入居住地址  ",
+          //       trigger: "blur",
+          //     },
+          //   ],
+          // },
+          // {
+          //   label: "户籍性质",
+          //   prop: "nature",
+          //   // addDisabled: true,
+          //   // editDisabled: true,
+          //   labelWidth: 110,
+          //   rules: [
+          //     {
+          //       required: true,
+          //       message: "请输入户籍性质",
+          //       trigger: "blur",
+          //     },
+          //   ],
+          // },
+          {
+            label: "个人缴费额",
+            prop: "amount",
+            labelWidth: 110,
+            rules: [
+              {
+                required: true,
+                message: "请输入个人缴费额",
+                trigger: "blur",
+              },
+            ],
+          },
+          {
+            label: "参保时间",
+            labelWidth: 110,
+            width: 90,
+            prop: "insuredtime",
+            type: "date",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd",
+            rules: [
+              {
+                required: true,
+                message: "请输入参保时间",
+                trigger: "blur",
+              },
+            ],
+          },
+          // {
+          //   label: "所属机构",
+          //   labelWidth: 110,
+          //   prop: "deptid",
+          //   addDisplay: false,
+          //   type: "select",
+          //   dicUrl: "/api/blade-system/dept/selectIn",
+          //   props: {
+          //     label: "deptname",
+          //     value: "deptid",
+          //   },
+          // },
+        ],
+      },
+      data: [],
+      excelForm: {},
+      excelOption: {
+        submitBtn: false,
+        emptyBtn: false,
+        column: [
+          {
+            label: "模板上传",
+            prop: "excelFile",
+            type: "upload",
+            drag: true,
+            loadText: "模板上传中，请稍等",
+            span: 24,
+            propsHttp: {
+              res: "data",
+            },
+            tip: "请上传 .xls,.xlsx 标准格式文件",
+            action: "/api/social/import-user?deptid=" + deptid,
+          },
+          // {
+          //   label: "数据覆盖",
+          //   prop: "isCovered",
+          //   type: "switch",
+          //   align: "center",
+          //   hide: true,
+          //   width: 80,
+          //   dicData: [
+          //     {
+          //       label: "否",
+          //       value: 0,
+          //     },
+          //     {
+          //       label: "是",
+          //       value: 1,
+          //     },
+          //   ],
+          //   value: 0,
+          //   slot: true,
+          //   rules: [
+          //     {
+          //       required: true,
+          //       message: "请选择是否覆盖",
+          //       trigger: "blur",
+          //     },
+          //   ],
+          // },
+          {
+            label: "模板下载",
+            prop: "excelTemplate",
+            formslot: true,
+            span: 24,
+          },
+        ],
+      },
+    };
+  },
+  watch: {
+    "excelForm.isCovered"() {
+      console.log(123123);
+      if (this.excelForm.isCovered !== "") {
+        const column = this.findObject(this.excelOption.column, "excelFile");
+        column.action =
+          `/api/social/import-user?isCovered=${this.excelForm.isCovered}` +
+          "&deptid=" +
+          // this.userInfo.dept_id;
+          this.deptid;
+      }
+    },
+  },
+  computed: {
+    ...mapGetters(["permission", "userInfo"]),
+    permissionList() {
+      return {
+        addBtn: this.vaildData(this.permission.social_add, true),
+        viewBtn: this.vaildData(this.permission.social_view, false),
+        delBtn: this.vaildData(this.permission.social_delete, false),
+        editBtn: this.vaildData(this.permission.social_edit, false),
+      };
+    },
+    ids() {
+      let ids = [];
+      this.selectionList.forEach((ele) => {
+        ids.push(ele.id);
+      });
+      return ids.join(",");
+    },
+  },
+  methods: {
+    changes(val) {
+      if (val.value != "") {
+        getuseList(val.value).then((res) => {
+          // console.log(res);
+          var d = res.data.data;
+          this.form.cardid = d.cardid;
+          this.form.telephone = d.phone;
+          this.form.residence = d.nativeplace;
+          this.form.address = d.address;
+          this.form.sex = d.sex;
+          this.form.nation = d.nation;
+          this.form.birthday = d.birthday;
+        });
+      }
+    },
+    rowSave(row, done, loading) {
+      console.log(row);
+      row.deptid = this.deptid;
+      // return;
+      add(row).then(
+        () => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!",
+          });
+          done();
+        },
+        (error) => {
+          loading();
+          window.console.log(error);
+        }
+      );
+    },
+    rowUpdate(row, index, done, loading) {
+      console.log(row);
+      // return;
+      row.deptid = this.deptid;
+      update(row).then(
+        () => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!",
+          });
+          done();
+        },
+        (error) => {
+          loading();
+          console.log(error);
+        }
+      );
+    },
+    rowDel(row) {
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          return remove(row.id);
+        })
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!",
+          });
+        });
+    },
+    handleTemplate() {
+      window.open(
+        `/api/social/export-template?${this.website.tokenHeader}=${getToken()}`
+      );
+    },
+    uploadAfter(res, done, loading, column) {
+      window.console.log(column);
+      this.excelBox = false;
+      this.refreshChange();
+      done();
+    },
+    handleImport() {
+      this.excelBox = true;
+    },
+    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();
+        });
+    },
+    beforeOpen(done, type) {
+      if (["edit", "view"].includes(type)) {
+        getDetail(this.form.id).then((res) => {
+          this.form = res.data.data;
+        });
+      }
+      done();
+    },
+    searchReset() {
+      this.query = {};
+      this.onLoad(this.page);
+    },
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    selectionChange(list) {
+      this.selectionList = list;
+    },
+    selectionClear() {
+      this.selectionList = [];
+      this.$refs.crud.toggleSelection();
+    },
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.query);
+    },
+    onLoad(page, params = {}) {
+      this.loading = true;
+      params["deptid"] = this.deptid;
+      getList(
+        page.currentPage,
+        page.pageSize,
+        Object.assign(params, this.query)
+      ).then((res) => {
+        const data = res.data.data;
+        this.page.total = data.total;
+        this.data = data.records;
+        this.loading = false;
+        this.selectionClear();
+      });
+    },
+  },
+};
+</script>
+
+<style>
+</style>
diff --git a/src/views/securityAnalysis/index.vue b/src/views/securityAnalysis/index.vue
index 331d3fa..4e3ad01 100644
--- a/src/views/securityAnalysis/index.vue
+++ b/src/views/securityAnalysis/index.vue
@@ -54,26 +54,27 @@
         :title="titles"
         append-to-body
         :visible.sync="dialogVisible"
-        top="10vh"
+        top="9vh"
       >
-        <certificate
+        <situation
           :card="{ deptid: deptid, jurisdiction: jurisdiction }"
           v-if="sees == 1"
         >
           <!-- 保安员审查情况统计 -->
-        </certificate>
-        <examination
+        </situation>
+
+        <certificate
           :card="{ deptid: deptid, jurisdiction: jurisdiction }"
           v-if="sees == 2"
         >
-          <!-- 保安员考试情况统计 -->
-        </examination>
-        <situation
+          <!-- 保安员持证情况统计 -->
+        </certificate>
+        <examination
           :card="{ deptid: deptid, jurisdiction: jurisdiction }"
           v-if="sees == 3"
         >
-          <!-- 保安员审查情况统计 -->
-        </situation>
+          <!-- 保安员考试情况统计 -->
+        </examination>
         <dispatch
           :card="{ deptId: deptid, jurisdiction: jurisdiction }"
           v-if="sees == 4"
@@ -86,6 +87,12 @@
         >
           <!-- 保安派遣情况 -->
         </assignment>
+        <socialSecurity
+          :card="{ deptid: deptid, jurisdiction: jurisdiction }"
+          v-if="sees == 6"
+        >
+          <!-- 社保缴纳情况 -->
+        </socialSecurity>
       </el-dialog>
     </div>
   </div>
@@ -107,6 +114,7 @@
 import situation from "./child/situation.vue";
 import dispatch from "./child/dispatch.vue";
 import assignment from "./child/assignment.vue";
+import socialSecurity from "./child/socialSecurity.vue";
 export default {
   components: {
     certificate,
@@ -114,6 +122,7 @@
     situation,
     dispatch,
     assignment,
+    socialSecurity,
   },
   data() {
     return {
@@ -152,6 +161,28 @@
         ids2.push(ele.id);
       });
       return ids2.join(",");
+    },
+  },
+  watch: {
+    dialogVisible() {
+      if (this.dialogVisible == false && this.sees == "1") {
+        this.getEC1();
+      }
+      if (this.dialogVisible == false && this.sees == "2") {
+        this.getEC2();
+      }
+      if (this.dialogVisible == false && this.sees == "3") {
+        this.getEC3();
+      }
+      if (this.dialogVisible == false && this.sees == "4") {
+        this.getEC4();
+      }
+      if (this.dialogVisible == false && this.sees == "5") {
+        this.getEC5();
+      }
+      if (this.dialogVisible == false && this.sees == "6") {
+        this.getEC6();
+      }
     },
   },
   methods: {
@@ -292,7 +323,7 @@
           x: "center",
           y: "90%",
         },
-        toolbox: this.gettoolbox("审查情况查询", "保安员审查情况明细", 3),
+        toolbox: this.gettoolbox("审查情况查询", "保安员审查情况明细", 1),
         // grid: {
         //   // left: "3%",
         //   right: "5%",
@@ -414,7 +445,7 @@
           x: "center",
           y: "83%",
         },
-        toolbox: this.gettoolbox("持证情况查询", "保安员持证情况明细", 1),
+        toolbox: this.gettoolbox("持证情况查询", "保安员持证情况明细", 2),
         series: [
           {
             // name: "访问来源",
@@ -499,7 +530,7 @@
           formatter:
             "<span>实操成绩</span>({b0}) :  {c0}<span>人</span><br /><span>理论成绩</span>({b1}) :  {c1}<span>人</span>",
         },
-        toolbox: this.gettoolbox("考试情况查询", "保安员考试情况明细", 2),
+        toolbox: this.gettoolbox("考试情况查询", "保安员考试情况明细", 3),
         legend: {
           data: ["实操成绩", "理论成绩"],
         },
@@ -756,6 +787,7 @@
         tooltip: {
           trigger: "item",
         },
+        toolbox: this.gettoolbox("社保缴纳查询", "保安员社保缴纳明细", 6),
         legend: {
           // orient: "vertical",
           // left: "left",
diff --git a/src/views/securityGuard/securityGuard.vue b/src/views/securityGuard/securityGuard.vue
index 8237ce0..e48402a 100644
--- a/src/views/securityGuard/securityGuard.vue
+++ b/src/views/securityGuard/securityGuard.vue
@@ -1041,7 +1041,7 @@
     if (!website.tenantMode) {
       this.initData(website.tenantId);
     }
-    console.log(this.search, 111);
+    // console.log(this.search, 111);
     this.search["status"] = 1;
   },
   methods: {
diff --git a/src/views/securityUnitChild/social.vue b/src/views/securityUnitChild/social.vue
index d13c4a8..89e23d8 100644
--- a/src/views/securityUnitChild/social.vue
+++ b/src/views/securityUnitChild/social.vue
@@ -170,13 +170,13 @@
             editDisabled: true,
             width: 55,
             labelWidth: 110,
-            rules: [
-              {
-                required: true,
-                message: "请输入民族",
-                trigger: "blur",
-              },
-            ],
+            // rules: [
+            //   {
+            //     required: true,
+            //     message: "请输入民族",
+            //     trigger: "blur",
+            //   },
+            // ],
           },
           // {
           //   label: "出生日期",
@@ -203,13 +203,13 @@
             addDisabled: true,
             editDisabled: true,
             width: 98,
-            rules: [
-              {
-                required: true,
-                message: "请输入联系电话",
-                trigger: "blur",
-              },
-            ],
+            // rules: [
+            //   {
+            //     required: true,
+            //     message: "请输入联系电话",
+            //     trigger: "blur",
+            //   },
+            // ],
           },
           {
             label: "身份证号",
@@ -218,13 +218,13 @@
             addDisabled: true,
             editDisabled: true,
             width: 150,
-            rules: [
-              {
-                required: true,
-                message: "请输入身份证号",
-                trigger: "blur",
-              },
-            ],
+            // rules: [
+            //   {
+            //     required: true,
+            //     message: "请输入身份证号",
+            //     trigger: "blur",
+            //   },
+            // ],
           },
           {
             label: "户籍所在地址",
@@ -233,13 +233,13 @@
             overHidden: true,
             addDisabled: true,
             editDisabled: true,
-            rules: [
-              {
-                required: true,
-                message: "请输入户籍所在地址",
-                trigger: "blur",
-              },
-            ],
+            // rules: [
+            //   {
+            //     required: true,
+            //     message: "请输入户籍所在地址",
+            //     trigger: "blur",
+            //   },
+            // ],
           },
           // {
           //   label: "居住地址  ",
@@ -416,8 +416,9 @@
       }
     },
     rowSave(row, done, loading) {
-      console.log(row);
       row.deptid = this.deptid;
+      row.jurisdiction = this.userInfo.jurisdiction;
+      console.log(row);
       // return;
       add(row).then(
         () => {
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index 1a726da..be69d63 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -1,6 +1,6 @@
 <template>
   <el-row class="user">
-    <el-col :span="5">
+    <el-col :span="sizes[0]">
       <div class="box">
         <el-scrollbar>
           <basic-container>
@@ -13,7 +13,7 @@
         </el-scrollbar>
       </div>
     </el-col>
-    <el-col :span="19">
+    <el-col :span="sizes[1]">
       <basic-container>
         <avue-crud
           :option="option"
@@ -220,8 +220,10 @@
       }
     };
     return {
-      form: {
-      },
+      sizes: [5, 19],
+      deptids: null,
+
+      form: {},
       search: {},
       roleBox: false,
       excelBox: false,
@@ -415,7 +417,7 @@
               {
                 label: "密码",
                 prop: "password",
-                type:'password',
+                type: "password",
                 hide: true,
                 editDisplay: false,
                 viewDisplay: false,
@@ -426,7 +428,7 @@
               {
                 label: "确认密码",
                 prop: "password2",
-                type:'password',
+                type: "password",
                 hide: true,
                 editDisplay: false,
                 viewDisplay: false,
@@ -753,6 +755,16 @@
       return ids.join(",");
     },
   },
+  created() {
+    console.log(this.userInfo.role_name);
+    if (this.userInfo.role_name == "保安公司管理员") {
+      this.deptids = this.userInfo.dept_id;
+      this.sizes = [0, 24];
+    } else {
+      this.deptids = null;
+      this.sizes = [5, 19];
+    }
+  },
   mounted() {
     // 非保安单位模式默认加载管理组数据
     if (!website.tenantMode) {
@@ -985,11 +997,12 @@
     },
     onLoad(page, params = {}) {
       this.loading = true;
+      var deptid = this.deptids == null ? this.treeDeptId : this.deptids;
       getList(
         page.currentPage,
         page.pageSize,
         Object.assign(params, this.query),
-        this.treeDeptId
+        deptid
       ).then((res) => {
         const data = res.data.data;
         this.page.total = data.total;
@@ -1050,11 +1063,12 @@
     },
     platformOnLoad(page, params = {}) {
       this.platformLoading = true;
+      var deptid = this.deptids == null ? this.treeDeptId : this.deptids;
       getList(
         page.currentPage,
         page.pageSize,
         Object.assign(params, this.query),
-        this.treeDeptId
+        deptid
       ).then((res) => {
         const data = res.data.data;
         this.platformPage.total = data.total;
diff --git a/src/views/system/userCompany.vue b/src/views/system/userCompany.vue
new file mode 100644
index 0000000..cf32b1c
--- /dev/null
+++ b/src/views/system/userCompany.vue
@@ -0,0 +1,1088 @@
+<template>
+  <el-row class="user">
+    <!-- <el-col :span="5">
+      <div class="box">
+        <el-scrollbar>
+          <basic-container>
+            <avue-tree
+              :option="treeOption"
+              :data="treeData"
+              @node-click="nodeClick"
+            />
+          </basic-container>
+        </el-scrollbar>
+      </div>
+    </el-col> -->
+    <el-col :span="24">
+      <basic-container>
+        <avue-crud
+          :option="option"
+          :search.sync="search"
+          :table-loading="loading"
+          :data="data"
+          ref="crud"
+          v-model="form"
+          :permission="permissionList"
+          @row-del="rowDel"
+          @row-update="rowUpdate"
+          @row-save="rowSave"
+          :before-open="beforeOpen"
+          :page.sync="page"
+          @search-change="searchChange"
+          @search-reset="searchReset"
+          @selection-change="selectionChange"
+          @current-change="currentChange"
+          @size-change="sizeChange"
+          @refresh-change="refreshChange"
+          @on-load="onLoad"
+        >
+          <template slot="menuLeft">
+            <el-button
+              type="danger"
+              size="small"
+              plain
+              icon="el-icon-delete"
+              v-if="permission.user_delete"
+              @click="handleDelete"
+              >注 销
+            </el-button>
+            <el-button
+              type="info"
+              size="small"
+              plain
+              v-if="permission.user_role"
+              icon="el-icon-user"
+              @click="handleGrant"
+              >角色配置
+            </el-button>
+            <el-button
+              type="info"
+              size="small"
+              plain
+              v-if="permission.user_reset"
+              icon="el-icon-refresh"
+              @click="handleReset"
+              >密码重置
+            </el-button>
+            <el-button
+              type="info"
+              size="small"
+              plain
+              v-if="userInfo.role_name.includes('admin')"
+              icon="el-icon-setting"
+              @click="handlePlatform"
+              >平台配置
+            </el-button>
+            <el-button
+              type="success"
+              size="small"
+              plain
+              v-if="userInfo.role_name.includes('admin')"
+              icon="el-icon-upload2"
+              @click="handleImport"
+              >导入
+            </el-button>
+            <el-button
+              type="warning"
+              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">
+            <el-tag>{{ row.tenantName }}</el-tag>
+          </template>
+          <template slot-scope="{ row }" slot="roleName">
+            <el-tag>{{ row.roleName }}</el-tag>
+          </template>
+          <template slot-scope="{ row }" slot="deptName">
+            <el-tag>{{ row.deptName }}</el-tag>
+          </template>
+          <template slot-scope="{ row }" slot="userTypeName">
+            <el-tag>{{ row.userTypeName }}</el-tag>
+          </template>
+        </avue-crud>
+        <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"
+          >
+            <template slot="excelTemplate">
+              <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"
+            :table-loading="platformLoading"
+            :data="platformData"
+            ref="platformCrud"
+            v-model="platformForm"
+            :before-open="platformBeforeOpen"
+            :page.sync="platformPage"
+            :permission="platformPermissionList"
+            @row-update="platformRowUpdate"
+            @search-change="platformSearchChange"
+            @search-reset="platformSearchReset"
+            @selection-change="platformSelectionChange"
+            @current-change="platformCurrentChange"
+            @size-change="platformSizeChange"
+            @refresh-change="platformRefreshChange"
+            @on-load="platformOnLoad"
+          >
+            <template slot-scope="{ row }" slot="tenantName">
+              <el-tag>{{ row.tenantName }}</el-tag>
+            </template>
+            <template slot-scope="{ row }" slot="userTypeName">
+              <el-tag>{{ row.userTypeName }}</el-tag>
+            </template>
+          </avue-crud>
+        </el-dialog>
+      </basic-container>
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import {
+  getList,
+  getUser,
+  getUserPlatform,
+  remove,
+  update,
+  updatePlatform,
+  add,
+  grant,
+  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";
+
+export default {
+  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 {
+      form: {},
+      search: {},
+      roleBox: false,
+      excelBox: false,
+      platformBox: false,
+      initFlag: true,
+      selectionList: [],
+      query: {},
+      loading: true,
+      platformLoading: false,
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0,
+      },
+      platformPage: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0,
+      },
+      init: {
+        roleTree: [],
+        deptTree: [],
+      },
+      props: {
+        label: "title",
+        value: "key",
+      },
+      roleGrantList: [],
+      roleTreeObj: [],
+      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: 80,
+        tip: false,
+        searchShow: true,
+        searchMenuSpan: 6,
+        border: true,
+        index: true,
+        delBtnText: "注销",
+        selection: true,
+        viewBtn: true,
+        //dialogType: 'drawer',
+        dialogClickModal: false,
+        column: [
+          {
+            label: "登录账号",
+            prop: "account",
+            search: true,
+            display: false,
+          },
+          {
+            label: "所属组织机构",
+            prop: "deptName",
+            slot: true,
+            display: false,
+          },
+          {
+            label: "用户姓名",
+            prop: "realName",
+            search: true,
+            display: false,
+          },
+          {
+            label: "所属角色",
+            prop: "roleName",
+            slot: true,
+            display: false,
+          },
+          // {
+          //   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: [
+          {
+            label: "基础信息",
+            labelWidth: "110",
+            prop: "baseInfo",
+            icon: "el-icon-user-solid",
+            column: [
+              {
+                label: "所属组织机构",
+                prop: "deptId",
+                type: "tree",
+                dicUrl: "/api/blade-system/dept/lazy-tree",
+                props: {
+                  label: "title",
+                  value: "id",
+                },
+                hide: !website.tenantMode,
+                addDisplay: website.tenantMode,
+                editDisplay: website.tenantMode,
+                viewDisplay: website.tenantMode,
+                rules: [
+                  {
+                    required: true,
+                    message: "所属组织机构",
+                    trigger: "click",
+                  },
+                ],
+                span: 24,
+              },
+              {
+                label: "登录账号",
+                prop: "account",
+                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",
+                type: "password",
+                hide: true,
+                editDisplay: false,
+                viewDisplay: false,
+                rules: [
+                  { required: true, validator: validatePass, trigger: "blur" },
+                ],
+              },
+              {
+                label: "确认密码",
+                prop: "password2",
+                type: "password",
+                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: [
+                  {
+                    required: true,
+                    message: "请输入用户姓名",
+                    trigger: "blur",
+                  },
+                  {
+                    min: 2,
+                    max: 5,
+                    message: "姓名长度在2到5个字符",
+                  },
+                ],
+              },
+              {
+                label: "手机号码",
+                prop: "phone",
+                overHidden: true,
+              },
+              {
+                label: "电子邮箱",
+                prop: "email",
+                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",
+                format: "yyyy-MM-dd hh:mm:ss",
+                valueFormat: "yyyy-MM-dd hh:mm:ss",
+                hide: true,
+              },
+              {
+                label: "账号状态",
+                prop: "statusName",
+                hide: true,
+                display: false,
+              },
+            ],
+          },
+          {
+            label: "职责信息",
+            labelWidth: "110",
+            prop: "dutyInfo",
+            icon: "el-icon-s-custom",
+            column: [
+              {
+                label: "用户编号",
+                prop: "code",
+              },
+              {
+                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: {},
+      platformSelectionList: [],
+      platformData: [],
+      platformForm: {},
+      platformOption: {
+        tip: false,
+        searchShow: true,
+        searchMenuSpan: 6,
+        border: true,
+        index: true,
+        selection: true,
+        viewBtn: true,
+        dialogClickModal: false,
+        menuWidth: 120,
+        editBtnText: "配置",
+        column: [
+          {
+            label: "登录账号",
+            prop: "account",
+            search: true,
+            display: false,
+          },
+          {
+            label: "所属单位",
+            prop: "tenantName",
+            slot: true,
+            display: false,
+          },
+          {
+            label: "用户姓名",
+            prop: "realName",
+            search: 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: "userExt",
+            type: "textarea",
+            minRows: 8,
+            span: 24,
+            overHidden: true,
+            row: true,
+            hide: true,
+          },
+        ],
+      },
+      excelForm: {},
+      excelOption: {
+        submitBtn: false,
+        emptyBtn: false,
+        column: [
+          {
+            label: "模板上传",
+            prop: "excelFile",
+            type: "upload",
+            drag: true,
+            loadText: "模板上传中，请稍等",
+            span: 24,
+            propsHttp: {
+              res: "data",
+            },
+            tip: "请上传 .xls,.xlsx 标准格式文件",
+            action: "/api/blade-user/import-user",
+          },
+          {
+            label: "数据覆盖",
+            prop: "isCovered",
+            type: "switch",
+            align: "center",
+            width: 80,
+            dicData: [
+              {
+                label: "否",
+                value: 0,
+              },
+              {
+                label: "是",
+                value: 1,
+              },
+            ],
+            value: 0,
+            slot: true,
+            rules: [
+              {
+                required: true,
+                message: "请选择是否覆盖",
+                trigger: "blur",
+              },
+            ],
+          },
+          {
+            label: "模板下载",
+            prop: "excelTemplate",
+            formslot: true,
+            span: 24,
+          },
+        ],
+      },
+      deptids: "",
+    };
+  },
+  watch: {
+    "form.tenantId"() {
+      if (this.form.tenantId !== "" && this.initFlag) {
+        this.initData(this.form.tenantId);
+      }
+    },
+    "form.deptId"() {
+      this.initData(this.form.tenantId);
+    },
+    "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"]),
+    permissionList() {
+      return {
+        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),
+      };
+    },
+    platformPermissionList() {
+      return {
+        addBtn: false,
+        viewBtn: false,
+        delBtn: false,
+        editBtn: this.vaildData(this.permission.user_edit, false),
+      };
+    },
+    ids() {
+      let ids = [];
+      this.selectionList.forEach((ele) => {
+        ids.push(ele.id);
+      });
+      return ids.join(",");
+    },
+  },
+  created() {
+    console.log(this.userInfo.role_name);
+    this.deptids = this.userInfo.dept_id;
+  },
+  mounted() {
+    // 非保安单位模式默认加载管理组数据
+    if (!website.tenantMode) {
+      this.initData(website.tenantId);
+    }
+  },
+  methods: {
+    nodeClick(data) {
+      // this.treeDeptId = data.id;
+      this.page.currentPage = 1;
+      this.onLoad(this.page);
+    },
+    initData(tenantId) {
+      getRoleTree(tenantId).then((res) => {
+        const column = this.findObject(this.option.group, "roleId");
+        column.dicData = res.data.data;
+      });
+      getDeptTree(tenantId).then((res) => {
+        const column = this.findObject(this.option.group, "deptId");
+        column.dicData = res.data.data;
+      });
+      getPostList(tenantId).then((res) => {
+        const column = this.findObject(this.option.group, "postId");
+        column.dicData = res.data.data;
+      });
+    },
+    submitRole() {
+      const roleList = this.$refs.treeRole.getCheckedKeys().join(",");
+      grant(this.ids, roleList).then(() => {
+        this.roleBox = false;
+        this.$message({
+          type: "success",
+          message: "操作成功!",
+        });
+        this.onLoad(this.page);
+      });
+    },
+    rowSave(row, done, loading) {
+      row.deptId = row.deptId;
+      row.roleId = row.roleId.join(",");
+      row.postId = row.postId.join(",");
+      add(row).then(
+        () => {
+          this.initFlag = false;
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!",
+          });
+          done();
+        },
+        (error) => {
+          window.console.log(error);
+          loading();
+        }
+      );
+    },
+    rowUpdate(row, index, done, loading) {
+      row.deptId = row.deptId;
+      row.roleId = row.roleId.join(",");
+      row.postId = row.postId.join(",");
+      update(row).then(
+        () => {
+          this.initFlag = false;
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!",
+          });
+          done();
+        },
+        (error) => {
+          window.console.log(error);
+          loading();
+        }
+      );
+    },
+    rowDel(row) {
+      this.$confirm("确定将选择用户注销?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          return remove(row.id);
+        })
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!",
+          });
+        });
+    },
+    searchReset() {
+      this.query = {};
+      // this.treeDeptId = "";
+      this.onLoad(this.page);
+    },
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    selectionChange(list) {
+      this.selectionList = list;
+    },
+    selectionClear() {
+      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();
+        });
+    },
+    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("请选择至少一条数据");
+        return;
+      }
+      this.roleTreeObj = [];
+      if (this.selectionList.length === 1) {
+        this.roleTreeObj = this.selectionList[0].roleId.split(",");
+      }
+      getRoleTree().then((res) => {
+        this.roleGrantList = res.data.data;
+        this.roleBox = true;
+      });
+    },
+    handlePlatform() {
+      this.platformBox = true;
+    },
+    handleImport() {
+      this.excelBox = true;
+    },
+    uploadAfter(res, done, loading, column) {
+      window.console.log(column);
+      this.excelBox = false;
+      this.refreshChange();
+      done();
+    },
+    handleExport() {
+      this.$confirm("是否导出用户数据?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        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()}`
+      );
+    },
+    beforeOpen(done, type) {
+      if (["edit", "view"].includes(type)) {
+        getUser(this.form.id).then((res) => {
+          this.form = res.data.data;
+          if (this.form.hasOwnProperty("deptId")) {
+            this.form.deptId = this.form.deptId;
+          }
+          if (this.form.hasOwnProperty("roleId")) {
+            this.form.roleId = this.form.roleId.split(",");
+          }
+          if (this.form.hasOwnProperty("postId")) {
+            this.form.postId = this.form.postId.split(",");
+          }
+        });
+      }
+      this.initFlag = true;
+      done();
+    },
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.query);
+    },
+    onLoad(page, params = {}) {
+      this.loading = true;
+      getList(
+        page.currentPage,
+        page.pageSize,
+        Object.assign(params, this.query),
+        // this.treeDeptId
+        this.deptids
+      ).then((res) => {
+        const data = res.data.data;
+        this.page.total = data.total;
+        this.data = data.records;
+        this.loading = false;
+        this.selectionClear();
+      });
+    },
+    platformRowUpdate(row, index, done, loading) {
+      updatePlatform(row.id, row.userType, row.userExt).then(
+        () => {
+          this.platformOnLoad(this.platformPage);
+          this.$message({
+            type: "success",
+            message: "操作成功!",
+          });
+          done();
+        },
+        (error) => {
+          window.console.log(error);
+          loading();
+        }
+      );
+    },
+    platformBeforeOpen(done, type) {
+      if (["edit", "view"].includes(type)) {
+        getUserPlatform(this.platformForm.id).then((res) => {
+          this.platformForm = res.data.data;
+        });
+      }
+      done();
+    },
+    platformSearchReset() {
+      this.platformQuery = {};
+      this.platformOnLoad(this.platformPage);
+    },
+    platformSearchChange(params, done) {
+      this.platformQuery = params;
+      this.platformPage.currentPage = 1;
+      this.platformOnLoad(this.platformPage, params);
+      done();
+    },
+    platformSelectionChange(list) {
+      this.platformSelectionList = list;
+    },
+    platformSelectionClear() {
+      this.platformSelectionList = [];
+      this.$refs.platformCrud.toggleSelection();
+    },
+    platformCurrentChange(currentPage) {
+      this.platformPage.currentPage = currentPage;
+    },
+    platformSizeChange(pageSize) {
+      this.platformPage.pageSize = pageSize;
+    },
+    platformRefreshChange() {
+      this.platformOnLoad(this.platformPage, this.platformQuery);
+    },
+    platformOnLoad(page, params = {}) {
+      this.platformLoading = true;
+      getList(
+        page.currentPage,
+        page.pageSize,
+        Object.assign(params, this.query),
+        // this.treeDeptId
+        this.deptids
+      ).then((res) => {
+        const data = res.data.data;
+        this.platformPage.total = data.total;
+        this.platformData = data.records;
+        this.platformLoading = false;
+        this.selectionClear();
+      });
+    },
+  },
+};
+</script>
+
+<style>
+.box {
+  height: 800px;
+}
+
+.el-scrollbar {
+  height: 100%;
+}
+
+.box .el-scrollbar__wrap {
+  overflow: scroll;
+}
+</style>
diff --git a/src/views/system/userOld.vue b/src/views/system/userOld.vue
new file mode 100644
index 0000000..1a726da
--- /dev/null
+++ b/src/views/system/userOld.vue
@@ -0,0 +1,1082 @@
+<template>
+  <el-row class="user">
+    <el-col :span="5">
+      <div class="box">
+        <el-scrollbar>
+          <basic-container>
+            <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"
+          :search.sync="search"
+          :table-loading="loading"
+          :data="data"
+          ref="crud"
+          v-model="form"
+          :permission="permissionList"
+          @row-del="rowDel"
+          @row-update="rowUpdate"
+          @row-save="rowSave"
+          :before-open="beforeOpen"
+          :page.sync="page"
+          @search-change="searchChange"
+          @search-reset="searchReset"
+          @selection-change="selectionChange"
+          @current-change="currentChange"
+          @size-change="sizeChange"
+          @refresh-change="refreshChange"
+          @on-load="onLoad"
+        >
+          <template slot="menuLeft">
+            <el-button
+              type="danger"
+              size="small"
+              plain
+              icon="el-icon-delete"
+              v-if="permission.user_delete"
+              @click="handleDelete"
+              >注 销
+            </el-button>
+            <el-button
+              type="info"
+              size="small"
+              plain
+              v-if="permission.user_role"
+              icon="el-icon-user"
+              @click="handleGrant"
+              >角色配置
+            </el-button>
+            <el-button
+              type="info"
+              size="small"
+              plain
+              v-if="permission.user_reset"
+              icon="el-icon-refresh"
+              @click="handleReset"
+              >密码重置
+            </el-button>
+            <el-button
+              type="info"
+              size="small"
+              plain
+              v-if="userInfo.role_name.includes('admin')"
+              icon="el-icon-setting"
+              @click="handlePlatform"
+              >平台配置
+            </el-button>
+            <el-button
+              type="success"
+              size="small"
+              plain
+              v-if="userInfo.role_name.includes('admin')"
+              icon="el-icon-upload2"
+              @click="handleImport"
+              >导入
+            </el-button>
+            <el-button
+              type="warning"
+              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">
+            <el-tag>{{ row.tenantName }}</el-tag>
+          </template>
+          <template slot-scope="{ row }" slot="roleName">
+            <el-tag>{{ row.roleName }}</el-tag>
+          </template>
+          <template slot-scope="{ row }" slot="deptName">
+            <el-tag>{{ row.deptName }}</el-tag>
+          </template>
+          <template slot-scope="{ row }" slot="userTypeName">
+            <el-tag>{{ row.userTypeName }}</el-tag>
+          </template>
+        </avue-crud>
+        <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"
+          >
+            <template slot="excelTemplate">
+              <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"
+            :table-loading="platformLoading"
+            :data="platformData"
+            ref="platformCrud"
+            v-model="platformForm"
+            :before-open="platformBeforeOpen"
+            :page.sync="platformPage"
+            :permission="platformPermissionList"
+            @row-update="platformRowUpdate"
+            @search-change="platformSearchChange"
+            @search-reset="platformSearchReset"
+            @selection-change="platformSelectionChange"
+            @current-change="platformCurrentChange"
+            @size-change="platformSizeChange"
+            @refresh-change="platformRefreshChange"
+            @on-load="platformOnLoad"
+          >
+            <template slot-scope="{ row }" slot="tenantName">
+              <el-tag>{{ row.tenantName }}</el-tag>
+            </template>
+            <template slot-scope="{ row }" slot="userTypeName">
+              <el-tag>{{ row.userTypeName }}</el-tag>
+            </template>
+          </avue-crud>
+        </el-dialog>
+      </basic-container>
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import {
+  getList,
+  getUser,
+  getUserPlatform,
+  remove,
+  update,
+  updatePlatform,
+  add,
+  grant,
+  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";
+
+export default {
+  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 {
+      form: {
+      },
+      search: {},
+      roleBox: false,
+      excelBox: false,
+      platformBox: false,
+      initFlag: true,
+      selectionList: [],
+      query: {},
+      loading: true,
+      platformLoading: false,
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0,
+      },
+      platformPage: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0,
+      },
+      init: {
+        roleTree: [],
+        deptTree: [],
+      },
+      props: {
+        label: "title",
+        value: "key",
+      },
+      roleGrantList: [],
+      roleTreeObj: [],
+      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: 80,
+        tip: false,
+        searchShow: true,
+        searchMenuSpan: 6,
+        border: true,
+        index: true,
+        delBtnText: "注销",
+        selection: true,
+        viewBtn: true,
+        //dialogType: 'drawer',
+        dialogClickModal: false,
+        column: [
+          {
+            label: "登录账号",
+            prop: "account",
+            search: true,
+            display: false,
+          },
+          {
+            label: "所属组织机构",
+            prop: "deptName",
+            slot: true,
+            display: false,
+          },
+          {
+            label: "用户姓名",
+            prop: "realName",
+            search: true,
+            display: false,
+          },
+          {
+            label: "所属角色",
+            prop: "roleName",
+            slot: true,
+            display: false,
+          },
+          // {
+          //   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: [
+          {
+            label: "基础信息",
+            labelWidth: "110",
+            prop: "baseInfo",
+            icon: "el-icon-user-solid",
+            column: [
+              {
+                label: "所属组织机构",
+                prop: "deptId",
+                type: "tree",
+                dicUrl: "/api/blade-system/dept/lazy-tree",
+                props: {
+                  label: "title",
+                  value: "id",
+                },
+                hide: !website.tenantMode,
+                addDisplay: website.tenantMode,
+                editDisplay: website.tenantMode,
+                viewDisplay: website.tenantMode,
+                rules: [
+                  {
+                    required: true,
+                    message: "所属组织机构",
+                    trigger: "click",
+                  },
+                ],
+                span: 24,
+              },
+              {
+                label: "登录账号",
+                prop: "account",
+                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",
+                type:'password',
+                hide: true,
+                editDisplay: false,
+                viewDisplay: false,
+                rules: [
+                  { required: true, validator: validatePass, trigger: "blur" },
+                ],
+              },
+              {
+                label: "确认密码",
+                prop: "password2",
+                type:'password',
+                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: [
+                  {
+                    required: true,
+                    message: "请输入用户姓名",
+                    trigger: "blur",
+                  },
+                  {
+                    min: 2,
+                    max: 5,
+                    message: "姓名长度在2到5个字符",
+                  },
+                ],
+              },
+              {
+                label: "手机号码",
+                prop: "phone",
+                overHidden: true,
+              },
+              {
+                label: "电子邮箱",
+                prop: "email",
+                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",
+                format: "yyyy-MM-dd hh:mm:ss",
+                valueFormat: "yyyy-MM-dd hh:mm:ss",
+                hide: true,
+              },
+              {
+                label: "账号状态",
+                prop: "statusName",
+                hide: true,
+                display: false,
+              },
+            ],
+          },
+          {
+            label: "职责信息",
+            labelWidth: "110",
+            prop: "dutyInfo",
+            icon: "el-icon-s-custom",
+            column: [
+              {
+                label: "用户编号",
+                prop: "code",
+              },
+              {
+                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: {},
+      platformSelectionList: [],
+      platformData: [],
+      platformForm: {},
+      platformOption: {
+        tip: false,
+        searchShow: true,
+        searchMenuSpan: 6,
+        border: true,
+        index: true,
+        selection: true,
+        viewBtn: true,
+        dialogClickModal: false,
+        menuWidth: 120,
+        editBtnText: "配置",
+        column: [
+          {
+            label: "登录账号",
+            prop: "account",
+            search: true,
+            display: false,
+          },
+          {
+            label: "所属单位",
+            prop: "tenantName",
+            slot: true,
+            display: false,
+          },
+          {
+            label: "用户姓名",
+            prop: "realName",
+            search: 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: "userExt",
+            type: "textarea",
+            minRows: 8,
+            span: 24,
+            overHidden: true,
+            row: true,
+            hide: true,
+          },
+        ],
+      },
+      excelForm: {},
+      excelOption: {
+        submitBtn: false,
+        emptyBtn: false,
+        column: [
+          {
+            label: "模板上传",
+            prop: "excelFile",
+            type: "upload",
+            drag: true,
+            loadText: "模板上传中，请稍等",
+            span: 24,
+            propsHttp: {
+              res: "data",
+            },
+            tip: "请上传 .xls,.xlsx 标准格式文件",
+            action: "/api/blade-user/import-user",
+          },
+          {
+            label: "数据覆盖",
+            prop: "isCovered",
+            type: "switch",
+            align: "center",
+            width: 80,
+            dicData: [
+              {
+                label: "否",
+                value: 0,
+              },
+              {
+                label: "是",
+                value: 1,
+              },
+            ],
+            value: 0,
+            slot: true,
+            rules: [
+              {
+                required: true,
+                message: "请选择是否覆盖",
+                trigger: "blur",
+              },
+            ],
+          },
+          {
+            label: "模板下载",
+            prop: "excelTemplate",
+            formslot: true,
+            span: 24,
+          },
+        ],
+      },
+    };
+  },
+  watch: {
+    "form.tenantId"() {
+      if (this.form.tenantId !== "" && this.initFlag) {
+        this.initData(this.form.tenantId);
+      }
+    },
+    "form.deptId"() {
+      this.initData(this.form.tenantId);
+    },
+    "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"]),
+    permissionList() {
+      return {
+        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),
+      };
+    },
+    platformPermissionList() {
+      return {
+        addBtn: false,
+        viewBtn: false,
+        delBtn: false,
+        editBtn: this.vaildData(this.permission.user_edit, false),
+      };
+    },
+    ids() {
+      let ids = [];
+      this.selectionList.forEach((ele) => {
+        ids.push(ele.id);
+      });
+      return ids.join(",");
+    },
+  },
+  mounted() {
+    // 非保安单位模式默认加载管理组数据
+    if (!website.tenantMode) {
+      this.initData(website.tenantId);
+    }
+  },
+  methods: {
+    nodeClick(data) {
+      this.treeDeptId = data.id;
+      this.page.currentPage = 1;
+      this.onLoad(this.page);
+    },
+    initData(tenantId) {
+      getRoleTree(tenantId).then((res) => {
+        const column = this.findObject(this.option.group, "roleId");
+        column.dicData = res.data.data;
+      });
+      getDeptTree(tenantId).then((res) => {
+        const column = this.findObject(this.option.group, "deptId");
+        column.dicData = res.data.data;
+      });
+      getPostList(tenantId).then((res) => {
+        const column = this.findObject(this.option.group, "postId");
+        column.dicData = res.data.data;
+      });
+    },
+    submitRole() {
+      const roleList = this.$refs.treeRole.getCheckedKeys().join(",");
+      grant(this.ids, roleList).then(() => {
+        this.roleBox = false;
+        this.$message({
+          type: "success",
+          message: "操作成功!",
+        });
+        this.onLoad(this.page);
+      });
+    },
+    rowSave(row, done, loading) {
+      row.deptId = row.deptId;
+      row.roleId = row.roleId.join(",");
+      row.postId = row.postId.join(",");
+      add(row).then(
+        () => {
+          this.initFlag = false;
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!",
+          });
+          done();
+        },
+        (error) => {
+          window.console.log(error);
+          loading();
+        }
+      );
+    },
+    rowUpdate(row, index, done, loading) {
+      row.deptId = row.deptId;
+      row.roleId = row.roleId.join(",");
+      row.postId = row.postId.join(",");
+      update(row).then(
+        () => {
+          this.initFlag = false;
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!",
+          });
+          done();
+        },
+        (error) => {
+          window.console.log(error);
+          loading();
+        }
+      );
+    },
+    rowDel(row) {
+      this.$confirm("确定将选择用户注销?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          return remove(row.id);
+        })
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!",
+          });
+        });
+    },
+    searchReset() {
+      this.query = {};
+      this.treeDeptId = "";
+      this.onLoad(this.page);
+    },
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    selectionChange(list) {
+      this.selectionList = list;
+    },
+    selectionClear() {
+      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();
+        });
+    },
+    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("请选择至少一条数据");
+        return;
+      }
+      this.roleTreeObj = [];
+      if (this.selectionList.length === 1) {
+        this.roleTreeObj = this.selectionList[0].roleId.split(",");
+      }
+      getRoleTree().then((res) => {
+        this.roleGrantList = res.data.data;
+        this.roleBox = true;
+      });
+    },
+    handlePlatform() {
+      this.platformBox = true;
+    },
+    handleImport() {
+      this.excelBox = true;
+    },
+    uploadAfter(res, done, loading, column) {
+      window.console.log(column);
+      this.excelBox = false;
+      this.refreshChange();
+      done();
+    },
+    handleExport() {
+      this.$confirm("是否导出用户数据?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        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()}`
+      );
+    },
+    beforeOpen(done, type) {
+      if (["edit", "view"].includes(type)) {
+        getUser(this.form.id).then((res) => {
+          this.form = res.data.data;
+          if (this.form.hasOwnProperty("deptId")) {
+            this.form.deptId = this.form.deptId;
+          }
+          if (this.form.hasOwnProperty("roleId")) {
+            this.form.roleId = this.form.roleId.split(",");
+          }
+          if (this.form.hasOwnProperty("postId")) {
+            this.form.postId = this.form.postId.split(",");
+          }
+        });
+      }
+      this.initFlag = true;
+      done();
+    },
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.query);
+    },
+    onLoad(page, params = {}) {
+      this.loading = true;
+      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;
+        this.loading = false;
+        this.selectionClear();
+      });
+    },
+    platformRowUpdate(row, index, done, loading) {
+      updatePlatform(row.id, row.userType, row.userExt).then(
+        () => {
+          this.platformOnLoad(this.platformPage);
+          this.$message({
+            type: "success",
+            message: "操作成功!",
+          });
+          done();
+        },
+        (error) => {
+          window.console.log(error);
+          loading();
+        }
+      );
+    },
+    platformBeforeOpen(done, type) {
+      if (["edit", "view"].includes(type)) {
+        getUserPlatform(this.platformForm.id).then((res) => {
+          this.platformForm = res.data.data;
+        });
+      }
+      done();
+    },
+    platformSearchReset() {
+      this.platformQuery = {};
+      this.platformOnLoad(this.platformPage);
+    },
+    platformSearchChange(params, done) {
+      this.platformQuery = params;
+      this.platformPage.currentPage = 1;
+      this.platformOnLoad(this.platformPage, params);
+      done();
+    },
+    platformSelectionChange(list) {
+      this.platformSelectionList = list;
+    },
+    platformSelectionClear() {
+      this.platformSelectionList = [];
+      this.$refs.platformCrud.toggleSelection();
+    },
+    platformCurrentChange(currentPage) {
+      this.platformPage.currentPage = currentPage;
+    },
+    platformSizeChange(pageSize) {
+      this.platformPage.pageSize = pageSize;
+    },
+    platformRefreshChange() {
+      this.platformOnLoad(this.platformPage, this.platformQuery);
+    },
+    platformOnLoad(page, params = {}) {
+      this.platformLoading = true;
+      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>
+.box {
+  height: 800px;
+}
+
+.el-scrollbar {
+  height: 100%;
+}
+
+.box .el-scrollbar__wrap {
+  overflow: scroll;
+}
+</style>

--
Gitblit v1.9.3