From 2bc7d6bb5cfd9ed2034f2f616366d69e226c4d5d Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期六, 14 九月 2024 15:51:51 +0800
Subject: [PATCH] Merge branch 'master' of http://47.96.225.205:8888/r/operation_pc-v2
---
pages/settlement/list/index.vue | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/pages/settlement/list/index.vue b/pages/settlement/list/index.vue
index fe6a380..1f422ef 100644
--- a/pages/settlement/list/index.vue
+++ b/pages/settlement/list/index.vue
@@ -38,7 +38,9 @@
{ label: '商品数量', prop: 'flowerNum', minWidth: 100 },
{ label: '结算合计(元)', prop: 'totalAmount', minWidth: 120 },
{ label: '结算均价(元)', prop: 'price', minWidth: 120 },
- { label: '质检扣款(元)', prop: 'checkFee', minWidth: 120 },
+ { label: '降级扣款(元)', prop: 'checkFee', minWidth: 120 },
+ { label: '缺货扣款(元)', prop: 'lackFee', minWidth: 120 },
+ { label: '补货扣款(元)', prop: 'replaceFee', minWidth: 120 },
{ label: '售后理赔(元)', prop: 'salesFee', minWidth: 120 },
{ label: '服务费(元)', prop: 'serviceFee', minWidth: 120 },
{ label: '集货站运费(元)', prop: 'stationFee', minWidth: 120 },
@@ -91,13 +93,14 @@
commonFormatProps: ['dateType', 'startDateStr', 'endDateStr'],
span: 24,
},
+ { label: '结算人：', id: 'userName', type: 'input' },
],
},
],
extraButtons: [
{
text: '结算',
- show: (row) => row.status === 'PENDING',
+ show: (row) => row.status === 'PENDING' || row.status === 'FAILED',
atClick: async (row) => {
try {
await this.$elBusUtil.confirm('确定要结算吗？')
@@ -132,7 +135,7 @@
<style lang="scss" scoped>
::v-deep {
.el-bus-crud__filter__action {
- display: none;
+ //display: none;
}
}
</style>
--
Gitblit v1.9.3