From 02ff9e4e65b82d1081ff44d6386e8e397b6cff28 Mon Sep 17 00:00:00 2001 From: ouhaolan Date: Thu, 23 Apr 2026 10:59:36 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ydoyun/storeuser/index.ts | 31 +- src/locales/en.ts | 3 +- src/locales/zh-CN.ts | 3 +- src/router/modules/remaining.ts | 11 + src/views/Profile/components/BasicInfo.vue | 39 +- .../report/lijun/reportpage6/detail.vue | 20 + .../ydoyun/report/productDaily/index.vue | 924 +++++++++++++----- src/views/ydoyun/report/salesdaily/index.vue | 35 +- .../ydoyun/report/wangbuliao/商品列表.html | 296 ++++++ src/views/ydoyun/storeuser/StoreUserForm.vue | 136 ++- src/views/ydoyun/storeuser/index.vue | 137 ++- 11 files changed, 1300 insertions(+), 335 deletions(-) create mode 100644 src/views/ydoyun/report/wangbuliao/商品列表.html diff --git a/src/api/ydoyun/storeuser/index.ts b/src/api/ydoyun/storeuser/index.ts index 3a4980b..38af96e 100644 --- a/src/api/ydoyun/storeuser/index.ts +++ b/src/api/ydoyun/storeuser/index.ts @@ -16,6 +16,8 @@ export interface StoreUser { roleNames?: string /** 门店名称(列表接口返回) */ storeName?: string + /** 编辑时提交的门店绑定(全量替换) */ + storeIds?: number[] } // 门店-用户绑定 API @@ -30,6 +32,11 @@ export const StoreUserApi = { return await request.get({ url: `/ydoyun/store-user/get?id=` + id }) }, + /** 编辑弹窗:用户账号 + 已绑定门店列表 */ + getStoreUserForEdit: async (userId: number) => { + return await request.get({ url: `/ydoyun/store-user/get-edit`, params: { userId } }) + }, + // 新增门店-用户绑定 createStoreUser: async (data: StoreUser) => { return await request.post({ url: `/ydoyun/store-user/create`, data }) @@ -40,16 +47,36 @@ export const StoreUserApi = { return await request.put({ url: `/ydoyun/store-user/update`, data }) }, - // 删除门店-用户绑定 + // 删除单条绑定记录(不删账号) deleteStoreUser: async (id: number) => { return await request.delete({ url: `/ydoyun/store-user/delete?id=` + id }) }, - /** 批量删除门店-用户绑定 */ + /** 按用户 + 门店解除绑定(不删账号) */ + deleteStoreUserBinding: async (userId: number, storeId: number) => { + return await request.delete({ + url: `/ydoyun/store-user/delete-binding`, + params: { userId, storeId } + }) + }, + + /** 删除用户账号及全部门店绑定 */ + deleteStoreUserAccount: async (userId: number) => { + return await request.delete({ url: `/ydoyun/store-user/delete-user`, params: { userId } }) + }, + + /** 批量删除绑定记录(不删账号) */ deleteStoreUserList: async (ids: number[]) => { return await request.delete({ url: `/ydoyun/store-user/delete-list?ids=${ids.join(',')}` }) }, + /** 批量删除用户账号 */ + deleteStoreUserAccountList: async (userIds: number[]) => { + return await request.delete({ + url: `/ydoyun/store-user/delete-user-list?userIds=${userIds.join(',')}` + }) + }, + // 导出门店-用户绑定 Excel exportStoreUser: async (params: any) => { return await request.download({ url: `/ydoyun/store-user/export-excel`, params }) diff --git a/src/locales/en.ts b/src/locales/en.ts index bd4c0b4..f3e6f5e 100644 --- a/src/locales/en.ts +++ b/src/locales/en.ts @@ -420,7 +420,8 @@ export default { sex: 'Sex', man: 'Man', woman: 'Woman', - createTime: 'Created Date' + createTime: 'Created Date', + avatar: 'Avatar' }, info: { title: 'Basic Information', diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index 8bdab19..e6e95de 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -414,7 +414,8 @@ export default { sex: '性别', man: '男', woman: '女', - createTime: '创建日期' + createTime: '创建日期', + avatar: '头像' }, info: { title: '基本信息', diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts index ac7aca4..6be4a1e 100644 --- a/src/router/modules/remaining.ts +++ b/src/router/modules/remaining.ts @@ -830,6 +830,17 @@ const remainingRouter: AppRouteRecordRaw[] = [ canTo: true }, component: () => import('@/views/ydoyun/report/lijun/reportpage6/detail.vue') + }, + { + path: 'product-splb', + name: 'ProductSplbReport', + meta: { + title: '商品报表', + noCache: true, + hidden: true, + canTo: true + }, + component: () => import('@/views/ydoyun/report/productSplb/index.vue') } ] }, diff --git a/src/views/Profile/components/BasicInfo.vue b/src/views/Profile/components/BasicInfo.vue index 1492664..df2b2e8 100644 --- a/src/views/Profile/components/BasicInfo.vue +++ b/src/views/Profile/components/BasicInfo.vue @@ -1,4 +1,8 @@