Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jczz_web

shuishen

2024-01-22 32a7e1f37b2637ff780d757f25fa097d215f6e11

 src/views/system/user.vue

@@ -120,17 +120,35 @@
    updatePlatform,
    add,
    grant,
    resetPassword, unlock
    resetPassword,
    unlock
} from "@/api/system/user"
import { exportBlob } from "@/api/common"
import { getDeptTree, getDeptLazyTree } from "@/api/system/dept"
import { getRoleTree } from "@/api/system/role"
import { getPostList } from "@/api/system/post"
import { mapGetters } from "vuex"
import {
    exportBlob
} from "@/api/common"
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 { downloadXls } from "@/util/util"
import { dateNow } from "@/util/date"
import {
    getToken
} from '@/util/auth'
import {
    downloadXls
} from "@/util/util"
import {
    dateNow
} from "@/util/date"
import NProgress from 'nprogress'
import 'nprogress/nprogress.css'
import func from "@/util/func"
@@ -222,8 +240,7 @@
                viewBtn: true,
                dialogType: 'drawer',
                dialogClickModal: false,
                column: [
                    {
                column: [{
                        label: "登录账号",
                        prop: "account",
                        search: true,
@@ -279,8 +296,7 @@
                    //   }]
                    // },
                ],
                group: [
                    {
                group: [{
                        label: '基础信息',
                        prop: 'baseInfo',
                        icon: 'el-icon-user-solid',
@@ -337,7 +353,11 @@
                                hide: true,
                                editDisplay: false,
                                viewDisplay: false,
                                rules: [{ required: true, validator: validatePass, trigger: 'blur' }]
                            rules: [{
                                required: true,
                                validator: validatePass,
                                trigger: 'blur'
                            }]
                            },
                            {
                                label: '确认密码',
@@ -345,7 +365,11 @@
                                hide: true,
                                editDisplay: false,
                                viewDisplay: false,
                                rules: [{ required: true, validator: validatePass2, trigger: 'blur' }]
                            rules: [{
                                required: true,
                                validator: validatePass2,
                                trigger: 'blur'
                            }]
                            },
                        ]
                    },
@@ -353,8 +377,7 @@
                        label: '详细信息',
                        prop: 'detailInfo',
                        icon: 'el-icon-s-order',
                        column: [
                            {
                    column: [{
                                label: "用户昵称",
                                prop: "name",
                                hide: true,
@@ -392,8 +415,7 @@
                                label: "用户性别",
                                prop: "sex",
                                type: "select",
                                dicData: [
                                    {
                        dicData: [{
                                        label: "男",
                                        value: 1
                                    },
@@ -505,8 +527,7 @@
                dialogClickModal: false,
                menuWidth: 120,
                editBtnText: '配置',
                column: [
                    {
                column: [{
                        label: "登录账号",
                        prop: "account",
                        search: true,
@@ -565,8 +586,7 @@
            excelOption: {
                submitBtn: false,
                emptyBtn: false,
                column: [
                    {
                column: [{
                        label: '模板上传',
                        prop: 'excelFile',
                        type: 'upload',
@@ -585,8 +605,7 @@
                        type: "switch",
                        align: "center",
                        width: 80,
                        dicData: [
                            {
                    dicData: [{
                                label: "否",
                                value: 0
                            },
@@ -597,13 +616,11 @@
                        ],
                        value: 0,
                        slot: true,
                        rules: [
                            {
                    rules: [{
                                required: true,
                                message: "请选择是否覆盖",
                                trigger: "blur"
                            }
                        ]
                    }]
                    },
                    {
                        label: '模板下载',
@@ -865,7 +882,9 @@
                type: "warning"
            }).then(() => {
                NProgress.start()
                exportBlob(`/api/blade-system/user/export-user?${this.website.tokenHeader}=${getToken()}&account=${account}&realName=${realName}`).then(res => {
                exportBlob(
                    `/api/blade-system/user/export-user?${this.website.tokenHeader}=${getToken()}&account=${account}&realName=${realName}`
                ).then(res => {
                    downloadXls(res.data, `用户数据表${dateNow()}.xlsx`)
                    NProgress.done()
                })