From 6c665f104a9a16a809456bdc00d5841280c1c948 Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Mon, 17 May 2021 11:34:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E5=8D=96=E8=AF=A6=E6=83=85=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order-detail/item-money-info/index.wxml   | 13 +++++--
 pages/agent/order-detail/pound-info/index.js  |  6 ++--
 .../agent/order-detail/pound-info/index.json  |  2 ++
 .../agent/order-detail/pound-info/index.wxml  | 34 ++++++++++++++++---
 4 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/pages/agent/order-detail/item-money-info/index.wxml b/pages/agent/order-detail/item-money-info/index.wxml
index 9107c9d..88cf7fc 100644
--- a/pages/agent/order-detail/item-money-info/index.wxml
+++ b/pages/agent/order-detail/item-money-info/index.wxml
@@ -56,10 +56,14 @@
 				{{formate.formateWeight(item.weightnoteInfo.netWeight)}}吨 -
 				{{formate.formateAmount(item.prepayMoney)}}元</view>
 		</view>
-		<view class="flex flex-justify text-sg" style="margin-top:24rpx;border-top:2rpx solid #f3f3f3;padding-top:24rpx"
+		<!-- <view class="flex flex-justify text-sg" style="margin-top:24rpx;border-top:2rpx solid #f3f3f3;padding-top:24rpx"
 			wx:if="{{item.adjustMoney && item.adjustMoney != 0}}">
 			<text class="text-black">调节费</text>
 			<text style="color:#F5222D">-{{formate.formateAmount(item.adjustMoney)}}元</text>
+		</view> -->
+		<view class="flex flex-justify text-sg" style="margin-top:24rpx;border-top:2rpx solid #f3f3f3;padding-top:24rpx">
+			<text class="text-black">补贴与扣款</text>
+			<text style="color:#F5222D">{{formate.formateAmount(item.totalOtherAmount==null?0:item.totalOtherAmount)}}元</text>
 		</view>
 		<view class="flex flex-justify text-sg" style="margin-top:24rpx;border-top:2rpx solid #f3f3f3;padding-top:24rpx">
 			<text class="text-black text-bold">尾款实收金额：</text>
@@ -97,10 +101,15 @@
 		<view class="text-gray">{{formate.formatePrice(item.unitSurcharge)}}元/吨 x
 			{{formate.formateWeight(item.weightnoteInfo.netWeight)}}吨</view>
 	</view>
-	<view class="flex flex-justify text-sg" style="margin-top:20rpx;border-top:2rpx solid #f3f3f3;padding-top:16rpx"
+	<!-- <view class="flex flex-justify text-sg" style="margin-top:20rpx;border-top:2rpx solid #f3f3f3;padding-top:16rpx"
 		wx:if="{{item.adjustMoney && item.adjustMoney}}">
 		<text class="text-black">调节费</text>
 		<text style="color:#F5222D">{{item.adjustMoney > 0 ? '+' : ''}}{{formate.formateAmount(item.adjustMoney)}}元</text>
+	</view> -->
+	<view class="flex flex-justify text-sg" style="margin-top:20rpx;border-top:2rpx solid #f3f3f3;padding-top:16rpx"
+		wx:if="{{item.adjustMoney && item.adjustMoney}}">
+		<text class="text-black">补贴与扣款</text>
+		<text style="">{{formate.formateAmount(item.totalOtherAmount==null?0:item.totalOtherAmount)}}元</text>
 	</view>
 	<view class="flex flex-justify text-sg" style="margin-top:24rpx;border-top:2rpx solid #f3f3f3;padding-top:20rpx">
 		<text class="text-black text-bold">总收款金额：</text>
diff --git a/pages/agent/order-detail/pound-info/index.js b/pages/agent/order-detail/pound-info/index.js
index 9653dc5..eb48e1a 100644
--- a/pages/agent/order-detail/pound-info/index.js
+++ b/pages/agent/order-detail/pound-info/index.js
@@ -16,13 +16,15 @@ Component({
    * 组件的初始数据
    */
   data: {
-
+    activeNames: []
   },
 
   /**
    * 组件的方法列表
    */
   methods: {
-
+    onChange: function({detail}) {
+      this.setData({ activeNames: detail })
+    }
   }
 })
