欠账的清理

hdApp/src/admin/custom/balanceChange.vue

@@ -17,11 +17,16 @@
                             <view class="table-cell cell-amount">{{ item.amount }}</view>
                             <view class="table-cell cell-balance">{{ parseFloat(item.balance) }}</view>
                         </view>
-                        <view class="table-row table-row-extra" v-if="Number(item.settleId)>0 || Number(item.orderId)>0 || !$util.isEmpty(item.remark)">
+                        <view class="table-row table-row-extra" v-if="Number(item.settleId)>0 || !$util.isEmpty(item.remark) || Number(item.refundOrderId)>0 || Number(item.shOrderId)>0">
                             <view class="table-cell cell-extra" :colspan="5">
-                                <view v-if="Number(item.settleId)>0" @click="goSettle(item)">结账单 {{item.settleNo}} {{item.settleAmount?parseFloat(item.settleAmount):0}}元</view>
+                                <view v-if="Number(item.settleId)>0" @click.stop="goSettle(item)">结账单 {{item.settleNo}} {{item.settleAmount?parseFloat(item.settleAmount):0}}元</view>
+                                
                                 <view v-if="Number(item.settleAmount)>0 && Number(item.becomeBalance)>0">余额 {{item.becomeBalance}}元</view>
-                                <view v-if="Number(item.shOrderId)>0" @click="goShOrder(item)">售后付款单{{ item.shOrderSn }}</view>
+                                
+                                <view v-if="Number(item.shOrderId)>0" @click.stop="goShPayOrder(item)">售后付款单{{ item.shOrderSn }}</view>
+
+                                <view v-if="Number(item.refundOrderId)>0" @click.stop="goRefundOrder(item)">订单 {{ item.refundOrderSn }}</view>
+
                                 <view v-if="!$util.isEmpty(item.remark)">{{ item.remark }}</view>
                             </view>
                         </view>
@@ -48,7 +53,10 @@
             };
         },
         methods: {
-            goShOrder(item){
+            goRefundOrder(item){
+                this.$util.pageTo({ url: '/admin/order/detail?id='+item.refundOrderId})
+            },
+            goShPayOrder(item){
                 this.$util.pageTo({ url: '/admin/order/detail?id='+item.shOrderId})
             },
             goSettle(item){
@@ -59,6 +67,10 @@
                     //订单详情
                     this.$util.pageTo({url: '/admin/order/detail?id='+item.relateId})
                 }
+                if(item.capitalType == 59){
+                    //售后单
+                    this.$util.pageTo({url: '/admin/order/refundDetail?id='+item.relateId})
+                }
             },
             async init(){
                 let id = this.option.id ? this.option.id : 0

hdApp/src/admin/order/debtItem.vue

@@ -45,7 +45,7 @@ export default {
 			}
 		},
 		goToDetai(item){
-			this.$util.pageTo({url: "/admin/order/detail?id="+item.id})
+			this.$util.pageTo({url: "/pages/order/detail?id="+item.id})
 		}
 	}
 };

hdApp/src/admin/order/refundDetail.vue

@@ -6,7 +6,7 @@
 			<view class="section-title">退货商品</view>
 			<view class="section-content">
 				<template v-if="!$util.isEmpty(itemList)">
-					<view class="goods-item" v-for="(res,i) in itemList" :key="'item-'+i">
+					<view class="goods-item" v-for="(res,itemIndex) in itemList" :key="itemIndex">
 						<view class="goods-name">{{res.name}}</view>
 						<view class="goods-detail">
 							<text>{{res.num}}{{res.unitName}} × ￥{{parseFloat(res.unitPrice)}} = </text>
@@ -15,7 +15,7 @@
 					</view>
 				</template>
 				<template v-if="!$util.isEmpty(goodsList)">
-					<view class="goods-item" v-for="(res,i) in goodsList" :key="'goods-'+i">
+					<view class="goods-item" v-for="(res,goodsIndex) in goodsList" :key="goodsIndex">
 						<view class="goods-name">{{res.name}}</view>
 						<view class="goods-detail">
 							<text>{{res.num}}份 × ￥{{parseFloat(res.unitPrice)}} = </text>

mallApp/src/pages/balance/changeList.vue

@@ -17,10 +17,16 @@
                             <view class="table-cell cell-amount">{{ item.amount }}</view>
                             <view class="table-cell cell-balance">{{ parseFloat(item.balance) }}</view>
                         </view>
