From 04be125365bfd254166072f75da87e406f633ba3 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期四, 09 一月 2025 18:36:56 +0800
Subject: [PATCH] Merge branch 'master' of http://47.96.225.205:8888/r/operation_pc-v2
---
pages/settlement/list/_id.vue | 91 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 84 insertions(+), 7 deletions(-)
diff --git a/pages/settlement/list/_id.vue b/pages/settlement/list/_id.vue
index 2acea64..a7b8198 100644
--- a/pages/settlement/list/_id.vue
+++ b/pages/settlement/list/_id.vue
@@ -6,6 +6,7 @@
label-width="auto"
:content="formContent"
readonly
+ class="readonly-form"
></el-bus-form>
<template v-if="goodsList && goodsList.length > 0">
<el-bus-title
@@ -14,19 +15,83 @@
class="mt-20"
></el-bus-title>
<el-table :data="goodsList">
- <el-table-column label="商品名称" prop="flowerName"></el-table-column>
- <el-table-column label="级别" prop="flowerLevelStr"></el-table-column>
- <el-table-column label="结算单价(元)" prop="price"></el-table-column>
- <el-table-column label="数量" prop="num"></el-table-column>
+ <el-table-column
+ label="商品名称"
+ prop="flowerName"
+ min-width="150"
+ fixed="left"
+ ></el-table-column>
+ <el-table-column
+ label="级别"
+ prop="flowerLevelStr"
+ min-width="80"
+ ></el-table-column>
+ <el-table-column
+ label="结算单价(元)"
+ prop="price"
+ min-width="120"
+ ></el-table-column>
+ <el-table-column
+ label="数量"
+ prop="num"
+ min-width="120"
+ ></el-table-column>
<el-table-column
label="结算合计(元)"
prop="totalAmount"
+ min-width="120"
></el-table-column>
- <el-table-column label="质检扣款(元)" prop="checkFee"></el-table-column>
- <el-table-column label="售后理赔(元)" prop="salesFee"></el-table-column>
+ <el-table-column
+ label="降级扣款(元)"
+ prop="checkFee"
+ min-width="120"
+ ></el-table-column>
+ <el-table-column
+ label="缺货扣款(元)"
+ prop="lackFee"
+ min-width="120"
+ ></el-table-column>
+ <el-table-column
+ label="补货扣款(元)"
+ prop="replaceFee"
+ min-width="120"
+ ></el-table-column>
+ <el-table-column
+ label="售后理赔(元)"
+ prop="salesFee"
+ min-width="120"
+ ></el-table-column>
<el-table-column
label="集货站运费(元)"
prop="stationFee"
+ min-width="120"
+ ></el-table-column>
+ <el-table-column
+ label="订单号"
+ prop="orderNo"
+ min-width="180"
+ fixed="right"
+ >
+ <template #default="{ row }">
+ <el-link
+ href="javascript:void(0)"
+ type="primary"
+ @click.native="toOrderDetail(row)"
+ >{{ row.orderNo }}</el-link
+ >
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="收货日期"
+ prop="receiveTime"
+ min-width="150"
+ fixed="right"
+ ></el-table-column>
+ <el-table-column
+ label="质检日期"
+ prop="checkTime"
+ min-width="150"
+ fixed="right"
></el-table-column>
</el-table>
</template>
@@ -56,7 +121,14 @@
unit: '元',
},
{ label: '结算均价：', id: 'price', type: 'input', unit: '元' },
- { label: '质检扣款：', id: 'checkFee', type: 'input', unit: '元' },
+ { label: '降级扣款：', id: 'checkFee', type: 'input', unit: '元' },
+ { label: '缺货扣款：', id: 'lackFee', type: 'input', unit: '元' },
+ {
+ label: '补货扣款：',
+ id: 'replaceFee',
+ type: 'input',
+ unit: '元',
+ },
{ label: '售后理赔：', id: 'salesFee', type: 'input', unit: '元' },
{ label: '服务费：', id: 'serviceFee', type: 'input', unit: '元' },
{
@@ -101,6 +173,11 @@
this.goodsList = data?.details || []
}
},
+ toOrderDetail(row) {
+ if (row.orderId) {
+ this.$router.push(`/order/list/${row.orderId}`)
+ }
+ },
},
}
</script>
--
Gitblit v1.9.3