diff --git a/pages/agent/order-detail/pound-info/index.json b/pages/agent/order-detail/pound-info/index.json
index 4bdaa9d..430facf 100644
--- a/pages/agent/order-detail/pound-info/index.json
+++ b/pages/agent/order-detail/pound-info/index.json
@@ -1,6 +1,8 @@
 {
   "component": true,
   "usingComponents": {
+    "van-collapse": "/components/collapse/index",
+    "van-collapse-item": "/components/collapse-item/index",
     "sudoku-image": "/components/sudoku-image/index"
   }
 }
\ No newline at end of file
diff --git a/pages/agent/order-detail/pound-info/index.wxml b/pages/agent/order-detail/pound-info/index.wxml
index b84fcbc..207c53d 100644
--- a/pages/agent/order-detail/pound-info/index.wxml
+++ b/pages/agent/order-detail/pound-info/index.wxml
@@ -24,14 +24,40 @@
     <text class="text-black">代卖费</text>
     <text class="text-gray">{{formate.formatePrice(item.unitSurcharge==null?0:item.unitSurcharge)}}元/吨</text>
   </view>
-  <view class="flex flex-justify text-sg" style="margin-top:20rpx">
+  <!-- <view class="flex flex-justify text-sg" style="margin-top:20rpx">
     <text class="text-black">调节费</text>
     <text class="text-gray">{{item.adjustMoney > 0 ? '+' : ''}}{{formate.formateAmount(item.adjustMoney)}}元</text>
-  </view>
-  <view class="flex flex-justify text-sg" style="margin-top:20rpx">
+  </view> -->
+</view>
+<view class="bg-white" wx:if="{{item.weightnoteInfo && item.weightnoteInfo.id&&(orderInfo.activityId!=null||item.status>=53)}}">
+  <!--补贴与扣款-->
+  <van-collapse value="{{ activeNames }}" bind:change="onChange">
+    <van-collapse-item content-class="collapse-item" name="1">
+      <view slot="title" class="flex flex-justify">
+        <view class="text-sg text-black">补贴与扣款</view>
+        <view class="text-df text-gray" style="padding-right:16rpx;">{{formate.formateAmount(item.totalOtherAmount==null?0:item.totalOtherAmount)}}元</view>
+      </view>
+      <view style="padding:24rpx 30rpx">
+        <view class="flex flex-justify text-sg" wx:for="{{ item.otherAmountDtoList }}" wx:for-item="cell" wx:for-index="cellIndex" wx:key="cellIndex" style="margin-top:{{cellIndex==0?0:24}}rpx">
+          <text class="text-black">{{cell.title}}</text>
+          <text class="text-gray">{{formate.formateAmount(cell.amount==null?0:cell.amount)}}元</text>
+        </view>
+
+        <view class="flex flex-justify text-sg" style="margin-top:24rpx;align-items: flex-start">
+          <text class="text-black" style="min-width:200rpx">总计</text>
+          <text class="text-gray">{{formate.formateAmount(item.totalOtherAmount==null?0:item.totalOtherAmount)}}元</text>
+        </view>
+        <view class="flex flex-justify text-sg" style="margin-top:24rpx;align-items: flex-end">
+          <text class="text-black" style="min-width:200rpx">备注</text>
+          <text class="text-gray">{{item.deductionNotes==null? '':item.deductionNotes}}</text>
+        </view>
+      </view>
+    </van-collapse-item>
+  </van-collapse>
+  <view class="flex flex-justify text-sg" style="margin-top:20rpx;padding:0rpx 30rpx">
     <text class="text-black">磅单图片</text>
   </view>
-  <view style="margin-top:20rpx">
+  <view style="margin-top:20rpx;padding:0rpx 30rpx 12rpx 30rpx">
     <sudoku-image image-list="{{item.weightnoteInfo.imageUrls}}" square="{{true}}" clickable="{{true}}"></sudoku-image>
   </view>
 </view>
\ No newline at end of file