From f8867b8df117d1ac0f1311970994e15059c3da03 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期四, 05 九月 2024 15:57:36 +0800
Subject: [PATCH] add 兼容扫码问题
---
sub_pages/supplier/order-manage/order-manage-settlement.vue | 111 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 83 insertions(+), 28 deletions(-)
diff --git a/sub_pages/supplier/order-manage/order-manage-settlement.vue b/sub_pages/supplier/order-manage/order-manage-settlement.vue
index cdaf2a9..9b8293a 100644
--- a/sub_pages/supplier/order-manage/order-manage-settlement.vue
+++ b/sub_pages/supplier/order-manage/order-manage-settlement.vue
@@ -13,8 +13,8 @@
<view class="t-red">已结算：￥{{tj_has||0}}</view>
</view>
</view>
- <view v-for="(item,index) in list" :key="index" @click="toDetail(item)"
- class="m-t-20 order-sale-list list-container">
+ <!-- @click="toDetail(item)" -->
+ <view v-for="(item,index) in list" :key="index" class="m-t-20 order-sale-list list-container">
<view class="order-sale-item br-4 list-item bg-white">
@@ -38,47 +38,77 @@
</view>
<view class="flex form-item">
<view class="m-r-20 flex" style="min-width: 280rpx;">
- <view class="desc-gray m-r-10">下单时间</view>
- <view class="desc-gray ">{{item.orderTime||item.orderTime || '-'}}</view>
+ <view class="desc-gray m-r-5">下单时间</view>
+ <view class=" ">{{item.orderTime||item.orderTime || '-'}}</view>
</view>
<view class="flex flex1">
- <view class="flex1 text-center value "><span class="desc-gray m-r-10">数量</span>{{item.num||0}}扎
+ <view class="flex1 text-center value "><span
+ class="desc-gray m-r-5">数量</span>{{item.num||0}}扎
</view>
<view class="flex1 text-center value"><span
- class="desc-gray m-r-10">合计</span>￥{{item.totalAmount||'0.00'}}</view>
+ class="desc-gray m-r-5">合计</span>￥{{item.totalAmount||'0.00'}}</view>
</view>
</view>
- <view>
+ <view v-if="item.status">
+ <view class="flex">
+ <view class="form-item">
+ <view class="label">收入</view>
+ <view class="value">{{item.income||0}}</view>
+ </view>
+ <view class="form-item">
+ <view class="label">集货站运费</view>
+ <view class="value">{{item.stationFee||0}}</view>
+ </view>
+
+ </view>
<view class="flex">
<view class="form-item">
<view class="label">服务费</view>
<view class="value">{{item.serviceFee||0}}</view>
</view>
<view class="form-item">
- <view class="label">售后理赔</view>
- <view class="value">{{item.salesFee||0}}</view>
- </view>
- </view>
- <view class="flex">
- <view class="form-item">
- <view class="label">质检扣款</view>
- <view class="value">{{item.checkFee||0}}</view>
- </view>
- <view class="form-item">
- <view class="label">集货站运费</view>
- <view class="value">{{item.stationFee||0}}</view>
- </view>
- </view>
- <view class="flex">
- <view class="form-item">
<view class="label">服务费率</view>
<view class="value">{{item.serviceFeeRate||0}}</view>
</view>
+
+ </view>
+ <view class="flex">
<view class="form-item">
- <view class="label">收入</view>
- <view class="value">{{item.income||0}}</view>
+ <view class="label">售后退款</view>
+ <view class="value">{{item.salesFee||0}}</view>
+ </view>
+
+ </view>
+ <view class="flex">
+ <view class="form-item">
+ <view class="label">缺货数量</view>
+ <view class="value">{{item.lackNum||0}}</view>
+ </view>
+ <view class="form-item">
+ <view class="label">缺货扣款</view>
+ <view class="value">{{item.lackFee||0}}</view>
+ </view>
+ </view>
+ <view class="flex">
+ <view class="form-item">
+ <view class="label">补货数量</view>
+ <view class="value">{{item.replaceNum||0}}</view>
+ </view>
+ <view class="form-item">
+ <view class="label">补货扣款</view>
+ <view class="value">{{item.replaceFee||0}}</view>
+ </view>
+ </view>
+ <view class="flex">
+ <view class="form-item">
+ <view class="label">降级数量</view>
+ <view class="value">{{item.checkNum||0}}</view>
+ </view>
+ <view class="form-item">
+ <view class="label">降级扣款</view>
+ <view class="value">{{item.checkFee||0}}</view>
</view>
</view>
</view>
@@ -95,6 +125,17 @@
</view>
</view>
</view> -->
+ <view class="component-buttons m-t-15" style="width: unset;">
+ <view class="button-1 m-l-a m-r-10" v-if="!(item.salesNum===0)" @click.stop="toOpDetail('sale','售后',item)">
+ 售后详情</view>
+ <view class="button-1 m-l-a m-r-10" v-if="item.checkNum"
+ @click.stop="toOpDetail('reduce','降级',item)">降级详情</view>
+ <view class="button-1 m-l-a m-r-10" v-if="item.lackNum" @click.stop="toOpDetail('lack','缺货',item)">
+ 缺货详情</view>
+ <view class="button-1 m-l-a m-r-10" v-if="item.replaceNum"
+ @click.stop="toOpDetail('replace','补货',item)">补货详情</view>
+
+ </view>
</view>
</view>
</view>
@@ -142,6 +183,20 @@
uni.stopPullDownRefresh()
},
methods: {
+ toOpDetail(op, title, item) {
+ if (op === 'sale') {
+ //去列表页面
+ uni.navigateTo({
+ url: '/pages/order/order-sale/order-sale?orderItemId=' + item.orderItemId
+ })
+ } else {
+ var opStr = ''
+ uni.navigateTo({
+ url: `/sub_pages/supplier/order-manage/order-manage-settlement-op-detail?opStr=${opStr}&op=${op}&orderItemId=${item.orderItemId}`
+ })
+ }
+
+ },
//选择timer的时间
async select_time_picker_time(e) {
// console.log('select_time_picker_time1', e, this.tmp_picker_time_item)
@@ -154,9 +209,9 @@
this.refreshList()
},
toDetail(item) {
- uni.navigateTo({
- url: `/sub_pages/supplier/order-settlement/order-settlement-detail?id=${item.id}`
- })
+ // uni.navigateTo({
+ // url: `/sub_pages/supplier/order-settlement/order-settlement-order-item-detail?id=${item.orderItemId}`
+ // })
},
},
computed: {
--
Gitblit v1.9.3