From 820c1c23027dfe95a02d93d6a1611f8ef7f6d6c9 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期一, 09 九月 2024 16:45:20 +0800
Subject: [PATCH] Merge branch 'master' of http://47.96.225.205:8888/r/operation_pc-v2
---
components/base-nav.vue | 14 --------------
pages/bill/_type/index.vue | 7 +++++++
pages/order/list/_id.vue | 7 +++++++
pages/marketing/point-mall/point-distribution.vue | 3 +++
pages/order/list/index.vue | 13 +++++++------
5 files changed, 24 insertions(+), 20 deletions(-)
diff --git a/components/base-nav.vue b/components/base-nav.vue
index f3374ed..121c8ec 100644
--- a/components/base-nav.vue
+++ b/components/base-nav.vue
@@ -122,20 +122,6 @@
passwordFormInfo: {},
passwordForm: [
{
- label: this.$t('nav.oldPassword'),
- id: 'oldPassword',
- type: 'input',
- el: { type: 'password' },
- rules: {
- required: true,
- message: joinLocaleText(
- this.$t('elBus.common.pleaseEnter'),
- this.$t('nav.oldPassword')
- ),
- trigger: 'blur',
- },
- },
- {
label: this.$t('nav.newPassword'),
id: 'password',
type: 'input',
diff --git a/pages/bill/_type/index.vue b/pages/bill/_type/index.vue
index b5ff618..898d62d 100644
--- a/pages/bill/_type/index.vue
+++ b/pages/bill/_type/index.vue
@@ -57,6 +57,12 @@
</el-col>
<el-col :span="4" class="mb-10">
<el-card>
+ <div class="statistic-title">优惠券金额</div>
+ <div class="statistic-num">{{ statistic.memberCouponAmount }}</div>
+ </el-card>
+ </el-col>
+ <el-col :span="4" class="mb-10">
+ <el-card>
<div class="statistic-title">利润合计</div>
<div class="statistic-num">{{ statistic.profitAmount }}</div>
</el-card>
@@ -112,6 +118,7 @@
},
{ label: '质检退款', prop: 'deductAmount', minWidth: 150 },
{ label: '售后退款', prop: 'salesAmount', minWidth: 150 },
+ { label: '优惠券金额', prop: 'memberCouponAmount', minWidth: 150 },
{ label: '利润合计', prop: 'profitAmount', minWidth: 150 },
{
label: '账单日期',
diff --git a/pages/marketing/point-mall/point-distribution.vue b/pages/marketing/point-mall/point-distribution.vue
index 1137570..8406679 100644
--- a/pages/marketing/point-mall/point-distribution.vue
+++ b/pages/marketing/point-mall/point-distribution.vue
@@ -31,10 +31,13 @@
{ label: '用户信息', prop: 'customerName' },
{ label: '总积分', prop: 'totalPoint' },
{ label: '已使用积分', prop: 'usedPoint' },
+ { label: '过期积分', prop: 'expiredPoint' },
+ { label: '扣减积分', formatter: (row) => row.deductionPoint ?? 0 },
{
label: '剩余积分',
formatter: (row) =>
parseInt(row.totalPoint) -
+ parseInt(row.deductionPoint ?? 0) -
parseInt(row.usedPoint) -
parseInt(row.expiredPoint),
},
diff --git a/pages/order/list/_id.vue b/pages/order/list/_id.vue
index 87dd692..5a1cb0c 100644
--- a/pages/order/list/_id.vue
+++ b/pages/order/list/_id.vue
@@ -354,6 +354,13 @@
{ label: '合伙人：', id: 'partnerName', type: 'input' },
{ label: '库区：', id: 'warehouseName', type: 'input' },
{ label: '库位：', id: 'warehouseLocationCode', type: 'input' },
+ {
+ label: '备注：',
+ id: 'remarks',
+ type: 'input',
+ el: { type: 'textarea' },
+ span: 24,
+ },
],
},
],
diff --git a/pages/order/list/index.vue b/pages/order/list/index.vue
index f346589..bc7e38b 100644
--- a/pages/order/list/index.vue
+++ b/pages/order/list/index.vue
@@ -27,7 +27,6 @@
import { dateRangeOptions } from '@/utils/options'
import CustomDateRange from '@/components/custom-date-range.vue'
import PrintList from '@/components/order/print-list'
-// import GoodsTableItemList from '@/components/order/goods-table-item-list.vue'
export default {
components: {
PrintList,
@@ -74,16 +73,18 @@
}${row.customerAddress || ''}`,
minWidth: 250,
},
- // {
- // label: '商品信息',
- // formatter: (row) => <GoodsTableItemList items={row.items} />,
- // minWidth: 250,
- // },
{ label: '订单金额(元)', prop: 'totalAmount', minWidth: 150 },
{ label: '底价(元)', prop: 'supplierAmount', minWidth: 150 },
{ label: '订单状态', prop: 'statusBackendStr', minWidth: 120 },
{ label: '下单时间', prop: 'createTime', minWidth: 180 },
{ label: '合伙人', prop: 'partnerName', minWidth: 120 },
+ {
+ label: '备注',
+ formatter: (row) => (
+ <simple-text value={row.remarks} type="primary"></simple-text>
+ ),
+ minWidth: 200,
+ },
],
searchFormAttrs: {
labelWidth: 'auto',
--
Gitblit v1.9.3