yunxi
/
mes-heli
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

【优化】去除暂不需要功能，统一用户信息

Browse Source
master
zengchenxi 10 months ago
parent d980e4e3f7
commit 2584e98055
29 changed files with 65 additions and 74 deletions
Show Stats Download Patch File Download Diff File

2
mes-ui/mes-ui-admin-vue3/src/api/crm/permission/index.ts
Unescape View File

@ -7,7 +7,7 @@ export interface PermissionVO {
bizId: number | undefined // Crm 类型数据编号
level: number | undefined // 权限级别
deptName?: string // 部门名称
nickname?: string // 用户昵称
nickname?: string // 姓名
postNames?: string[] // 岗位名称数组
createTime?: Date
}

2
mes-ui/mes-ui-admin-vue3/src/api/mall/promotion/combination/combinationRecord.ts
Unescape View File

@ -3,7 +3,7 @@ import request from '@/config/axios'
export interface CombinationRecordVO {
id: number // 拼团记录编号
activityId: number // 拼团活动编号
nickname: string // 用户昵称
nickname: string // 姓名
avatar: string // 用户头像
headId: number // 团长编号
expireTime: string // 过期时间

13
mes-ui/mes-ui-admin-vue3/src/layout/components/ToolHeader.vue
Unescape View File

@ -10,7 +10,7 @@ import { LocaleDropdown } from '@/layout/components/LocaleDropdown'
import RouterSearch from '@/components/RouterSearch/index.vue'
import { useAppStore } from '@/store/modules/app'
import { useDesign } from '@/hooks/web/useDesign'
import { ThemeSwitch } from '@/layout/components/ThemeSwitch'
const { getPrefixCls, variables } = useDesign()
const prefixCls = getPrefixCls('tool-header')
@ -65,19 +65,10 @@ export default defineComponent({
{screenfull.value ? (
<Screenfull class="custom-hover" color="var(--top-header-text-color)"></Screenfull>
) : undefined}
{search.value ? <RouterSearch isModal={false} /> : undefined}
{size.value ? (
<SizeDropdown class="custom-hover" color="var(--top-header-text-color)"></SizeDropdown>
) : undefined}
{locale.value ? (
<LocaleDropdown
class="custom-hover"
color="var(--top-header-text-color)"
></LocaleDropdown>
) : undefined}
{message.value ? (
<Message class="custom-hover" color="var(--top-header-text-color)"></Message>
) : undefined}
<ThemeSwitch />
<UserInfo></UserInfo>
</div>
</div>

4
mes-ui/mes-ui-admin-vue3/src/layout/components/UserInfo/src/UserInfo.vue
Unescape View File

@ -64,10 +64,10 @@ const toDocument = () => {
<Icon icon="ep:tools" />
<div @click="toProfile">{{ t('common.profile') }}</div>
</ElDropdownItem>
<ElDropdownItem>
<!-- <ElDropdownItem>
<Icon icon="ep:menu" />
<div @click="toDocument">{{ t('common.document') }}</div>
</ElDropdownItem>
</ElDropdownItem>-->
<ElDropdownItem divided @click="loginOut">
<Icon icon="ep:switch-button" />
<div>{{ t('common.loginOut') }}</div>

6
mes-ui/mes-ui-admin-vue3/src/locales/zh-CN.ts
Unescape View File

@ -388,8 +388,8 @@ export default {
profile: {
user: {
title: '个人信息',
username: '用户名称',
nickname: '用户昵称',
username: '工号',
nickname: '姓名',
mobile: '手机号码',
email: '用户邮箱',
dept: '所属部门',
@ -407,7 +407,7 @@ export default {
userSocial: '社交信息'
},
rules: {
nickname: '请输入用户昵称',
nickname: '请输入姓名',
mail: '请输入邮箱地址',
truemail: '请输入正确的邮箱地址',
phone: '请输入正确的手机号码',

12
mes-ui/mes-ui-admin-vue3/src/views/Home/Index.vue
Unescape View File

@ -10,13 +10,13 @@
<div class="text-20px">
{{ t('workplace.welcome') }} {{ username }} {{ t('workplace.happyDay') }}
</div>
<div class="mt-10px text-14px text-gray-500">
<!-- <div class="mt-10px text-14px text-gray-500">
{{ t('workplace.toady') }}，20℃ - 32℃！
</div>
</div>-->
</div>
</div>
</el-col>
<el-col :xl="12" :lg="12" :md="12" :sm="24" :xs="24">
<!-- <el-col :xl="12" :lg="12" :md="12" :sm="24" :xs="24">
<div class="h-70px flex items-center justify-end lt-sm:mt-10px">
<div class="px-8px text-right">
<div class="mb-20px text-14px text-gray-400">{{ t('workplace.project') }}</div>
@ -48,13 +48,13 @@
/>
</div>
</div>
</el-col>
</el-col>-->
</el-row>
</el-skeleton>
</el-card>
</div>
<el-row class="mt-5px" :gutter="20" justify="space-between">
<!-- <el-row class="mt-5px" :gutter="20" justify="space-between">
<el-col :xl="16" :lg="16" :md="24" :sm="24" :xs="24" class="mb-10px">
<el-card shadow="never">
<template #header>
@ -158,7 +158,7 @@
</el-skeleton>
</el-card>
</el-col>
</el-row>
</el-row>-->
</template>
<script lang="ts" setup>
import { set } from 'lodash-es'

2
mes-ui/mes-ui-admin-vue3/src/views/Login/Login.vue
Unescape View File

@ -38,7 +38,7 @@
</div>
<div class="flex items-center justify-end space-x-10px">
<ThemeSwitch />
<LocaleDropdown class="dark:text-white lt-xl:text-white" />
<!-- <LocaleDropdown class="dark:text-white lt-xl:text-white" />-->
</div>
</div>
<!-- 右边的登录界面 -->

4
mes-ui/mes-ui-admin-vue3/src/views/Profile/Index.vue
Unescape View File

@ -22,9 +22,9 @@
<el-tab-pane :label="t('profile.info.resetPwd')" name="resetPwd">
<ResetPwd />
</el-tab-pane>
<el-tab-pane :label="t('profile.info.userSocial')" name="userSocial">
<!-- <el-tab-pane :label="t('profile.info.userSocial')" name="userSocial">
<UserSocial v-model:activeName="activeName" />
</el-tab-pane>
</el-tab-pane>-->
</el-tabs>
</div>
</el-card>

4
mes-ui/mes-ui-admin-vue3/src/views/heli/employee/UserAssignRoleForm.vue
Unescape View File

@ -1,10 +1,10 @@
<template>
<Dialog v-model="dialogVisible" title="分配角色">
<el-form ref="formRef" v-loading="formLoading" :model="formData" label-width="80px">
<el-form-item label="用户名称">
<el-form-item label="工号">
<el-input v-model="formData.username" :disabled="true" />
</el-form-item>
<el-form-item label="用户昵称">
<el-form-item label="姓名">
<el-input v-model="formData.nickname" :disabled="true" />
</el-form-item>
<el-form-item label="角色">

6
mes-ui/mes-ui-admin-vue3/src/views/mall/product/comment/CommentForm.vue
Unescape View File

@ -23,8 +23,8 @@
<el-form-item label="用户头像" prop="userAvatar">
<UploadImg v-model="formData.userAvatar" height="60px" width="60px" />
</el-form-item>
<el-form-item label="用户名称" prop="userNickname">
<el-input v-model="formData.userNickname" placeholder="请输入用户名称" />
<el-form-item label="工号" prop="userNickname">
<el-input v-model="formData.userNickname" placeholder="请输入工号" />
</el-form-item>
<el-form-item label="评论内容" prop="content">
<el-input type="textarea" v-model="formData.content" />
@ -75,7 +75,7 @@ const formRules = reactive({
spuId: [{ required: true, message: '商品不能为空', trigger: 'blur' }],
skuId: [{ required: true, message: '规格不能为空', trigger: 'blur' }],
userAvatar: [{ required: true, message: '用户头像不能为空', trigger: 'blur' }],
userNickname: [{ required: true, message: '用户名称不能为空', trigger: 'blur' }],
userNickname: [{ required: true, message: '工号不能为空', trigger: 'blur' }],
content: [{ required: true, message: '评论内容不能为空', trigger: 'blur' }],
descriptionScores: [{ required: true, message: '描述星级不能为空', trigger: 'blur' }],
benefitScores: [{ required: true, message: '服务星级不能为空', trigger: 'blur' }]

6
mes-ui/mes-ui-admin-vue3/src/views/mall/product/comment/index.vue
Unescape View File

@ -17,8 +17,8 @@
<el-form-item label="商品名称" prop="spuName">
<el-input v-model="queryParams.spuName" placeholder="请输入商品名称" />
</el-form-item>
<el-form-item label="用户名称" prop="userNickname">
<el-input v-model="queryParams.userNickname" placeholder="请输入用户名称" />
<el-form-item label="工号" prop="userNickname">
<el-input v-model="queryParams.userNickname" placeholder="请输入工号" />
</el-form-item>
<el-form-item label="订单编号" prop="orderId">
<el-input v-model="queryParams.orderId" placeholder="请输入订单编号" />
@ -81,7 +81,7 @@
</div>
</template>
</el-table-column>
<el-table-column label="用户名称" align="center" prop="userNickname" width="100" />
<el-table-column label="工号" align="center" prop="userNickname" width="100" />
<el-table-column label="商品评分" align="center" prop="descriptionScores" width="90" />
<el-table-column label="服务评分" align="center" prop="benefitScores" width="90" />
<el-table-column label="评论内容" align="center" prop="content" min-width="210">

2
mes-ui/mes-ui-admin-vue3/src/views/mall/promotion/bargain/record/BargainRecordListDialog.vue
Unescape View File

@ -9,7 +9,7 @@
<el-avatar :src="scope.row.avatar" />
</template>
</el-table-column>
<el-table-column label="用户昵称" prop="nickname" min-width="100px" />
<el-table-column label="姓名" prop="nickname" min-width="100px" />
<el-table-column
label="砍价金额"
prop="reducePrice"

2
mes-ui/mes-ui-admin-vue3/src/views/mall/trade/delivery/pickUpOrder/index.vue
Unescape View File

@ -248,7 +248,7 @@ const summary = ref<TradeOrderSummaryRespVO>()
const dynamicSearchList = ref([
{ value: 'no', label: '订单号' },
{ value: 'userId', label: '用户UID' },
{ value: 'userNickname', label: '用户昵称' },
{ value: 'userNickname', label: '姓名' },
{ value: 'userMobile', label: '用户电话' }
])
/**

2
mes-ui/mes-ui-admin-vue3/src/views/mall/trade/order/index.vue
Unescape View File

@ -261,7 +261,7 @@ const queryType = reactive({ queryParam: '' }) // 订单搜索类型 queryParam
const dynamicSearchList = ref([
{ value: 'no', label: '订单号' },
{ value: 'userId', label: '用户UID' },
{ value: 'userNickname', label: '用户昵称' },
{ value: 'userNickname', label: '姓名' },
{ value: 'userMobile', label: '用户电话' }
])
/**

2
mes-ui/mes-ui-admin-vue3/src/views/member/point/record/index.vue
Unescape View File

@ -11,7 +11,7 @@
<el-form-item label="用户" prop="nickname">
<el-input
v-model="queryParams.nickname"
placeholder="请输入用户昵称"
placeholder="请输入姓名"
clearable
@keyup.enter="handleQuery"
class="!w-240px"

4
mes-ui/mes-ui-admin-vue3/src/views/member/user/UserForm.vue
Unescape View File

@ -21,8 +21,8 @@
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="用户昵称" prop="nickname">
<el-input v-model="formData.nickname" placeholder="请输入用户昵称" />
<el-form-item label="姓名" prop="nickname">
<el-input v-model="formData.nickname" placeholder="请输入姓名" />
</el-form-item>
<el-form-item label="头像" prop="avatar">
<UploadImg v-model="formData.avatar" :limit="1" :is-show-tip="false" />

6
mes-ui/mes-ui-admin-vue3/src/views/member/user/UserLevelUpdateForm.vue
Unescape View File

@ -8,12 +8,12 @@
v-loading="formLoading"
>
<el-form-item label="用户编号" prop="id">
<el-input v-model="formData.id" placeholder="请输入用户昵称" class="!w-240px" disabled />
<el-input v-model="formData.id" placeholder="请输入姓名" class="!w-240px" disabled />
</el-form-item>
<el-form-item label="用户昵称" prop="nickname">
<el-form-item label="姓名" prop="nickname">
<el-input
v-model="formData.nickname"
placeholder="请输入用户昵称"
placeholder="请输入姓名"
class="!w-240px"
disabled
/>

2
mes-ui/mes-ui-admin-vue3/src/views/member/user/UserPointUpdateForm.vue
Unescape View File

@ -10,7 +10,7 @@
<el-form-item label="用户编号" prop="id">
<el-input v-model="formData.id" class="!w-240px" disabled />
</el-form-item>
<el-form-item label="用户昵称" prop="nickname">
<el-form-item label="姓名" prop="nickname">
<el-input v-model="formData.nickname" class="!w-240px" disabled />
</el-form-item>
<el-form-item label="变动前积分" prop="point">

2
mes-ui/mes-ui-admin-vue3/src/views/member/user/detail/UserOrderList.vue
Unescape View File

@ -223,7 +223,7 @@ const queryType = reactive({ queryParam: '' }) // 订单搜索类型 queryParam
// 订单聚合搜索 select 类型配置（动态搜索）
const dynamicSearchList = ref([
{ value: 'no', label: '订单号' },
{ value: 'userNickname', label: '用户昵称' },
{ value: 'userNickname', label: '姓名' },
{ value: 'userMobile', label: '用户电话' }
])
/**

4
mes-ui/mes-ui-admin-vue3/src/views/member/user/index.vue
Unescape View File

@ -8,12 +8,12 @@
class="-mb-15px"
label-width="68px"
>
<el-form-item label="用户昵称" prop="nickname">
<el-form-item label="姓名" prop="nickname">
<el-input
v-model="queryParams.nickname"
class="!w-240px"
clearable
placeholder="请输入用户昵称"
placeholder="请输入姓名"
@keyup.enter="handleQuery"
/>
</el-form-item>

6
mes-ui/mes-ui-admin-vue3/src/views/pay/wallet/balance/index.vue
Unescape View File

@ -8,10 +8,10 @@
:inline="true"
label-width="68px"
>
<el-form-item label="用户昵称" prop="nickname">
<el-form-item label="姓名" prop="nickname">
<el-input
v-model="queryParams.nickname"
placeholder="请输入用户昵称"
placeholder="请输入姓名"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
@ -39,7 +39,7 @@
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="编号" align="center" prop="id" />
<el-table-column label="用户昵称" align="center" prop="nickname" />
<el-table-column label="姓名" align="center" prop="nickname" />
<el-table-column label="头像" align="center" prop="avatar" width="80px">
<template #default="scope">
<img :src="scope.row.avatar" style="width: 40px" />

2
mes-ui/mes-ui-admin-vue3/src/views/system/loginlog/LoginLogDetail.vue
Unescape View File

@ -7,7 +7,7 @@
<el-descriptions-item label="操作类型">
<dict-tag :type="DICT_TYPE.SYSTEM_LOGIN_TYPE" :value="detailData.logType" />
</el-descriptions-item>
<el-descriptions-item label="用户名称">
<el-descriptions-item label="工号">
{{ detailData.username }}
</el-descriptions-item>
<el-descriptions-item label="登录地址">

6
mes-ui/mes-ui-admin-vue3/src/views/system/loginlog/index.vue
Unescape View File

@ -10,10 +10,10 @@
:inline="true"
label-width="68px"
>
<el-form-item label="用户名称" prop="username">
<el-form-item label="工号" prop="username">
<el-input
v-model="queryParams.username"
placeholder="请输入用户名称"
placeholder="请输入工号"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
@ -64,7 +64,7 @@
<dict-tag :type="DICT_TYPE.SYSTEM_LOGIN_TYPE" :value="scope.row.logType" />
</template>
</el-table-column>
<el-table-column label="用户名称" align="center" prop="username" width="180" />
<el-table-column label="工号" align="center" prop="username" width="180" />
<el-table-column label="登录地址" align="center" prop="userIp" width="180" />
<el-table-column label="浏览器" align="center" prop="userAgent" />
<el-table-column label="登陆结果" align="center" prop="result">

2
mes-ui/mes-ui-admin-vue3/src/views/system/social/user/SocialUserDetail.vue
Unescape View File

@ -4,7 +4,7 @@
<el-descriptions-item label="社交平台" min-width="160">
<dict-tag :type="DICT_TYPE.SYSTEM_SOCIAL_TYPE" :value="detailData.type" />
</el-descriptions-item>
<el-descriptions-item label="用户昵称" min-width="120">
<el-descriptions-item label="姓名" min-width="120">
{{ detailData.nickname }}
</el-descriptions-item>
<el-descriptions label="用户头像" min-width="120">

6
mes-ui/mes-ui-admin-vue3/src/views/system/social/user/index.vue
Unescape View File

@ -25,12 +25,12 @@
/>
</el-select>
</el-form-item>
<el-form-item label="用户昵称" prop="nickname">
<el-form-item label="姓名" prop="nickname">
<el-input
v-model="queryParams.nickname"
class="!w-240px"
clearable
placeholder="请输入用户昵称"
placeholder="请输入姓名"
@keyup.enter="handleQuery"
/>
</el-form-item>
@ -76,7 +76,7 @@
</template>
</el-table-column>
<el-table-column align="center" label="社交 openid" prop="openid" />
<el-table-column align="center" label="用户昵称" prop="nickname" />
<el-table-column align="center" label="姓名" prop="nickname" />
<el-table-column align="center" label="用户头像" prop="avatar">
<template #default="{ row }">
<el-image :src="row.avatar" class="h-30px w-30px" @click="imagePreview(row.avatar)" />

6
mes-ui/mes-ui-admin-vue3/src/views/system/tenant/TenantForm.vue
Unescape View File

@ -26,8 +26,8 @@
<el-form-item label="联系手机" prop="contactMobile">
<el-input v-model="formData.contactMobile" placeholder="请输入联系手机" />
</el-form-item>
<el-form-item v-if="formData.id === undefined" label="用户名称" prop="username">
<el-input v-model="formData.username" placeholder="请输入用户名称" />
<el-form-item v-if="formData.id === undefined" label="工号" prop="username">
<el-input v-model="formData.username" placeholder="请输入工号" />
</el-form-item>
<el-form-item v-if="formData.id === undefined" label="用户密码" prop="password">
<el-input
@ -111,7 +111,7 @@ const formRules = reactive({
accountCount: [{ required: true, message: '账号额度不能为空', trigger: 'blur' }],
expireTime: [{ required: true, message: '过期时间不能为空', trigger: 'blur' }],
website: [{ required: true, message: '绑定域名不能为空', trigger: 'blur' }],
username: [{ required: true, message: '用户名称不能为空', trigger: 'blur' }],
username: [{ required: true, message: '工号不能为空', trigger: 'blur' }],
password: [{ required: true, message: '用户密码不能为空', trigger: 'blur' }]
})
const formRef = ref() // 表单 Ref

4
mes-ui/mes-ui-admin-vue3/src/views/system/user/UserAssignRoleForm.vue
Unescape View File

@ -1,10 +1,10 @@
<template>
<Dialog v-model="dialogVisible" title="分配角色">
<el-form ref="formRef" v-loading="formLoading" :model="formData" label-width="80px">
<el-form-item label="用户名称">
<el-form-item label="工号">
<el-input v-model="formData.username" :disabled="true" />
</el-form-item>
<el-form-item label="用户昵称">
<el-form-item label="姓名">
<el-input v-model="formData.nickname" :disabled="true" />
</el-form-item>
<el-form-item label="角色">

12
mes-ui/mes-ui-admin-vue3/src/views/system/user/UserForm.vue
Unescape View File

@ -9,8 +9,8 @@
>
<el-row>
<el-col :span="12">
<el-form-item label="用户昵称" prop="nickname">
<el-input v-model="formData.nickname" placeholder="请输入用户昵称" />
<el-form-item label="姓名" prop="nickname">
<el-input v-model="formData.nickname" placeholder="请输入姓名" />
</el-form-item>
</el-col>
<el-col :span="12">
@ -40,8 +40,8 @@
</el-row>
<el-row>
<el-col :span="12">
<el-form-item v-if="formData.id === undefined" label="用户名称" prop="username">
<el-input v-model="formData.username" placeholder="请输入用户名称" />
<el-form-item v-if="formData.id === undefined" label="工号" prop="username">
<el-input v-model="formData.username" placeholder="请输入工号" />
</el-form-item>
</el-col>
<el-col :span="12">
@ -128,8 +128,8 @@ const formData = ref({
roleIds: []
})
const formRules = reactive<FormRules>({
username: [{ required: true, message: '用户名称不能为空', trigger: 'blur' }],
nickname: [{ required: true, message: '用户昵称不能为空', trigger: 'blur' }],
username: [{ required: true, message: '工号不能为空', trigger: 'blur' }],
nickname: [{ required: true, message: '姓名不能为空', trigger: 'blur' }],
password: [{ required: true, message: '用户密码不能为空', trigger: 'blur' }],
email: [
{

8
mes-ui/mes-ui-admin-vue3/src/views/system/user/index.vue
Unescape View File

@ -20,10 +20,10 @@
:inline="true"
label-width="68px"
>
<el-form-item label="用户名称" prop="username">
<el-form-item label="工号" prop="username">
<el-input
v-model="queryParams.username"
placeholder="请输入用户名称"
placeholder="请输入工号"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
@ -98,13 +98,13 @@
<el-table v-loading="loading" :data="list">
<el-table-column label="用户编号" align="center" key="id" prop="id" />
<el-table-column
label="用户名称"
label="工号"
align="center"
prop="username"
:show-overflow-tooltip="true"
/>
<el-table-column
label="用户昵称"
label="姓名"
align="center"
prop="nickname"
:show-overflow-tooltip="true"

Write Preview
Loading…
Cancel
Save