From daa0b51b0b3609c683da3066c2815d3e9eb42b3f Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 18 十二月 2024 09:39:46 +0800
Subject: [PATCH] 1.订单管理的异常订单

---
 pages/settlement/list/index.vue |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pages/settlement/list/index.vue b/pages/settlement/list/index.vue
index fe6a380..fac1145 100644
--- a/pages/settlement/list/index.vue
+++ b/pages/settlement/list/index.vue
@@ -13,6 +13,8 @@
         hasNew: false,
         hasEdit: false,
         hasDelete: false,
+        hasExport: true,
+        exportUrl: 'flower/api/settlement/export',
         onResetView: (row) => {
           this.$router.push(`${this.$route.path}/${row.id}`)
         },
@@ -38,7 +40,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 +95,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 +137,7 @@
 <style lang="scss" scoped>
 ::v-deep {
   .el-bus-crud__filter__action {
-    display: none;
+    //display: none;
   }
 }
 </style>

--
Gitblit v1.9.3