From aa82f2ce6aabe78b47c927d7ae2d3ff08c59baaf Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期三, 09 十月 2024 15:43:26 +0800
Subject: [PATCH] Merge branch 'master-2.0' of http://47.96.225.205:8888/r/hmy_farmer-main into master-2.0
---
sub_pages/supplier/order-settlement/order-settlement-detail.vue | 103 ++++++++++++++++++++++++++++++++++++---------------
1 files changed, 72 insertions(+), 31 deletions(-)
diff --git a/sub_pages/supplier/order-settlement/order-settlement-detail.vue b/sub_pages/supplier/order-settlement/order-settlement-detail.vue
index d51ec47..68b8a6a 100644
--- a/sub_pages/supplier/order-settlement/order-settlement-detail.vue
+++ b/sub_pages/supplier/order-settlement/order-settlement-detail.vue
@@ -55,40 +55,58 @@
</view> -->
<view class="tj-container-p">
<view class="tj-container flex">
- <view class="tj-each flex1">
- <view class="value">￥{{dto.price||'0.00'}}</view>
- <view class="label">结算单价</view>
- </view>
- <view class="tj-each flex1">
- <view class="value">{{dto.flowerNum||'0.00'}}</view>
- <view class="label">商品数量</view>
- </view>
- <view class="tj-each flex1">
- <view class="value">{{dto.orderNum}}</view>
- <view class="label">订单数量</view>
- </view>
- <view class="tj-each flex1">
- <view class="value">{{dto.customerNum}}</view>
- <view class="label">买家数量</view>
- </view>
+ <view class="tj-each flex1">
+ <view class="value">￥{{dto.price||'0.00'}}</view>
+ <view class="label">结算单价</view>
</view>
-
+ <view class="tj-each flex1">
+ <view class="value">{{dto.flowerNum||'0'}}扎</view>
+ <view class="label">商品数量</view>
+ </view>
+ <view class="tj-each flex1">
+ <view class="value">{{dto.orderNum}}</view>
+ <view class="label">订单数量</view>
+ </view>
+ <view class="tj-each flex1">
+ <view class="value">{{dto.customerNum}}</view>
+ <view class="label">买家数量</view>
+ </view>
+ </view>
+
+ <view class="tj-container m-t-12 flex">
+ <view class="tj-each flex1">
+ <view class="value">{{dto.salesFee}}</view>
+ <view class="label">售后理赔</view>
+ </view>
+ <view class="tj-each flex1">
+ <view class="value">{{dto.lackFee}}</view>
+ <view class="label">缺货扣款</view>
+ </view>
+ <view class="tj-each flex1">
+ <view class="value">{{dto.replaceFee}}</view>
+ <view class="label">补货扣款</view>
+ </view>
+ <view class="tj-each flex1">
+ <view class="value">{{dto.checkFee}}</view>
+ <view class="label">降级扣款</view>
+ </view>
+ </view>
<view class="tj-container m-t-12 flex">
<view class="tj-each flex1">
<view class="value">{{dto.serviceFee}}</view>
<view class="label">服务费</view>
</view>
<view class="tj-each flex1">
- <view class="value">{{dto.salesFee}}</view>
- <view class="label">售后理赔</view>
- </view>
- <view class="tj-each flex1">
- <view class="value">{{dto.checkFee}}</view>
- <view class="label">质检扣款</view>
- </view>
- <view class="tj-each flex1">
<view class="value">{{dto.stationFee}}</view>
<view class="label">集货站运费</view>
+ </view>
+ <view class="tj-each flex1">
+ <view class="value"> </view>
+ <view class="label"> </view>
+ </view>
+ <view class="tj-each flex1">
+ <view class="value"> </view>
+ <view class="label"> </view>
</view>
</view>
</view>
@@ -137,8 +155,18 @@
<view class="value">￥{{item.totalAmount||0}}</view>
</view>
<view class="form-item">
- <view class="label">质检扣款</view>
+ <view class="label">降级扣款</view>
<view class="value">￥{{item.checkFee||'0.00'}}</view>
+ </view>
+ </view>
+ <view class="flex">
+ <view class="form-item">
+ <view class="label">缺货扣款</view>
+ <view class="value">￥{{item.lackFee||'0.00'}}</view>
+ </view>
+ <view class="form-item">
+ <view class="label">补货扣款</view>
+ <view class="value">￥{{item.replaceFee||'0.00'}}</view>
</view>
</view>
<view class="flex">
@@ -171,19 +199,32 @@
}
},
onLoad(options) {
+ console.log('options',options)
this.id = options.id || ''
- if (this.id)
- this.getList()
+ if (this.id){
+ this.getDetail()
+
+ }
},
methods: {
async getDetail() {
+ var turl = ''
+ // #ifdef PUB_SUPPLIER
+ turl = '/api/supplier/settlement/list/view?id='
+ // #endif
+ // #ifdef PUB_PARTNER
+ turl = '/api/partner/settlement/list/view?id='
+ // #endif
+ console.log('turl',turl)
+
+
this.$message.showLoading()
const {
code,
data
- } = await this.$http.request('get', '/api/partner/settlement/list/view?id=' + this.id, {
+ } = await this.$http.request('get', turl + this.id, {
})
@@ -256,8 +297,8 @@
}
.form {
- display: flex;
- flex-wrap: wrap;
+ // display: flex;
+ // flex-wrap: wrap;
.form-item {
flex: 1;
--
Gitblit v1.9.3