|
|
@@ -60,6 +60,16 @@
|
|
|
</text>
|
|
|
<text class="item-count" style="color:#3385ff;font-size:28upx;">查看明细</text>
|
|
|
</view>
|
|
|
+ <!-- 部分销：备注式小字，独立一行自然换行 -->
|
|
|
+ <view v-if="showOrderClearLinks(s)" class="order-clear-remark" @click.stop>
|
|
|
+ <text class="order-clear-remark__label">总共{{ s.orderClearList.length }}个结账单：</text>
|
|
|
+ <text
|
|
|
+ v-for="(bill, billIndex) in s.orderClearList"
|
|
|
+ :key="billIndex"
|
|
|
+ class="order-clear-remark__link"
|
|
|
+ @click.stop="goClearBill(bill)"
|
|
|
+ ><text v-if="billIndex > 0" class="order-clear-remark__sep">、</text>{{ bill.clearSn ? bill.clearSn : ('结账单' + (billIndex + 1)) }}<text v-if="Number(bill.amount)>0" class="order-clear-remark__amt">销¥{{ parseFloat(bill.amount) }}</text></text>
|
|
|
+ </view>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -156,6 +166,24 @@ export default {
|
|
|
}
|
|
|
this.pageTo({url: '/pagesPurchase/purDetails',query: {id: s.id,}})
|
|
|
},
|
|
|
+ /** 部分销或多张结账单：是否展示订单关联结账单链接 */
|
|
|
+ showOrderClearLinks(order) {
|
|
|
+ if (this.$util.isEmpty(order) || this.$util.isEmpty(order.orderClearList)) {
|
|
|
+ return false
|
|
|
+ }
|
|
|
+ if (Number(order.remainDebtPrice) > 0) {
|
|
|
+ return true
|
|
|
+ }
|
|
|
+ return order.orderClearList.length > 1
|
|
|
+ },
|
|
|
+ /** 部分销订单：跳转对应结账单详情 */
|
|
|
+ goClearBill(item) {
|
|
|
+ const id = item && item.clearId ? item.clearId : 0
|
|
|
+ if (!id) {
|
|
|
+ return
|
|
|
+ }
|
|
|
+ this.pageTo({ url: '/admin/clear/info', query: { id } })
|
|
|
+ },
|
|
|
cancelFn(info){
|
|
|
if(this.notLogin()){
|
|
|
this.remindLogin()
|
|
|
@@ -297,7 +325,6 @@ export default {
|
|
|
.commodity-list {
|
|
|
padding: 20upx;
|
|
|
.commodity-item {
|
|
|
- display: flex;
|
|
|
margin-bottom: 20upx;
|
|
|
.item-icon {
|
|
|
flex-shrink: 0;
|
|
|
@@ -308,8 +335,6 @@ export default {
|
|
|
display: flex;
|
|
|
flex-direction: column;
|
|
|
justify-content: center;
|
|
|
- flex: 1;
|
|
|
- margin-left: 20upx;
|
|
|
.info-line {
|
|
|
margin-bottom: 20upx;
|
|
|
display: flex;
|
|
|
@@ -336,6 +361,30 @@ export default {
|
|
|
font-size: 24upx;
|
|
|
}
|
|
|
}
|
|
|
+ .info-line:last-of-type {
|
|
|
+ margin-bottom: 0;
|
|
|
+ }
|
|
|
+ .order-clear-remark {
|
|
|
+ margin-top: 12upx;
|
|
|
+ line-height: 1.6;
|
|
|
+ word-break: break-all;
|
|
|
+ }
|
|
|
+ .order-clear-remark__label {
|
|
|
+ font-size: 26upx;
|
|
|
+ color: #999;
|
|
|
+ }
|
|
|
+ .order-clear-remark__link {
|
|
|
+ font-size: 26upx;
|
|
|
+ color: #3385ff;
|
|
|
+ font-weight: normal;
|
|
|
+ }
|
|
|
+ .order-clear-remark__sep {
|
|
|
+ font-size: 26upx;
|
|
|
+ color: #999;
|
|
|
+ }
|
|
|
+ .order-clear-remark__amt {
|
|
|
+ margin-left: 6upx;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
