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) => {
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 fc984cb..b9a5169 100644
--- a/src/views/supermarketerp/components/linkCodeDialog.vue
+++ b/src/views/supermarketerp/components/linkCodeDialog.vue
@@ -12,15 +12,16 @@
@radio-change="radioChangeEvent"
>
-
+
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgDd/form.vue b/src/views/supermarketerp/purchaseManagement/smErpCgDd/form.vue
index 5a3bbb9..41cabb0 100644
--- a/src/views/supermarketerp/purchaseManagement/smErpCgDd/form.vue
+++ b/src/views/supermarketerp/purchaseManagement/smErpCgDd/form.vue
@@ -22,11 +22,6 @@
style="width: 200px"
/>
-
-
-
-
-