shish пре 1 година
родитељ
комит
a144fd4f40
1 измењених фајлова са 5 додато и 13 уклоњено
  1. 5 13
      hdApp/src/admin/custom/balanceChange.vue

+ 5 - 13
hdApp/src/admin/custom/balanceChange.vue

@@ -23,20 +23,12 @@
                             <view class="table-cell cell-amount">{{ item.amount }}</view>
                             <view class="table-cell cell-amount">{{ item.amount }}</view>
                             <view class="table-cell cell-balance">{{ parseFloat(item.balance) }}</view>
                             <view class="table-cell cell-balance">{{ parseFloat(item.balance) }}</view>
                         </view>
                         </view>
-                        <!-- 备注 -->
-                        <view
-                            v-if="!$util.isEmpty(item.remark)"
-                            class="table-row table-row-remark"
-                        >
-                            <view class="table-cell cell-remark" :colspan="5">
-                                备注:<text>{{ item.remark }}</text>
-                            </view>
-                        </view>
-                        <!-- 结清账单等信息 -->
-                        <view class="table-row table-row-extra">
+                        <view class="table-row table-row-extra" v-if="Number(item.settleId)>0 || Number(item.orderId)>0 || !$util.isEmpty(item.remark)">
                             <view class="table-cell cell-extra" :colspan="5">
                             <view class="table-cell cell-extra" :colspan="5">
-                                <view>结清账单(编号 CL531578) 380元</view>
-                                <view>消除订单(编号 XSD534789)的欠款35元</view>
+                                <view v-if="Number(item.settleId)>0">结清账单(编号 {{item.settleNo}}) {{item.settleAmount?parseFloat(item.settleAmount):0}}元</view>
+                                <view v-if="Number(item.orderId)>0">消除订单(编号 {{item.orderNo}})欠款{{item.orderAmount?parseFloat(item.orderAmount):0}}元</view>
+                                <view v-if="Number(item.orderAmount)>0 || Number(item.settleAmount)>0">剩下{{item.becomeBalance}}元,存入余额</view>
+                                <view v-if="!$util.isEmpty(item.remark)">{{ item.remark }}</view>
                             </view>
                             </view>
                         </view>
                         </view>
                     </view>
                     </view>