-                        <view class="table-row table-row-extra" v-if="Number(item.settleId)>0 || Number(item.orderId)>0 || !$util.isEmpty(item.remark)">
+                        <view class="table-row table-row-extra" v-if="Number(item.settleId)>0 || !$util.isEmpty(item.remark) || Number(item.refundOrderId)>0 || Number(item.shOrderId)>0">
                             <view class="table-cell cell-extra" :colspan="5">
                                 <view v-if="Number(item.settleId)>0">结账单 {{item.settleNo}} {{item.settleAmount?parseFloat(item.settleAmount):0}}元</view>
+                                
                                 <view v-if="Number(item.settleAmount)>0 && Number(item.becomeBalance)>0">余额 {{item.becomeBalance}}元</view>
+                                
+                                <view v-if="Number(item.shOrderId)>0" @click.stop="goShPayOrder(item)">售后付款单{{ item.shOrderSn }}</view>
+
+                                <view v-if="Number(item.refundOrderId)>0" @click.stop="goRefundOrder(item)">订单 {{ item.refundOrderSn }}</view>
+
                                 <view v-if="!$util.isEmpty(item.remark)">{{ item.remark }}</view>
                             </view>
                         </view>
@@ -47,6 +53,21 @@
             };
         },
         methods: {
+            goDetail(item){
+                if(item.capitalType == 0){
+                    //订单详情
+                    this.$util.pageTo({url: '/pages/order/detail?id='+item.relateId})
+                }
+                if(item.capitalType == 59){
+                    //售后单和售后记录还没有开发
+                }
+            },
+            goShPayOrder(item){
+                this.$util.pageTo({ url: '/pages/order/detail?id='+item.shOrderId})
+            },
+            goRefundOrder(item){
+                this.$util.pageTo({ url: '/pages/order/detail?id='+item.refundOrderId})
+            },
             async init(){
                 let id = this.option.id ? this.option.id : 0
                 const res = await getBalanceChangeList({ page:this.list.page,customId:id })

mallApp/src/pages/settle/components/debtItem.vue

@@ -12,10 +12,16 @@
         <view class="mark">{{ info.addTime.substr(5,11) }}</view>
       </view>
       <view class="item-row">
-        <view class="price">¥{{ parseFloat(info.remainDebtPrice) }}</view>
+        <view :class="[Number(info.debtPrice)>Number(info.remainDebtPrice) ? 'price-del' : 'price']" >¥{{ parseFloat(info.debtPrice) }}</view>
         <view class="price" style="border:1upx solid #67a0f7;border-radius:10upx;font-weight:normal;color:#3385FF;font-size:32upx;width:180upx;height:80upx;justify-content:center;"
          @click.stop="goToDetai(info)">查看明细</view>
       </view>
+			<block v-if="Number(info.debtPrice)>Number(info.remainDebtPrice)">
+				<view class="item-row">
+					<view class="price" style="color:red;">已清 ¥{{ info.hasPayDebt }}，剩余欠款 ¥{{ parseFloat(info.remainDebtPrice) }}</view>
+				</view>
+			</block>
+
     </view>
   </view>
 </template>
@@ -108,6 +114,18 @@ export default {
         color: #999999;
       }
     }
+		.price-del {
+			display: flex;
+			align-items: center;
+			font-size: 28upx;
+			font-weight: 600;
+			color: #333333;
+			text-decoration: line-through;
+			.iconfont {
+				font-size: 28upx;
+				color: #999999;
+			}
+		}
   }
 }
 </style>

mallApp/src/pages/settle/debt.vue

@@ -12,14 +12,7 @@
     </view>
     <view scroll-y class="shop-list">
       <block v-if="!$util.isEmpty(detailsList)">
-        <debtItem
-          v-for="(item, index) in detailsList"
-          :key="index"
-          :isEdit="true"
-          :isCheck="item.checked"
-          :info="item"
-          @click.native="checkItemEvent(item)"
-        ></debtItem>
+        <debtItem v-for="(item, index) in detailsList" :key="index" :isEdit="true" :isCheck="item.checked" :info="item" @click.native="checkItemEvent(item)" ></debtItem>
       </block>
       <block v-else>
         <AppWrapperEmpty title="暂无数据" :is-empty="$util.isEmpty(detailsList)" />