From abdaa1a557a1204fb63c9511fc87e496b918059e Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Thu, 23 Jan 2025 13:12:18 +0800 Subject: [PATCH 1/7] =?UTF-8?q?feat:=E9=83=A8=E9=97=A8=E4=BA=A4=E6=98=93?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/admin/user.ts | 8 +- src/api/hard/hard-total.ts | 8 ++ src/views/hard/hard-dept-total/index.vue | 131 ++++++++++++++++++ .../wallet/wallet-recharge-water/index.vue | 3 - 4 files changed, 142 insertions(+), 8 deletions(-) create mode 100644 src/views/hard/hard-dept-total/index.vue diff --git a/src/api/admin/user.ts b/src/api/admin/user.ts index eea44dd..724310e 100644 --- a/src/api/admin/user.ts +++ b/src/api/admin/user.ts @@ -112,15 +112,13 @@ export const resetUserPassword = (userInfo: object) => { } export function validateUsername(rule: any, value: any, callback: any, isEdit: boolean) { + if (isEdit) { + return callback() + } const flag = new RegExp(/^([a-z\d]+?)$/).test(value) if (!flag) { callback(new Error("用户名支持小写英文、数字")) } - - if (isEdit) { - return callback() - } - getDetails({ username: value }).then((response) => { const result = response.data if (result !== null) { diff --git a/src/api/hard/hard-total.ts b/src/api/hard/hard-total.ts index 9ad8815..ead8f8c 100644 --- a/src/api/hard/hard-total.ts +++ b/src/api/hard/hard-total.ts @@ -1,5 +1,13 @@ import request from "/@/utils/request" +export function pageListDept(query?: Object) { + return request({ + url: "/hard/hard-total/page-list-dept", + method: "get", + params: query, + }) +} + export function pageListSb(query?: Object) { return request({ url: "/hard/hard-total/page-list-sb", diff --git a/src/views/hard/hard-dept-total/index.vue b/src/views/hard/hard-dept-total/index.vue new file mode 100644 index 0000000..02544fe --- /dev/null +++ b/src/views/hard/hard-dept-total/index.vue @@ -0,0 +1,131 @@ + + + diff --git a/src/views/wallet/wallet-recharge-water/index.vue b/src/views/wallet/wallet-recharge-water/index.vue index 43b1e01..f5d15f9 100644 --- a/src/views/wallet/wallet-recharge-water/index.vue +++ b/src/views/wallet/wallet-recharge-water/index.vue @@ -150,9 +150,6 @@ const multiple = ref(true) // 表格变量 const state: BasicTableProps = reactive({ queryForm: {}, - pagination: { - pageSizes: [10, 20, 50, 100, 200, 500, 1000, 2000], - }, pageList: walletRechargeImportApi.pageJoin, }) From ec29b18fca04e86e328cff28a8ba39afdfc53b6b Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Thu, 23 Jan 2025 14:22:16 +0800 Subject: [PATCH 2/7] =?UTF-8?q?feat:=E9=83=A8=E9=97=A8=E4=BA=A4=E6=98=93?= =?UTF-8?q?=E9=87=91=E9=A2=9D=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/hard/hard-dept-total/index.vue | 98 +++++++++++++++--------- 1 file changed, 62 insertions(+), 36 deletions(-) diff --git a/src/views/hard/hard-dept-total/index.vue b/src/views/hard/hard-dept-total/index.vue index 02544fe..2f7b54c 100644 --- a/src/views/hard/hard-dept-total/index.vue +++ b/src/views/hard/hard-dept-total/index.vue @@ -3,20 +3,10 @@
- - - - - - - - - - - + @@ -30,6 +20,19 @@ + +
+ +
+ - + + + + + + + + + + + + + + - - - + - - - - - - + -
@@ -90,6 +99,7 @@ const selectObjs = ref([]) as any const multiple = ref(true) // 表格变量 const state: BasicTableProps = reactive({ + isPage: false, queryForm: {}, pageList: hardTotalApi.pageListDept, }) @@ -98,17 +108,33 @@ const state: BasicTableProps = reactive({ const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state) +// 导出excel +const exportExcel = () => { + downBlobFile("/hard/hard-total/export-dept", Object.assign(state.queryForm), "部门交易记录导出.xlsx") +} + const getSummaries = (param: any) => { const { columns, data } = param - const totalColumns = ["beforePrice", "price"] + const totalColumns = [ + "walletPrice", + "walletCount", + "orderPayPrice", + "orderPayCount", + "orderRefundPrice", + "orderRefundCont", + ] const totalRow = Array.from({ length: columns.length }) columns.forEach((i: any, index: number) => { if (totalColumns.includes(i.property)) { const total = data .filter((v: any) => v[i.property] != null) - .map((v: any) => v[i.property]) + .map((v: any) => Number(v[i.property])) .reduce((pren: number, next: number) => pren + next, 0) - totalRow[index] = displayPrice(total) + if (i.property.includes("Price")) { + totalRow[index] = displayPrice(total) + } else { + totalRow[index] = total + "次" + } } }) return totalRow From f484b5088aad7cb2d05736c5b63bb4074c41ff40 Mon Sep 17 00:00:00 2001 From: ctw <> Date: Thu, 23 Jan 2025 14:29:06 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E6=A0=91=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/DepTree/index.vue | 3 +- src/views/admin/system/user/index.vue | 101 ++++++++++++++++--------- src/views/hard/components/shop-car.vue | 17 ++++- 3 files changed, 85 insertions(+), 36 deletions(-) diff --git a/src/components/DepTree/index.vue b/src/components/DepTree/index.vue index 7949122..4883733 100644 --- a/src/components/DepTree/index.vue +++ b/src/components/DepTree/index.vue @@ -190,9 +190,10 @@ defineExpose({ align-items: center; padding-top: 10px; box-shadow: 0 -8px 8px -8px rgba(0, 0, 0, 0.1); - z-index: 10; + z-index: 999; position: sticky; bottom: 0; + overflow: hidden; } } diff --git a/src/views/admin/system/user/index.vue b/src/views/admin/system/user/index.vue index 7954a28..6119f09 100644 --- a/src/views/admin/system/user/index.vue +++ b/src/views/admin/system/user/index.vue @@ -1,40 +1,48 @@ + - + + (20) // 多选rows const selectObjs = ref([]) as any @@ -360,4 +371,26 @@ const changePassword = async (row: any) => { useMessage().success(t("common.optSuccessText")) getDataList() } + +const isOpen = ref(true) +const temp = ref() +const handleClickDepTreeDrawer = (isDrawerOpen: boolean) => { + if (isDrawerOpen) { + temp.value = depTreeWidth.value + depTreeWidth.value = 0.5 + } else { + depTreeWidth.value = temp.value + } + isOpen.value = !isOpen.value +} + + diff --git a/src/views/hard/components/shop-car.vue b/src/views/hard/components/shop-car.vue index 2030b6d..133de39 100644 --- a/src/views/hard/components/shop-car.vue +++ b/src/views/hard/components/shop-car.vue @@ -79,7 +79,22 @@ const getSummaries = (param: SummaryMethodProps) => { sums[index] = "合计" return } - if (column.property === "productPrice" || column.property === "totalPrice") { + if (column.property === "productCount") { + const values = data.map((item) => Number(item[column.property])) + if (!values.every((value) => Number.isNaN(value))) { + sums[index] = + values.reduce((prev, curr) => { + const value = Number(curr) + if (!Number.isNaN(value)) { + return prev + curr + } else { + return prev + } + }, 0) + "份" + } else { + sums[index] = "N/A" + } + } else if (column.property === "totalPrice") { const values = data.map((item) => Number(item[column.property])) if (!values.every((value) => Number.isNaN(value))) { sums[index] = displayPrice( From fed8fa3ce13c66c7149fdfd02eaf41fca5ca7648 Mon Sep 17 00:00:00 2001 From: ctw <> Date: Thu, 23 Jan 2025 14:55:53 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/admin/system/user/index.vue | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/src/views/admin/system/user/index.vue b/src/views/admin/system/user/index.vue index 6119f09..2a9d552 100644 --- a/src/views/admin/system/user/index.vue +++ b/src/views/admin/system/user/index.vue @@ -1,6 +1,6 @@