|
@@ -54,7 +54,7 @@
|
|
|
border-radius: .3rem;
|
|
|
overflow: hidden;
|
|
|
position: absolute;
|
|
|
- bottom: -1.1rem;
|
|
|
+ bottom: -1.9rem;
|
|
|
left: .2rem;
|
|
|
color: #333;
|
|
|
}
|
|
@@ -89,7 +89,7 @@
|
|
|
|
|
|
.handleOrder {
|
|
|
color: #999;
|
|
|
- padding: 1.3rem .2rem .2rem;
|
|
|
+ padding: 0rem .2rem .2rem;
|
|
|
}
|
|
|
|
|
|
.handleOrder span:last-child {
|
|
@@ -170,6 +170,21 @@
|
|
|
.list-b {
|
|
|
color: #999;
|
|
|
}
|
|
|
+
|
|
|
+ .downLoadCon {
|
|
|
+ position: relative;
|
|
|
+ }
|
|
|
+
|
|
|
+ .finishImg {
|
|
|
+ width: 1rem;
|
|
|
+ height: 1rem;
|
|
|
+ position: absolute;
|
|
|
+ right: .06rem;
|
|
|
+ bottom: -.1rem;
|
|
|
+ }
|
|
|
+ .amount_list{
|
|
|
+ margin-bottom: 0.06rem;
|
|
|
+ }
|
|
|
</style>
|
|
|
</head>
|
|
|
|
|
@@ -185,29 +200,44 @@
|
|
|
<div class="tipDesc">
|
|
|
以下是您在本店的未结账单,请查阅。
|
|
|
</div>
|
|
|
- <div class="orderInfo">
|
|
|
- <div class="flex align_center flex-between">
|
|
|
+ <div class="orderInfo" :style="{bottom:(info.discountAmount && info.discountAmount*1 !=0 ? '-1.9rem':'-1.3rem' )}">
|
|
|
+ <div class="amount_list flex align_center flex-between">
|
|
|
<span class="amountName">货款金额</span>
|
|
|
- <span class="amount" v-if="info.settleAmount">¥{{toThousands(info.settleAmount,2)}}</span>
|
|
|
+ <span class="amount" v-if="info.settleAmount">¥{{toThousands(info.totalAmount,2)}}</span>
|
|
|
<span class="amount" v-else>¥0.00</span>
|
|
|
</div>
|
|
|
- <div class="downLoadTip">
|
|
|
- 单据明细Excel下载请点击下面的链接:
|
|
|
+ <div v-if="info.discountAmount && info.discountAmount*1 !=0">
|
|
|
+ <div class="amount_list flex align_center flex-between">
|
|
|
+ <span class="amountName">折让金额</span>
|
|
|
+ <span class="amount" v-if="info.settleAmount">¥{{toThousands(info.discountAmount,2)}}</span>
|
|
|
+ <span class="amount" v-else>¥0.00</span>
|
|
|
+ </div>
|
|
|
+ <div class="amount_list flex align_center flex-between">
|
|
|
+ <span class="amountName">折后金额</span>
|
|
|
+ <span class="amount" v-if="info.settleAmount">¥{{toThousands(info.settleAmount,2)}}</span>
|
|
|
+ <span class="amount" v-else>¥0.00</span>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
- <div class="downLoadUrl" @click="downLoad">
|
|
|
- http://iscm.360arrow.com/bill/对账单明细.xls
|
|
|
+ <div class="downLoadCon">
|
|
|
+ <div class="downLoadTip">
|
|
|
+ 单据明细Excel下载请点击下面的链接:
|
|
|
+ </div>
|
|
|
+ <div class="downLoadUrl" @click="downLoad">
|
|
|
+ http://iscm.360arrow.com/bill/对账单明细.xls
|
|
|
+ </div>
|
|
|
+ <img v-if="info.billStatus != 'UNSETTLE'" src="./img/finishImg.png" alt="" class="finishImg">
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div class="orderCon flex flex-column">
|
|
|
- <div class="handleOrder flex flex-between align_center">
|
|
|
+ <div class="orderCon flex flex-column" :style="{paddingTop:(info.discountAmount && info.discountAmount*1 !=0 ? '2.1rem':'1.5rem' )}">
|
|
|
+ <div class="handleOrder flex flex-between align_center" >
|
|
|
<span>共{{saleList ? saleList.length : 0}}个销售单</span>
|
|
|
<span v-if="!flag" @click="openAll">全部展开</span>
|
|
|
<span v-else @click="openAll">全部关闭</span>
|
|
|
</div>
|
|
|
<div class="oederBox">
|
|
|
<div v-for="(item,i) in saleList" :key="item.bizSn">
|
|
|
- <div class="oederList flex align_center" @click="handleShow(item,i)">
|
|
|
+ <div class="oederList flex align_center" @click="openInfoList(i)">
|
|
|
<div class="order-l">
|
|
|
<div class="order-t flex align_center flex-between">
|
|
|
<span>{{item.bizDate.substr(0,10)}}</span>
|
|
@@ -227,7 +257,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="otherList" v-show="item.isShow">
|
|
|
- <div class="list" v-for="(con,j) in saleDetailList" :key="con.id">
|
|
|
+ <div class="list" v-for="(con,j) in item.list" :key="con.id">
|
|
|
<div class="list-t flex align_center flex-between">
|
|
|
<span>{{con.dealerProductEntity.code}}</span>
|
|
|
<span>¥{{con.price?toThousands(con.price,2):0}}</span>
|
|
@@ -269,56 +299,32 @@
|
|
|
this.info = res.data.data;
|
|
|
res.data.data.detailList.forEach(item => {
|
|
|
item.isShow = false;
|
|
|
+ item.list = []
|
|
|
})
|
|
|
this.saleList = res.data.data.detailList;
|
|
|
- // if (res.data.data.bizBeginDate && res.data.data.bizEndDate) {
|
|
|
- // this.time = res.data.data.bizBeginDate.split(' ')[0] + '至' + res.data.data
|
|
|
- // .bizEndDate.split(' ')[0]
|
|
|
- // }
|
|
|
+ this.getALlList(res.data.data.detailList)
|
|
|
}).catch((error) => {
|
|
|
console.log(error);
|
|
|
});
|
|
|
},
|
|
|
- handleShow(con, i, type = 1) {
|
|
|
+ handleShow(con,i) {
|
|
|
let req_data = {
|
|
|
salesBillSn: con.bizSn
|
|
|
}
|
|
|
axios.post(this.ajaxUrl + 'salesDetail/queryList', req_data).then((res) => {
|
|
|
- this.saleDetailList = res.data.data;
|
|
|
- if (type == 1) {
|
|
|
- this.saleList[i].isShow = !this.saleList[i].isShow;
|
|
|
- } else {
|
|
|
- if (this.flag) {
|
|
|
- this.saleList[i].isShow = true
|
|
|
- } else {
|
|
|
- this.saleList[i].isShow = false
|
|
|
- }
|
|
|
-
|
|
|
- }
|
|
|
+ this.saleList[i].list= res.data.data;
|
|
|
}).catch((error) => {
|
|
|
console.log(error);
|
|
|
});
|
|
|
|
|
|
},
|
|
|
+ openInfoList(i) {
|
|
|
+ this.saleList[i].isShow = !this.saleList[i].isShow
|
|
|
+ this.saleList.splice()
|
|
|
+ },
|
|
|
downLoad() {
|
|
|
- let ajaxData = {
|
|
|
- verifySn: this.getUrlParam('verifySn'),
|
|
|
- dealerSn: this.getUrlParam('userSn')
|
|
|
- }
|
|
|
- window.location.href = this.ajaxUrl + 'verify/exportExcel?verifySn='+ this.getUrlParam('verifySn') +'&dealerSn='+this.getUrlParam('userSn')
|
|
|
- // axios.get(this.ajaxUrl + 'verify/exportExcel', {
|
|
|
- // params: ajaxData
|
|
|
- // }, {
|
|
|
- // responseType: 'blob',
|
|
|
- // dataType: "jsonp",
|
|
|
- // jsonp: "callback"
|
|
|
- // }).then((res) => {
|
|
|
- // if (res.status == 200) {
|
|
|
- // downloadExcel(res.data, '对账单明细')
|
|
|
- // }
|
|
|
- // }).catch((error) => {
|
|
|
- // console.log(error);
|
|
|
- // });
|
|
|
+ window.location.href = this.ajaxUrl + 'verify/exportExcel?verifySn=' + this.getUrlParam(
|
|
|
+ 'verifySn') + '&dealerSn=' + this.getUrlParam('userSn')
|
|
|
},
|
|
|
getUrlParam(name) {
|
|
|
var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)"); //构造一个含有目标参数的正则表达式对象
|
|
@@ -329,7 +335,17 @@
|
|
|
openAll() {
|
|
|
this.flag = !this.flag;
|
|
|
this.saleList.forEach((item, i) => {
|
|
|
- this.handleShow(item, i, 0);
|
|
|
+ if(this.flag){
|
|
|
+ item.isShow = true;
|
|
|
+ }else{
|
|
|
+ item.isShow = false;
|
|
|
+ }
|
|
|
+
|
|
|
+ })
|
|
|
+ },
|
|
|
+ getALlList(list) {
|
|
|
+ list.forEach((item, i) => {
|
|
|
+ this.handleShow(item,i);
|
|
|
})
|
|
|
}
|
|
|
}
|