From b8cae8bc0cf10a9807e34c8ffc0b61e747f41073 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 13 Jul 2021 20:43:19 +0800
Subject: [PATCH] 通知公告修改,保安员修改

---
 src/views/securityGuard/securityGuard.vue | 1665 ++++++++++++++++++++++++++++++----------------------------
 1 files changed, 865 insertions(+), 800 deletions(-)

diff --git a/src/views/securityGuard/securityGuard.vue b/src/views/securityGuard/securityGuard.vue
index 94256a5..4c85429 100644
--- a/src/views/securityGuard/securityGuard.vue
+++ b/src/views/securityGuard/securityGuard.vue
@@ -1,105 +1,107 @@
 <template>
   <el-row>
-      <el-col :span="0" style="display: none">
-        <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">
+    <el-col :span="0" style="display: none">
+      <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"
-                   @row-click="rowClick"
-                   :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">
+        <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"
+          @row-click="rowClick"
+          :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"
-                style="display: none"
-                size="small"
-                plain
-                icon="el-icon-delete"
-                v-if="permission.user_delete"
-                @click="handleDelete"
-                >注 销
-              </el-button>
-              <el-button
-                type="info"
-                style="display: none"
-                size="small"
-                plain
-                v-if="permission.user_role"
-                icon="el-icon-user"
-                @click="handleGrant"
-                >角色配置
-              </el-button>
-              <el-button
-                type="info"
-                style="display: none"
-                size="small"
-                plain
-                v-if="permission.user_reset"
-                icon="el-icon-refresh"
-                @click="handleReset"
-                >密码重置
-              </el-button>
-              <el-button
-                type="info"
-                style="display: none"
-                size="small"
-                plain
-                v-if="userInfo.role_name.includes('admin')"
-                icon="el-icon-setting"
-                @click="handlePlatform"
-                >平台配置
-              </el-button>
-              <el-button
-                type="success"
-                style="display: none"
-                size="small"
-                plain
-                v-if="userInfo.role_name.includes('admin')"
-                icon="el-icon-upload2"
-                @click="handleImport"
-                >导入
-              </el-button>
-              <el-button
-                type="warning"
-                style="display: none"
-                size="small"
-                plain
-                v-if="userInfo.role_name.includes('admin')"
-                icon="el-icon-download"
-                @click="handleExport"
-                >导出
-              </el-button>
-            </template>
+            <el-button
+              type="danger"
+              style="display: none"
+              size="small"
+              plain
+              icon="el-icon-delete"
+              v-if="permission.user_delete"
+              @click="handleDelete"
+              >注 销
+            </el-button>
+            <el-button
+              type="info"
+              style="display: none"
+              size="small"
+              plain
+              v-if="permission.user_role"
+              icon="el-icon-user"
+              @click="handleGrant"
+              >角色配置
+            </el-button>
+            <el-button
+              type="info"
+              style="display: none"
+              size="small"
+              plain
+              v-if="permission.user_reset"
+              icon="el-icon-refresh"
+              @click="handleReset"
+              >密码重置
+            </el-button>
+            <el-button
+              type="info"
+              style="display: none"
+              size="small"
+              plain
+              v-if="userInfo.role_name.includes('admin')"
+              icon="el-icon-setting"
+              @click="handlePlatform"
+              >平台配置
+            </el-button>
+            <el-button
+              type="success"
+              style="display: none"
+              size="small"
+              plain
+              v-if="userInfo.role_name.includes('admin')"
+              icon="el-icon-upload2"
+              @click="handleImport"
+              >导入
+            </el-button>
+            <el-button
+              type="warning"
+              style="display: none"
+              size="small"
+              plain
+              v-if="userInfo.role_name.includes('admin')"
+              icon="el-icon-download"
+              @click="handleExport"
+              >导出
+            </el-button>
+          </template>
 
-            <template slot-scope="{ type, size, row }" slot="menu">
-              <!-- <el-button
+          <template slot-scope="{ type, size, row }" slot="menu">
+            <!-- <el-button
                 style="display:none"
                 icon="el-icon-edit"
                 :size="size"
@@ -107,58 +109,67 @@
                 @click.stop="addOrUpdateHandle(row.id)"
                 >修改
               </el-button> -->
