From 6255f84fa06b588fdc15212ec6909f26633fe2d2 Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Thu, 6 Mar 2025 15:58:31 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/erpSpuSelectDialog.vue | 14 +++++++-------
.../supermarketerp/components/linkCodeDialog.vue | 7 ++++---
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/views/supermarketerp/components/erpSpuSelectDialog.vue b/src/views/supermarketerp/components/erpSpuSelectDialog.vue
index 8d2b23a..5bd5502 100644
--- a/src/views/supermarketerp/components/erpSpuSelectDialog.vue
+++ b/src/views/supermarketerp/components/erpSpuSelectDialog.vue
@@ -42,20 +42,20 @@
-
+
-
-
- {{ supermarketBrand?.find((item: any) => item.id === scope.row.brandId)?.name }}
-
-
+
+
+
+
+
{{ supermarketCategory?.find((item: any) => item.id === scope.row.categoryId)?.name }}
-
+
diff --git a/src/views/supermarketerp/components/linkCodeDialog.vue b/src/views/supermarketerp/components/linkCodeDialog.vue
index 389d740..5b10d8e 100644
--- a/src/views/supermarketerp/components/linkCodeDialog.vue
+++ b/src/views/supermarketerp/components/linkCodeDialog.vue
@@ -12,11 +12,12 @@
@radio-change="radioChangeEvent"
>
-
+
+
-
+
From 72e075f3088165c8605ac4081d17ea7b930d487c Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Thu, 6 Mar 2025 16:43:28 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat:=E8=B4=A2=E5=8A=A1=E5=A2=9E=E5=8A=A0?=
=?UTF-8?q?=E7=BB=9F=E8=AE=A1=E7=BA=AC=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/hard/hard-order/index.vue | 2 +-
src/views/hard/hard-sb/index.vue | 38 +++++++++++++++++++++++++----
src/views/hard/hard-sh/index.vue | 38 +++++++++++++++++++++++++----
3 files changed, 67 insertions(+), 11 deletions(-)
diff --git a/src/views/hard/hard-order/index.vue b/src/views/hard/hard-order/index.vue
index f604b32..9a58bd4 100644
--- a/src/views/hard/hard-order/index.vue
+++ b/src/views/hard/hard-order/index.vue
@@ -368,7 +368,7 @@ const handleGetSelectNode = (curClickedNode: any, checkedTreeNodes: any, isDeepT
// 导出excel
const exportExcel = () => {
- downBlobFile("/hard/hard-order/export", Object.assign(state.queryForm, { ids: selectObjs }), "订单.xlsx")
+ downBlobFile("/hard/hard-order/export", Object.assign(state.queryForm, { ids: selectObjs }), "订单交易记录.xlsx")
}
// 多选事件
diff --git a/src/views/hard/hard-sb/index.vue b/src/views/hard/hard-sb/index.vue
index e0dd594..113b37e 100644
--- a/src/views/hard/hard-sb/index.vue
+++ b/src/views/hard/hard-sb/index.vue
@@ -61,22 +61,49 @@
-
+
-
+
{{ displayPrice(row.totalPayPrice) }}
-
+
{{ row.totalPayCount }}
+
+
+
+ {{ displayPrice(row.totalRefundPrice) }}
+
+
+
+
+
+
+ {{ row.totalRefundCount }}
+
+
+
+
+
+
+ {{ displayPrice(row.totalProfitPrice) }}
+
+
+
+
+
+
+ {{ row.totalProfitCount }}
+
+
+
-
@@ -102,6 +129,7 @@ const draggableDepTreeRef = ref() // 树组件ref引用
const { hard_type } = useDict("hard_type")
const state: BasicTableProps = reactive({
+ isPage: false,
queryForm: {},
pageList: hardTotalApi.pageListSb,
})
@@ -116,7 +144,7 @@ const exportExcel = () => {
const getSummaries = (param: any) => {
const { columns, data } = param
- const totalColumns = ["totalPayPrice", "totalPayCount"]
+ const totalColumns = ["totalPayPrice", "totalPayCount", "totalRefundPrice", "totalRefundCount", "totalProfitPrice", "totalProfitCount"]
const totalRow = Array.from({ length: columns.length })
totalRow[0] = "合计"
columns.forEach((i: any, index: number) => {
diff --git a/src/views/hard/hard-sh/index.vue b/src/views/hard/hard-sh/index.vue
index 90971bd..aed98cc 100644
--- a/src/views/hard/hard-sh/index.vue
+++ b/src/views/hard/hard-sh/index.vue
@@ -53,22 +53,49 @@
-
+
{{ displayPrice(row.totalPayPrice) }}
-
+
- {{ row.totalPayCount }}
+ {{ row.totalPayCount || 0 }}
+
+
+
+
+
+
+ {{ displayPrice(row.totalRefundPrice) }}
+
+
+
+
+
+
+ {{ row.totalRefundCount || 0 }}
+
+
+
+
+
+
+ {{ displayPrice(row.totalProfitPrice) }}
+
+
+
+
+
+
+ {{ row.totalProfitCount || 0 }}
-
@@ -90,6 +117,7 @@ const multiple = ref(true)
const draggableDepTreeRef = ref() // 树组件ref引用
const state: BasicTableProps = reactive({
+ isPage: false,
queryForm: {},
pageList: hardTotalApi.pageListCs,
})
@@ -116,7 +144,7 @@ const exportExcel = () => {
const getSummaries = (param: any) => {
const { columns, data } = param
- const totalColumns = ["totalPayPrice", "totalPayCount"]
+ const totalColumns = ["totalPayPrice", "totalPayCount", "totalRefundPrice", "totalRefundCount", "totalProfitPrice", "totalProfitCount"]
const totalRow = Array.from({ length: columns.length })
totalRow[0] = "合计"
columns.forEach((i: any, index: number) => {
From 67072d6c6bc5f0abe5b10f38d57fdfc3213fd404 Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Thu, 6 Mar 2025 17:46:16 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../supermarketerp/components/linkCodeDialog.vue | 12 ++++++------
.../purchaseManagement/smErpCgDd/form.vue | 5 -----
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/src/views/supermarketerp/components/linkCodeDialog.vue b/src/views/supermarketerp/components/linkCodeDialog.vue
index 569c625..b9a5169 100644
--- a/src/views/supermarketerp/components/linkCodeDialog.vue
+++ b/src/views/supermarketerp/components/linkCodeDialog.vue
@@ -16,12 +16,12 @@
-
-
-
-
-
-
+
+
+
+
+
+