From 06d95e439c7a3c1221602787d423b4dba825c6cc Mon Sep 17 00:00:00 2001 From: xiaocp2009 <39615122+xiaocp2009@users.noreply.github.com> Date: Thu, 17 Jul 2025 16:11:59 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=B0=83=E6=95=B4ui=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=20
=202=E3=80=81=E8=B0=83=E6=95=B4=E6=B0=B4?= =?UTF-8?q?=E5=8D=B0=20
=203=E3=80=81=E8=B0=83=E6=95=B4=E4=BA=86?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E7=A7=9F=E6=88=B7=E7=9A=84=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=8F=8A=E6=98=BE=E7=A4=BA=EF=BC=8C=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E6=9B=B4=E6=96=B9=E4=BE=BF=E8=BF=9B=E5=85=A5=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E7=A7=9F=E6=88=B7=20
=204=E3=80=81=E5=B1=8F?= =?UTF-8?q?=E8=94=BD=E4=BA=86=E5=9B=BD=E9=99=85=E5=8C=96=E9=80=89=E9=A1=B9?= =?UTF-8?q?=20
=205=E3=80=81=E6=8C=89=E9=9C=80=E6=B1=82=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=94=A8=E6=88=B7=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=8F=B7?= =?UTF-8?q?=EF=BC=8C=E5=B9=B6=E6=A0=A1=E9=AA=8C=E5=94=AF=E4=B8=80=E6=80=A7?= =?UTF-8?q?=20
=206=E3=80=81=E6=8C=89=E9=9C=80=E6=B1=82=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=94=A8=E6=88=B7=E6=98=AF=E5=90=A6=E8=90=A5=E9=94=80?= =?UTF-8?q?=E4=BA=BA=E5=91=98=EF=BC=8C=E5=B9=B6=E6=A0=A1=E9=AA=8C=E8=90=A5?= =?UTF-8?q?=E9=94=80=E5=8F=B7=E5=94=AF=E4=B8=80=E6=80=A7=20
=207?= =?UTF-8?q?=E3=80=81=E6=8C=89=E9=9C=80=E6=B1=82=E5=A2=9E=E5=8A=A0=EF=BC=8C?= =?UTF-8?q?=E7=BB=8F=E5=8A=9E=E4=BA=BA=E5=91=98=E5=BD=95=E5=85=A5=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E5=BD=95=E5=85=A5=E7=9A=84=E8=90=A5=E9=94=80=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E4=BF=A1=E6=81=AF=E4=BD=8D=E7=B3=BB=E7=BB=9F=E6=8F=90?= =?UTF-8?q?=E4=BE=9B=E9=80=89=E6=8B=A9=EF=BC=8C=E9=98=B2=E6=AD=A2=E8=AF=AF?= =?UTF-8?q?=E5=BD=95=EF=BC=8Cdemo=E8=A7=81private-ebank-new-operate-drawer?= =?UTF-8?q?.vue=20
?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 以上，代码工具和demo表结构暂时没改，初步测试大概率无误，先不改了 --- cds-fontend-2025.V1/.env.dev | 2 +- cds-fontend-2025.V1/readme | 11 ++++ cds-fontend-2025.V1/src/App.vue | 6 +- .../components/message-button.vue | 3 +- .../layouts/modules/global-header/index.vue | 4 +- .../src/locales/langs/en-us.ts | 5 ++ .../src/locales/langs/zh-cn.ts | 23 +++++-- .../src/service/api/system/user.ts | 8 +++ cds-fontend-2025.V1/src/theme/settings.ts | 4 +- .../api/mps.private-ebank-new.api.d.ts | 27 ++++---- .../src/typings/api/system.api.d.ts | 11 +++- .../src/views/_builtin/login/index.vue | 4 +- .../_builtin/login/modules/pwd-login.vue | 20 +++--- .../src/views/home/modules/header-banner.vue | 2 +- .../src/views/mps/private-ebank-new/index.vue | 19 +++++- .../private-ebank-new-operate-drawer.vue | 59 ++++++++++++++---- .../role/modules/role-auth-user-drawer.vue | 18 ++++-- .../src/views/system/user/index.vue | 61 ++++++++++++++++--- .../user/modules/user-operate-drawer.vue | 36 ++++++++++- .../web/controller/AuthController.java | 2 +- .../controller/system/SysUserController.java | 44 ++++++++++--- .../org/dromara/system/domain/SysUser.java | 19 +++++- .../dromara/system/domain/bo/SysUserBo.java | 27 +++++++- .../system/domain/vo/SysUserExportVo.java | 27 ++++++-- .../system/domain/vo/SysUserImportVo.java | 27 ++++++-- .../dromara/system/domain/vo/SysUserVo.java | 17 +++++- .../dromara/system/mapper/SysUserMapper.java | 5 ++ .../system/service/ISysUserService.java | 20 ++++++ .../service/impl/SysTenantServiceImpl.java | 4 ++ .../service/impl/SysUserServiceImpl.java | 39 ++++++++++++ 30 files changed, 461 insertions(+), 93 deletions(-) create mode 100644 cds-fontend-2025.V1/readme diff --git a/cds-fontend-2025.V1/.env.dev b/cds-fontend-2025.V1/.env.dev index 856dd02..558f842 100644 --- a/cds-fontend-2025.V1/.env.dev +++ b/cds-fontend-2025.V1/.env.dev @@ -4,7 +4,7 @@ VITE_SERVICE_BASE_URL=http://localhost:8080 VITE_APP_BASE_API=/dev-api # watermark -VITE_WATERMARK=N +VITE_WATERMARK=Y # 是否开启 SSE 功能 VITE_APP_SSE=Y # 是否开启 websocket 功能 diff --git a/cds-fontend-2025.V1/readme b/cds-fontend-2025.V1/readme new file mode 100644 index 0000000..8065f02 --- /dev/null +++ b/cds-fontend-2025.V1/readme @@ -0,0 +1,11 @@ +--------用户信息------------ +用户登陆时,通过userInfo查询用户信息后存储在useAppStore中, +src/store/modules/auth/index.ts +src/views/mps/private-ebank-new/index.vue + +--------watermark------------ +src/App.vue + +--------watermark------------ +录入时,增加了营销人员列表 +src/views/mps/private-ebank-new/modules/private-ebank-new-operate-drawer.vue diff --git a/cds-fontend-2025.V1/src/App.vue b/cds-fontend-2025.V1/src/App.vue index ce819c3..d10d2d0 100644 --- a/cds-fontend-2025.V1/src/App.vue +++ b/cds-fontend-2025.V1/src/App.vue @@ -26,7 +26,7 @@ const naiveDateLocale = computed(() => { }); const watermarkProps = computed(() => { - const appTitle = import.meta.env.VITE_APP_TITLE || 'RuoYi-Vue-Plus'; + const appTitle = import.meta.env.VITE_APP_TITLE || '全员营销计价'; const content = themeStore.watermark.enableUserName && userInfo.user?.userName ? `${userInfo.user?.nickName}@${appTitle} ${userInfo.user?.userName}` @@ -36,9 +36,9 @@ const watermarkProps = computed(() => { cross: true, fullscreen: true, fontSize: 14, - fontColor: themeStore.darkMode ? 'rgba(200, 200, 200, 0.03)' : 'rgba(200, 200, 200, 0.2)', + fontColor: themeStore.darkMode ? 'rgb(67,61,61)' : 'rgba(28,25,25,0.2)', lineHeight: 14, - width: 200, + width: 260, height: 300, xOffset: 12, yOffset: 60, diff --git a/cds-fontend-2025.V1/src/layouts/modules/global-header/components/message-button.vue b/cds-fontend-2025.V1/src/layouts/modules/global-header/components/message-button.vue index d751d34..00b3965 100644 --- a/cds-fontend-2025.V1/src/layouts/modules/global-header/components/message-button.vue +++ b/cds-fontend-2025.V1/src/layouts/modules/global-header/components/message-button.vue @@ -84,7 +84,8 @@ const toGitee = () => { diff --git a/cds-fontend-2025.V1/src/layouts/modules/global-header/index.vue b/cds-fontend-2025.V1/src/layouts/modules/global-header/index.vue index 786047b..c5c688d 100644 --- a/cds-fontend-2025.V1/src/layouts/modules/global-header/index.vue +++ b/cds-fontend-2025.V1/src/layouts/modules/global-header/index.vue @@ -48,12 +48,12 @@ const tenantId = ref(authStore.userInfo?.user?.tenantId || '0 - + />--> ({ + url: '/system/user/muList', + method: 'get' + }); +} + /** 修改用户状态 */ export function fetchUpdateUserStatus(data: Api.System.UserOperateParams) { return request({ diff --git a/cds-fontend-2025.V1/src/theme/settings.ts b/cds-fontend-2025.V1/src/theme/settings.ts index c4bad43..c0ab401 100644 --- a/cds-fontend-2025.V1/src/theme/settings.ts +++ b/cds-fontend-2025.V1/src/theme/settings.ts @@ -58,8 +58,8 @@ export const themeSettings: App.Theme.ThemeSetting = { }, watermark: { visible: import.meta.env.VITE_WATERMARK === 'Y', - text: 'RuoYi-Vue-Plus', - enableUserName: false + text: '全员营销计价', + enableUserName: true }, table: { bordered: true, diff --git a/cds-fontend-2025.V1/src/typings/api/mps.private-ebank-new.api.d.ts b/cds-fontend-2025.V1/src/typings/api/mps.private-ebank-new.api.d.ts index 0deba84..5f72ee9 100644 --- a/cds-fontend-2025.V1/src/typings/api/mps.private-ebank-new.api.d.ts +++ b/cds-fontend-2025.V1/src/typings/api/mps.private-ebank-new.api.d.ts @@ -7,31 +7,31 @@ namespace Mps { /** private ebank new */ type PrivateEbankNew = Common.CommonRecord<{ /** 数据编号 */ - dataId: CommonType.IdType; + dataId: CommonType.IdType; /** 营销人员营销号 */ - userId: CommonType.IdType; + userId: CommonType.IdType; /** 客户身份证号 */ - custId: CommonType.IdType; + custId: CommonType.IdType; /** 客户姓名 */ - custName: string; + custName: string; /** 客户账号/卡号 */ - custAcctNo: string; + custAcctNo: string; /** 客户联系电话 */ - custPhoneNo: string; + custPhoneNo: string; /** 核对标志 */ - checkFlag: string; + checkFlag: string; /** 核对时间 */ - checkTime: string; + checkTime: string; /** 核对人员 */ - checkUser: string; + checkUser: string; /** 核对方式 */ - checkType: string; + checkType: string; /** 核对结果 */ - checkMsg: string; + checkMsg: string; /** 租户编号 */ - tenantId: CommonType.IdType; + tenantId: CommonType.IdType; /** 删除标志 */ - delFlag: string; + delFlag: string; }>; /** private ebank new search params */ @@ -53,6 +53,7 @@ namespace Mps { Pick< Api.Mps.PrivateEbankNew, | 'dataId' + | 'operatorId' | 'userId' | 'custId' | 'custName' diff --git a/cds-fontend-2025.V1/src/typings/api/system.api.d.ts b/cds-fontend-2025.V1/src/typings/api/system.api.d.ts index 8e779f3..f8e55e7 100644 --- a/cds-fontend-2025.V1/src/typings/api/system.api.d.ts +++ b/cds-fontend-2025.V1/src/typings/api/system.api.d.ts @@ -100,10 +100,16 @@ declare namespace Api { deptName: string; /** 用户账号 */ userName: string; - /** 用户昵称 */ + /** 用户姓名 */ nickName: string; + /** 身份证号 */ + idCard: string; /** 用户类型（sys_user系统用户） */ userType: string; + /** 用户种类(0-营销 其他-其他) */ + userCategory: string; + /** 营销编号 */ + mktNo: string; /** 用户邮箱 */ email: string; /** 手机号码 */ @@ -139,6 +145,9 @@ declare namespace Api { | 'deptId' | 'userName' | 'nickName' + | 'idCard' + | 'userCategory' + | 'mktNo' | 'email' | 'phonenumber' | 'sex' diff --git a/cds-fontend-2025.V1/src/views/_builtin/login/index.vue b/cds-fontend-2025.V1/src/views/_builtin/login/index.vue index 788932b..06b9108 100644 --- a/cds-fontend-2025.V1/src/views/_builtin/login/index.vue +++ b/cds-fontend-2025.V1/src/views/_builtin/login/index.vue @@ -59,14 +59,14 @@ const activeModule = computed(() => moduleMap[props.module || 'pwd-login']); class="text-20px lt-sm:text-18px" @switch="themeStore.toggleThemeScheme" /> - + />-->
diff --git a/cds-fontend-2025.V1/src/views/_builtin/login/modules/pwd-login.vue b/cds-fontend-2025.V1/src/views/_builtin/login/modules/pwd-login.vue index 8af8916..a1b145e 100644 --- a/cds-fontend-2025.V1/src/views/_builtin/login/modules/pwd-login.vue +++ b/cds-fontend-2025.V1/src/views/_builtin/login/modules/pwd-login.vue @@ -29,7 +29,8 @@ const tenantEnabled = ref(false); const tenantOption = ref([]); const model: Api.Auth.PwdLoginForm = reactive({ - tenantId: '000000', + /*tenantId: '000000',*/ + tenantId: '069291',//注意要和部署法人保持一致 username: 'admin', password: 'admin123' }); @@ -165,9 +166,9 @@ async function handleSocialLogin(type: Api.System.SocialSource) {
{{ $t('page.login.pwdLogin.rememberMe') }} - +
{{ $t('common.login') }} @@ -179,10 +180,13 @@ async function handleSocialLogin(type: Api.System.SocialSource) { -
{{ $t('page.login.pwdLogin.otherAccountLogin') }}
+ + + 评估是否增加注册功能 + -
+ -
+
diff --git a/cds-fontend-2025.V1/src/views/home/modules/header-banner.vue b/cds-fontend-2025.V1/src/views/home/modules/header-banner.vue index f784f89..862dab1 100644 --- a/cds-fontend-2025.V1/src/views/home/modules/header-banner.vue +++ b/cds-fontend-2025.V1/src/views/home/modules/header-banner.vue @@ -55,7 +55,7 @@ const statisticData = computed(() => [ }) }} -

{{ $t('page.home.weatherDesc') }}

+
diff --git a/cds-fontend-2025.V1/src/views/mps/private-ebank-new/index.vue b/cds-fontend-2025.V1/src/views/mps/private-ebank-new/index.vue index 95ec2bc..a4fa678 100644 --- a/cds-fontend-2025.V1/src/views/mps/private-ebank-new/index.vue +++ b/cds-fontend-2025.V1/src/views/mps/private-ebank-new/index.vue @@ -9,15 +9,17 @@ import {$t} from '@/locales'; import ButtonIcon from '@/components/custom/button-icon.vue'; import PrivateEbankNewOperateDrawer from './modules/private-ebank-new-operate-drawer.vue'; import PrivateEbankNewSearch from './modules/private-ebank-new-search.vue'; -import {computed, ref, watch} from "vue"; +import {computed, onMounted, ref, watch} from "vue"; import {useBoolean} from "~/packages/hooks"; import PrivateEbankImportModal from './modules/private-ebank-import-modal.vue'; +import {useAuthStore} from "@/store/modules/auth"; defineOptions({ name: 'PrivateEbankNewList' }); const appStore = useAppStore(); +const { userInfo } = useAuthStore(); const {download} = useDownload(); const {hasAuth} = useAuth(); const {bool: importVisible, setTrue: openImportModal} = useBoolean(); @@ -68,6 +70,14 @@ const { ellipsis: true, resizable: true }, + { + key: 'operatorId', + title: '经办人员营销号', + align: 'center', + minWidth: 120, + ellipsis: true, + resizable: true + }, { key: 'userId', title: '营销人员营销号', @@ -238,6 +248,13 @@ watch(columns, (newColumns) => { scrollX.value = calculateTotalWidth(); }, {deep: true}); +//测试登录用户信息 +onMounted(() => { + console.log(JSON.stringify(userInfo)); + console.log("是否营销:" + userInfo.user.userCategory); + console.log("营销编号:" + userInfo.user.mktNo); +}); + const {drawerVisible, operateType, editingData, handleAdd, handleEdit, checkedRowKeys, onBatchDeleted, onDeleted} = useTableOperate(data, getData); diff --git a/cds-fontend-2025.V1/src/views/mps/private-ebank-new/modules/private-ebank-new-operate-drawer.vue b/cds-fontend-2025.V1/src/views/mps/private-ebank-new/modules/private-ebank-new-operate-drawer.vue index 269d5c2..14f723e 100644 --- a/cds-fontend-2025.V1/src/views/mps/private-ebank-new/modules/private-ebank-new-operate-drawer.vue +++ b/cds-fontend-2025.V1/src/views/mps/private-ebank-new/modules/private-ebank-new-operate-drawer.vue @@ -1,9 +1,11 @@