-              <el-button
-                icon="el-icon-edit"
-                :size="size"
-                :type="type"
-                @click.stop="rowDel(row)"
-                >离职登记
-              </el-button>
-            </template>
-            
-          <template slot-scope="{row}"
-                    slot="tenantName">
-            <el-tag>{{row.tenantName}}</el-tag>
+            <el-button
+              icon="el-icon-edit"
+              :size="size"
+              :type="type"
+              @click.stop="rowDel(row)"
+              >离职登记
+            </el-button>
           </template>
-          <template slot-scope="{row}"
-                    slot="roleName">
-            <el-tag>{{row.roleName}}</el-tag>
+
+          <template slot-scope="{ row }" slot="sex">
+            <el-tag v-if="row.sex == 1">男</el-tag>
+            <el-tag v-if="row.sex == 2">女</el-tag>
           </template>
-          <template slot-scope="{row}"
-                    slot="deptName">
-            <el-tag>{{row.deptName}}</el-tag>
+
+          <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 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-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>
+            <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">
+        <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>
@@ -166,32 +177,34 @@
             </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>
+        <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 slot-scope="{ row }" slot="userTypeName">
+              <el-tag>{{ row.userTypeName }}</el-tag>
             </template>
           </avue-crud>
         </el-dialog>
@@ -201,118 +214,120 @@
 </template>
 
 <script>
-  import {
-    getList,
-    getUser,
-    getUserPlatform,
-    remove,
-    update,
-    updatePlatform,
-    add,
-    grant,
-    resetPassword,
-    getUserPractitionersInfo,
-    saveOrUpdateUserPractitionersInfo
-  } from "@/api/system/user";
-  import {getDeptTree, getDeptLazyTree} from "@/api/system/dept";
-  import {getRoleTree} from "@/api/system/role";
-  import {getPostList} from "@/api/system/post";
-  import {mapGetters} from "vuex";
-  import website from '@/config/website';
-  import {getToken} from '@/util/auth';
-  import { securityFormPageColumn, securityBaseInfoColumns } from "./data";
+import {
+  getUser,
+  getUserPlatform,
+  remove,
+  update,
+  updatePlatform,
+  add,
+  grant,
+  resetPassword,
+  getUserPractitionersInfo,
+  saveOrUpdateUserPractitionersInfo,
+} from "@/api/system/user";
+import { getList } from "@/api/securityGuard/securityGuard";
+import { getDeptTree, getDeptLazyTree } from "@/api/system/dept";
+import { getRoleTree } from "@/api/system/role";
+import { getPostList } from "@/api/system/post";
+import { mapGetters } from "vuex";
+import website from "@/config/website";
+import { getToken } from "@/util/auth";
+import { securityFormPageColumn } from "./data";
 
-  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 => {
+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'
-          }
+                  leaf: !item.hasChildren,
+                };
+              })
+            );
+          });
         },
-        option: {
-          height: 'auto',
-          calcHeight: 80,
-          tip: false,
-          searchShow: true,
-          searchMenuSpan: 6,
-          border: false,
-          stripe: true,
-          index: true,
-          delBtnText: "注销",
-          selection: true,
-          viewBtn: true,
-          //dialogType: 'drawer',
-          dialogClickModal: false,
-          column: securityFormPageColumn,
-          group: [
+        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: false,
+        stripe: true,
+        index: true,
+        delBtnText: "注销",
+        selection: true,
+        viewBtn: true,
+        //dialogType: 'drawer',
+        dialogClickModal: false,
+        column: securityFormPageColumn,
+        group: [
           {
             label: "基础信息",
             labelWidth: "110",
@@ -336,7 +351,7 @@
                     required: true,
                     message: "请选择组织机构",
                     trigger: "blur",
-                  }
+                  },
                 ],
               },
               {
@@ -347,25 +362,30 @@
                     required: true,
                     message: "请输入登录账号",
                     trigger: "blur",
-                  }
+                  },
                 ],
                 // disabled: true,
