结账单

hdApp/src/admin/order/detail.vue

@@ -87,19 +87,6 @@
         <view class="module-det">
           <view class="order-msg-blo">
 
-            <view class="msg-list" v-if="Number(dj)>0 && Number(orderInfo.remainDebtPrice)>0">
-              <view class="label">订金：</view>
-              <view class="value">￥{{dj}}</view>
-            </view>
-            <view class="msg-list" v-if="Number(orderInfo.remainDebtPrice)>0" style="position:relative;">
-              <view class="label" style="color:red;">欠款：</view>
-              <view class="value" style="color:red;font-weight:bold;">
-                ￥{{ orderInfo.remainDebtPrice ? parseFloat(orderInfo.remainDebtPrice) : 0 }}
-                <text v-if="Number(orderInfo.remainDebtPrice)<=0" style="margin-left:20upx;">已结清</text>
-                </view>
-              <button class="admin-button-com mini-btn" v-if="Number(orderInfo.remainDebtPrice)>0" @click="clear(orderInfo)" style="position:absolute;right:0upx;top:0;border:1upx solid red;color:red;">结清</button>
-            </view>
-
             <view class="msg-list">
               <view class="label">状态：</view>
               <view class="value">{{orderInfo.status == 1?'待付款':orderInfo.status==2?'待发货':orderInfo.status == 3?'待收货':orderInfo.status ==4?'已完成':orderInfo.status == 5?'已取消':'待付款'}}</view>
@@ -115,16 +102,45 @@
             </view>
             <view class="msg-list" v-if="orderInfo.payStatus == 1">
               <view class="label">方式：</view>
+              <block v-if="orderInfo.payWay==3">
+                <view class="value" v-if="Number(orderInfo.remainDebtPrice)>0" style="color:red;font-weight:bold;">
+                  赊账
+                </view>
+                <view v-else class="value"  style="color:#3385ff;font-weight:bold;">
+                  赊账<text>（已结清）</text>
+                </view>
+              </block>
+              <view class="value" v-else>
+                {{ orderInfo.payWay == 0 ? '微信支付':orderInfo.payWay==1?'支付宝':orderInfo.payWay==2?'余额':orderInfo.payWay==4?'现金':orderInfo.payWay==5 ?'银行卡' :'其它'}}
+                <text v-if="Number(orderInfo.mainPay)>0 && Number(orderInfo.cash)>0">（现金付了￥{{ orderInfo.cash ? parseFloat(orderInfo.cash) : 0 }}）</text>
+              </view>
+            </view>
+            <view class="msg-list" v-if="Number(dj)>0 && Number(orderInfo.remainDebtPrice)>0">
+              <view class="label">订金：</view>
+              <view class="value">￥{{dj}}</view>
+            </view>
+            <view class="msg-list" v-if="Number(orderInfo.remainDebtPrice)>0" style="position:relative;">
+              <view class="label">欠款：</view>
+              <view class="value" style="color:red;font-weight:bold;">
+                ￥{{ orderInfo.remainDebtPrice ? parseFloat(orderInfo.remainDebtPrice) : 0 }}
+                </view>
+              <button class="admin-button-com mini-btn" v-if="Number(orderInfo.remainDebtPrice)>0" @click="clear(orderInfo)" style="position:absolute;right:0upx;top:0;border:1upx solid red;color:red;">结清</button>
+            </view>
+
+            <view class="msg-list" v-if="!$util.isEmpty(orderInfo.orderSettleList)">
+              <view class="label">账单：</view>
               <view class="value">
-                {{ orderInfo.payWay == 0 ? '微信支付':orderInfo.payWay==1?'支付宝':orderInfo.payWay==2?'余额':orderInfo.payWay==4?'现金':orderInfo.payWay==5 ?'银行卡' : orderInfo.payWay==3 ?'欠款':'其它'}}
-                <text v-if="Number(orderInfo.mainPay)>0 && Number(orderInfo.cash)>0">（现金付￥{{ orderInfo.cash ? parseFloat(orderInfo.cash) : 0 }}）</text>
-                <text v-if="Number(orderInfo.settleId)>0" style="color:red;font-weight:bold;">（已结清）</text>
+                <text v-for="(osItem, osIndex) in orderInfo.orderSettleList" :key="osIndex" style="margin-right:10upx;color:#3385ff;" @click="goSettle(osItem)">
+                  {{ osItem.settleSn!=''? osItem.settleSn:'结账单'+osIndex }}
+                </text>
               </view>
             </view>
+
             <view class="msg-list">
               <view class="label">时间：</view>
               <view class="value">{{ orderInfo.addTime ? orderInfo.addTime.substr(5,11) : ''}}</view>
             </view>
+
             <view class="msg-list" v-if="orderInfo.status == 1">
               <view class="label">过期：</view>
               <view class="value">{{ orderInfo.deadline?orderInfo.deadline:''}}</view>
@@ -280,6 +296,9 @@ export default {
         }
       })
     },
+    goSettle(item){
+      this.$util.pageTo({url:'/admin/settle/detail?id='+item.settleId})
+    },
     getCustomInfo(item){
       this.$util.pageTo({url:'/admin/member/detail?id='+item.customId})
     },

hdApp/src/admin/settle/detail.vue

@@ -68,14 +68,11 @@
 									<text class="item-name">{{ s.orderSn }} 时间 {{s.payTime ? s.payTime.substr(5,11):''}}</text>
 									<text class="item-price">
 										<text class="unit">¥</text>
-										<text class="price">{{ s.actPrice?parseFloat(s.actPrice):0 }}</text>
+										<text class="price">{{ s.actSettleAmount?parseFloat(s.actSettleAmount):0 }}</text>
 									</text>
 								</view>
 								<view class="info-line">
 									<text class="item-type">
-										<text v-if="Number(s.bigNum)>0">{{s.bigNum}}扎</text>
-										<text v-if="Number(s.smallNum)>0">{{s.smallNum}}支</text>
-										<text style="margin-left:20upx;color:red;font-weight:bold;" v-if="Number(s.tkPrice)>0">已退款¥{{parseFloat(s.tkPrice)}}</text>
 									</text>
 									<text class="item-count" style="color: #3385ff;">查看明细</text>
 								</view>