From 040ec9d82c6d0c36ced08b80b64e293a047e1365 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Wed, 22 Jan 2025 14:52:32 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feat:=E8=AE=BE=E5=A4=87=E4=BA=A4=E6=98=93?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E3=80=81=E5=95=86=E6=88=B7=E4=BA=A4=E6=98=93?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=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-sb/index.vue | 2 +- src/views/hard/hard-sh/index.vue | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/hard/hard-sb/index.vue b/src/views/hard/hard-sb/index.vue index a37480c..bfbbfdc 100644 --- a/src/views/hard/hard-sb/index.vue +++ b/src/views/hard/hard-sb/index.vue @@ -97,7 +97,7 @@ const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, do // 导出excel const exportExcel = () => { - downBlobFile("/wallet/hard-total/export-sb", Object.assign(state.queryForm), "设备交易记录.xlsx") + downBlobFile("/hard/hard-total/export-sb", Object.assign(state.queryForm), "设备交易记录.xlsx") } const getSummaries = (param: any) => { diff --git a/src/views/hard/hard-sh/index.vue b/src/views/hard/hard-sh/index.vue index a66a341..f5baf14 100644 --- a/src/views/hard/hard-sh/index.vue +++ b/src/views/hard/hard-sh/index.vue @@ -4,8 +4,8 @@ - - + + @@ -94,7 +94,7 @@ const resetQuery = () => { // 导出excel const exportExcel = () => { - downBlobFile("/wallet/hard-total/export-cs", Object.assign(state.queryForm), "商户交易记录.xlsx") + downBlobFile("/hard/hard-total/export-cs", Object.assign(state.queryForm), "商户交易记录.xlsx") } const getSummaries = (param: any) => { From 78abd90f54f1eff22a73072206165a919d949231 Mon Sep 17 00:00:00 2001 From: ctw <> Date: Wed, 22 Jan 2025 15:16:46 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E8=A1=A8=E6=A0=BC=E8=A1=8C=E5=B0=BE=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E5=90=88=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/hard/hard-order/index.vue | 87 ++++++++++------------------- 1 file changed, 29 insertions(+), 58 deletions(-) diff --git a/src/views/hard/hard-order/index.vue b/src/views/hard/hard-order/index.vue index 15d652e..068ace4 100644 --- a/src/views/hard/hard-order/index.vue +++ b/src/views/hard/hard-order/index.vue @@ -361,65 +361,36 @@ const getSummaries = (param: SummaryMethodProps) => { return } if (column.property === "paymentInformation") { - const totalPriceValues = data.map((item) => Number(item.totalPrice)) - const extraPriceValues = data.map((item) => Number(item.extraPrice)) - const payPriceValues = data.map((item) => Number(item.payPrice)) - if ( - !totalPriceValues.every((value) => Number.isNaN(value)) && - !extraPriceValues.every((value) => Number.isNaN(value)) && - !payPriceValues.every((value) => Number.isNaN(value)) - ) { - // h("div", { style: { textDecoration: "underline" } }, ["Total Cost"]) - sums[index] = h("div", { style: {} }, [ - h("div", {}, [ - h("span", { style: { marginRight: "40px", fontWeight: "bold" } }, ["商品总价"]), - h("span", { style: { color: "#67C260" } }, [ - `${displayPrice( - totalPriceValues.reduce((prev, curr) => { - const value = Number(curr) - if (!Number.isNaN(value)) { - return prev + curr - } else { - return prev - } - }, 0), - )}`, + const priceVNode: VNode[] & string[] = [] + ;[ + { column: "totalPrice", columnName: "商品总价", color: "#67C260" }, + { column: "extraPrice", columnName: "额外支付", color: "#F56E9B" }, + { column: "payPrice", columnName: "实际支付", color: "#355CF6" }, + ].forEach(({ column, columnName, color }: any, index: number) => { + const values = data.map((item) => Number(item[column])) + if (!values.every((value) => Number.isNaN(value))) { + priceVNode.push( + h("div", {}, [ + h("span", { style: { marginRight: "40px", minWidth: "60px", fontWeight: "bold" } }, [columnName]), + h("span", { style: { color, minWidth: "50px", flex: 1 } }, [ + displayPrice( + values.reduce((prev, curr) => { + const value = Number(curr) + if (!Number.isNaN(value)) { + return prev + curr + } else { + return prev + } + }, 0), + ), + ]), ]), - ]), - h("div", { style: {} }, [ - h("span", { style: { marginRight: "40px", fontWeight: "bold" } }, ["额外支付"]), - h("span", { style: { color: "#F56E9B" } }, [ - `${displayPrice( - extraPriceValues.reduce((prev, curr) => { - const value = Number(curr) - if (!Number.isNaN(value)) { - return prev + curr - } else { - return prev - } - }, 0), - )}`, - ]), - ]), - h("div", { style: {} }, [ - h("span", { style: { marginRight: "40px", fontWeight: "bold" } }, ["实际支付"]), - h("span", { style: { color: "#355CF6" } }, [ - `${displayPrice( - payPriceValues.reduce((prev, curr) => { - const value = Number(curr) - if (!Number.isNaN(value)) { - return prev + curr - } else { - return prev - } - }, 0), - )}`, - ]), - ]), - ]) - } else { - sums[index] = "N/A" - } + ) + } else { + priceVNode.push("NaN") + } + }) + sums[index] = h("div", { style: {} }, [...priceVNode]) } else { sums[index] = "" } From d5ffb3066e4b91f89274f446cd3774275ffe9334 Mon Sep 17 00:00:00 2001 From: ctw <> Date: Wed, 22 Jan 2025 15:44:18 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/admin/system/user/index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/admin/system/user/index.vue b/src/views/admin/system/user/index.vue index e4cf480..f57dc02 100644 --- a/src/views/admin/system/user/index.vue +++ b/src/views/admin/system/user/index.vue @@ -5,7 +5,7 @@
{ const resetQuery = () => { queryRef.value?.resetFields() state.queryForm.deptId = "" - queryTreeRef.value.getdeptTree() + depTreeRef.value.getTreeData() getDataList() } From dcd24f0ff3bb812548061d755de5c967ecf9db9a Mon Sep 17 00:00:00 2001 From: ctw <> Date: Wed, 22 Jan 2025 15:58:45 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=B8=83=E5=B1=80=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/DepTree/index.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/components/DepTree/index.vue b/src/components/DepTree/index.vue index 1eddc3b..b5e4234 100644 --- a/src/components/DepTree/index.vue +++ b/src/components/DepTree/index.vue @@ -191,6 +191,8 @@ defineExpose({ padding-top: 10px; box-shadow: 0 0 8px 0 rgba(0, 0, 0, 0.1); z-index: 10; + position: sticky; + bottom: 0; } } From a4d2e10387522f171d01c8572f8f5ef22a7dc94d Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Wed, 22 Jan 2025 16:00:31 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=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-sb/index.vue | 4 ++-- src/views/hard/hard-sh/index.vue | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/hard/hard-sb/index.vue b/src/views/hard/hard-sb/index.vue index bfbbfdc..22a58e1 100644 --- a/src/views/hard/hard-sb/index.vue +++ b/src/views/hard/hard-sb/index.vue @@ -38,7 +38,7 @@ @selection-change="selectionChangHandle" @sort-change="sortChangeHandle" > - +