-              },{
-                  label: '密码',
-                  prop: 'password',
-                  hide: true,
-                  editDisplay: false,
-                  viewDisplay: false,
-                  rules: [{required: true, validator: validatePass, trigger: 'blur'}]
-                },
-                {
-                  label: '确认密码',
-                  prop: 'password2',
-                  hide: true,
-                  editDisplay: false,
-                  viewDisplay: false,
-                  rules: [{required: true, validator: validatePass2, trigger: 'blur'}]
-                },
+              },
+              {
+                label: "密码",
+                prop: "password",
+                hide: true,
+                editDisplay: false,
+                viewDisplay: false,
+                rules: [
+                  { required: true, validator: validatePass, trigger: "blur" },
+                ],
+              },
+              {
+                label: "确认密码",
+                prop: "password2",
+                hide: true,
+                editDisplay: false,
+                viewDisplay: false,
+                rules: [
+                  { required: true, validator: validatePass2, trigger: "blur" },
+                ],
+              },
               {
                 label: "用户姓名",
                 prop: "realName",
@@ -389,7 +409,8 @@
               {
                 label: "用户昵称",
                 prop: "name",
-              }, {
+              },
+              {
                 label: "所属行政区",
                 prop: "jurisdiction",
                 // multiple: true,
@@ -408,7 +429,8 @@
                     trigger: "click",
                   },
                 ],
-              },{
+              },
+              {
                 label: "所属角色",
                 prop: "roleId",
                 multiple: true,
@@ -421,12 +443,13 @@
                 slot: true,
                 rules: [
                   {
-                    required: false,
+                    required: true,
                     message: "请选择所属角色",
                     trigger: "click",
                   },
                 ],
-              },{
+              },
+              {
                 label: "所属岗位",
                 prop: "postId",
                 type: "tree",
@@ -492,7 +515,7 @@
                   value: "dictKey",
                 },
                 dataType: "number",
-                slot: true
+                slot: true,
               },
               {
                 label: "政治面貌",
@@ -521,6 +544,7 @@
                 label: "用户性别",
                 prop: "sex",
                 type: "select",
+                slot: true,
                 dicData: [
                   {
                     label: "男",
@@ -530,10 +554,10 @@
                     label: "女",
                     value: 2,
                   },
-                  {
-                    label: "未知",
-                    value: 3,
-                  },
+                  // {
+                  //   label: "未知",
+                  //   value: 3,
+                  // },
                 ],
               },
               {
@@ -622,554 +646,595 @@
             ],
           },
         ],
-        },
-        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
+      },
+      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",
             },
-            {
-              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: [{
+            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'
+                trigger: "blur",
               },
-              tip: '请上传 .xls,.xlsx 标准格式文件',
-              action: "/api/blade-user/import-user"
+            ],
+          },
+          {
+            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",
             },
-            {
-              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,
-            }
-          ]
-        }
+            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(null, false),
+        delBtn: this.vaildData(null, false),
+        editBtn: this.vaildData(this.permission.user_edit, false),
       };
     },
-    watch: {
-      'form.tenantId'() {
-        if (this.form.tenantId !== '' && this.initFlag) {
-          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}`;
-        }
-      }
+    platformPermissionList() {
+      return {
+        addBtn: false,
+        viewBtn: false,
+        delBtn: false,
+        editBtn: this.vaildData(this.permission.user_edit, false),
+      };
     },
-    computed: {
-      ...mapGetters(["userInfo", "permission"]),
-      permissionList() {
-        return {
-          addBtn: this.vaildData(this.permission.user_add, false),
-          viewBtn: this.vaildData(null, false),
-          delBtn: this.vaildData(null, false),
-          editBtn: this.vaildData(this.permission.user_edit, false),
-        };
-      },
-      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);
+    ids() {
+      let ids = [];
+      this.selectionList.forEach((ele) => {
+        ids.push(ele.id);
+      });
+      return ids.join(",");
+    },
+  },
+  mounted() {
+    // 非保安单位模式默认加载管理组数据
+    if (!website.tenantMode) {
+      this.initData(website.tenantId);
+    }
+  },
+  methods: {
+    //行点击事件
+    rowClick(row) {
+      this.$router.push({
+        path: "/securityGuardDetail",
+        query: { row: JSON.stringify(row) },
+      });
+    },
+    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: "操作成功!",
         });
-        return ids.join(",");
-      },
-    },
-    mounted() {
-      // 非保安单位模式默认加载管理组数据
-      if (!website.tenantMode) {
-        this.initData(website.tenantId);
-      }
-    },
-    methods: {
-      //行点击事件
-      rowClick(row) {
-        this.$router.push({
-          path: "/securityGuard/securityGuardDetail",
-          query: { row: row },
-        });
-      },
-      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) {
-        debugger;
-        if(row.deptId){
-            row.deptId = row.deptId;
-        }
-        if(row.roleId){
-            row.roleId = row.roleId.join(",");
-        }
-        if(row.postId){
-            row.postId = row.postId.join(",");
-        }
-        const userPractitionersList = [];
-        var userPractitionersInfo = row.UserPractitionersInfo;
-        if (userPractitionersInfo.length > 0) {
-          userPractitionersInfo.forEach((item) => {
-            const info = {
-              companyname: item.companyname,
-              department: item.department,
-              departureTime: item.departureTime,
-              entryTime: item.entryTime,
-              name: row.realName,
-              leaving: item.leaving,
-              cardid: row.cardid,
-              post: item.post,
-              responsibilities: item.responsibilities,
-            };
-            userPractitionersList.push(info);
-          });
-        }
-        var IdCardNo = row.cardid;
-        add(row).then(
-          () => {
-            const experience = {
-              cardid: IdCardNo,
-              userPractitionersInfo: userPractitionersList,
-            };
-            //新增从业信息
-            saveOrUpdateUserPractitionersInfo(experience).then(() => {
-              this.$message({
-                type: "success",
-                message: "操作成功!",
-              });
-            });
-            this.initFlag = false;
-            this.onLoad(this.page);
-            // this.$message({
-            //   type: "success",
-            //   message: "操作成功!",
-            // });
-            done();
-          },
-          (error) => {
-            window.console.log(error);
-            loading();
-          }
-        );
-      },
-      rowUpdate(row, index, done, loading) {
+      });
+    },
+    rowSave(row, done, loading) {
+      if (row.deptId) {
         row.deptId = row.deptId;
+      }
+      if (row.roleId) {
         row.roleId = row.roleId.join(",");
+      }
+      if (row.postId) {
         row.postId = row.postId.join(",");
-        const userPractitionersList = [];
-        var userPractitionersInfo = row.UserPractitionersInfo;
-        if (userPractitionersInfo.length > 0) {
-          userPractitionersInfo.forEach((item) => {
-            const info = {
-              companyname: item.companyname,
-              department: item.department,
-              departureTime: item.departureTime,
-              entryTime: item.entryTime,
-              name: row.realName,
-              leaving: item.leaving,
-              cardid: row.cardid,
-              post: item.post,
-              responsibilities: item.responsibilities,
-            };
-            userPractitionersList.push(info);
-          });
-        }
-        var IdCardNo = row.cardid;
-        update(row).then(
-          () => {
-            const experience = {
-              cardid: IdCardNo,
-              userPractitionersInfo: userPractitionersList,
-            };
-            //更新从业信息
-            saveOrUpdateUserPractitionersInfo(experience).then(() => {
-              this.$message({
-                type: "success",
-                message: "操作成功!",
-              });
-            });
-            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(() => {
-            row.status = "0";
-            return update(row);
-          })
-          .then(() => {
-            this.onLoad(this.page);
+      }
+      const userPractitionersList = [];
+      var userPractitionersInfo = row.UserPractitionersInfo;
+      if (userPractitionersInfo.length > 0) {
+        userPractitionersInfo.forEach((item) => {
+          const info = {
+            companyname: item.companyname,
+            department: item.department,
+            departureTime: item.departureTime,
+            entryTime: item.entryTime,
+            name: row.realName,
+            leaving: item.leaving,
+            cardid: row.cardid,
+            post: item.post,
+            responsibilities: item.responsibilities,
+          };
+          userPractitionersList.push(info);
+        });
+      }
+      var IdCardNo = row.cardid;
+      add(row).then(
+        () => {
+          const experience = {
+            cardid: IdCardNo,
+            userPractitionersInfo: userPractitionersList,
+          };
+          //新增从业信息
+          saveOrUpdateUserPractitionersInfo(experience).then(() => {
             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.initFlag = false;
+          this.onLoad(this.page);
+          // this.$message({
+          //   type: "success",
+          //   message: "操作成功!",
+          // });
+          done();
+        },
+        (error) => {
+          window.console.log(error);
+          loading();
         }
-        this.$confirm("确定将选择用户注销?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            return remove(this.ids);
-          })
-          .then(() => {
-            this.onLoad(this.page);
+      );
+    },
+    rowUpdate(row, index, done, loading) {
+      row.deptId = row.deptId;
+      row.roleId = row.roleId.join(",");
+      row.postId = row.postId.join(",");
+      const userPractitionersList = [];
+      var userPractitionersInfo = row.UserPractitionersInfo;
+      if (userPractitionersInfo.length > 0) {
+        userPractitionersInfo.forEach((item) => {
+          const info = {
+            companyname: item.companyname,
+            department: item.department,
+            departureTime: item.departureTime,
+            entryTime: item.entryTime,
+            name: row.realName,
+            leaving: item.leaving,
+            cardid: row.cardid,
+            post: item.post,
+            responsibilities: item.responsibilities,
+          };
+          userPractitionersList.push(info);
+        });
+      }
+      var IdCardNo = row.cardid;
+      //值替换,education 放在页面会卡死
+      row.education = row.education1;
+      update(row).then(
+        () => {
+          const experience = {
+            cardid: IdCardNo,
+            userPractitionersInfo: userPractitionersList,
+          };
+          //更新从业信息
+          saveOrUpdateUserPractitionersInfo(experience).then(() => {
             this.$message({
               type: "success",
-              message: "操作成功!"
+              message: "操作成功!",
             });
-            this.$refs.crud.toggleSelection();
           });
-      },
-      handleReset() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
+          this.initFlag = false;
+          this.onLoad(this.page);
+          // this.$message({
+          //   type: "success",
+          //   message: "操作成功!",
+          // });
+          done();
+        },
+        (error) => {
+          window.console.log(error);
+          loading();
         }
-        this.$confirm("确定将选择账号密码重置为123456?", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
+      );
+    },
+    rowDel(row) {
+      this.$confirm("确定将选择用户登记离职?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          row.status = "0";
+          return update(row);
         })
-          .then(() => {
-            return resetPassword(this.ids);
-          })
-          .then(() => {
-            this.$message({
-              type: "success",
-              message: "操作成功!"
-            });
-            this.$refs.crud.toggleSelection();
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!",
           });
-      },
-      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) {
-        var that = this;
-        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(",");
-            }
-            var userInfo = res.data.data;
-            //获取用户从业信息
-            getUserPractitionersInfo(userInfo.cardid).then((res1) => {
-              that.form.UserPractitionersInfo = res1.data.data;
-            });
+    },
+    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.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 => {
+          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) {
+      var that = this;
+      if (["edit", "view"].includes(type)) {
+        getUser(this.form.id).then((res) => {
+          this.form = res.data.data;
+          var d = {
+            education1: res.data.data.education,
+          };
+          this.form = {
+            ...this.form,
+            ...d,
+          };
+          // this.from["education1"] = res.data.data.education;
+          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(",");
+          }
+          var userInfo = res.data.data;
+          //获取用户从业信息
+          getUserPractitionersInfo(userInfo.cardid).then((res1) => {
+            that.form.UserPractitionersInfo = res1.data.data;
+          });
+        });
+      }
+      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 = {}) {
+      let values = {
+        ...params,
+      };
+      values = {
+        ...params,
+        ...this.query,
+      };
+      this.loading = true;
+      getList(page.currentPage, page.pageSize, values, 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(() => {
+        }
+      );
+    },
+    platformRowUpdate(row, index, done, loading) {
+      updatePlatform(row.id, row.userType, row.userExt).then(
+        () => {
           this.platformOnLoad(this.platformPage);
           this.$message({
             type: "success",
-            message: "操作成功!"
+            message: "操作成功!",
           });
           done();
-        }, error => {
+        },
+        (error) => {
           window.console.log(error);
           loading();
-        });
-      },
-      platformBeforeOpen(done, type) {
-        if (["edit", "view"].includes(type)) {
-          getUserPlatform(this.platformForm.id).then(res => {
-            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();
+      );
+    },
+    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;
-  }
+.box {
+  height: 800px;
+}
 
-  .el-scrollbar {
-    height: 100%;
-  }
+.el-scrollbar {
+  height: 100%;
+}
 
-  .box .el-scrollbar__wrap {
-    overflow: scroll;
-  }
+.box .el-scrollbar__wrap {
+  overflow: scroll;
+}
 </style>

--
Gitblit v1.9.3