Skip to content

上
上药订单生命周期升级
Commit 4e98e6c5 authored by 琉璃丶c's avatar 琉璃丶c
Browse files
Options

1.添加发票接口调用

parent 55d7158e
Show whitespace changes
Inline Side-by-side
Showing with 113 additions and 59 deletions
src/views/myOrder/components/invoiceSimpleItem.vue
View file @ 4e98e6c5
<template> <template>
<div class="invoice-simple-content" @click="onItemClick"> <div class="invoice-simple-content" @click="onItemClick">
<div class="invoice-company"> <!-- <div class="invoice-company">-->
{{item.company}} <!-- {{item.company}}-->
</div> <!-- </div>-->
<div class="invoice-info"><span class="info-key">发票金额:</span><span class="info-value">¥<span>{{moneyFormat(item.ivMoney)}}</span></span></div> <!-- <div class="invoice-info"><span class="info-key">发票号:</span><span class="info-value">{{item.invoiceNo}}</span></div>-->
<div class="invoice-info"><span class="info-key">发票号:</span><span class="info-value">{{item.ivNo}}</span></div> <!-- <div class="invoice-info"><span class="info-key">发票日期:</span><span class="info-value">{{item.invoiceDate}}</span></div>-->
<div class="invoice-info"><span class="info-key">发票日期:</span><span class="info-value">{{item.ivDate}}</span></div> <!-- <div class="invoice-info"><span class="info-key">发票金额:</span><span class="info-value">¥<span>{{moneyFormat(item.totalTaxAmount)}}</span></span></div>-->
<div class="invoice-info">发票号:<span>{{item.invoiceNo}}</span></div>
<div class="invoice-info">发票日期:<span>{{item.invoiceDate}}</span></div>
<div class="invoice-info">发票金额:<span class="inv-money">¥{{moneyFormat(item.totalTaxAmount)}}</span></div>
</div> </div>
</template> </template>
...@@ -18,10 +21,10 @@ export default { ...@@ -18,10 +21,10 @@ export default {
type: Object, type: Object,
default: () => { default: () => {
return { return {
company: '上药控股新药分公司', company: '',
ivMoney: '388111133', totalTaxAmount: '',
ivNo: '123456123456', invoiceNo: '',
ivDate: '2021-03-11' invoiceDate: ''
} }
} }
} }
...@@ -51,26 +54,34 @@ export default { ...@@ -51,26 +54,34 @@ export default {
display: inline-block; display: inline-block;
} }
.invoice-info { .invoice-info {
margin-top: 5px; margin: 4px 0;
.info-key {
font-weight: 400;
font-style: normal;
font-size: 12px;
color: #555555;
text-align: right;
width: 53px;
display: inline-block;
}
.info-value {
margin-left:20px;
font-size: 12px;
color: #555555;
span { span {
color:#D9001B; margin-left: 8px;
font-size: 14px;
margin-left:6px;
} }
.inv-money {
font-size:15px;
font-weight:bold
} }
//margin-top: 5px;
//.info-key {
// font-weight: 400;
// font-style: normal;
// font-size: 12px;
// color: #555555;
// text-align: right;
// width: 53px;
// display: inline-block;
//}
//.info-value {
// margin-left:20px;
// font-size: 12px;
// color: #555555;
// span {
// color:#D9001B;
// font-size: 14px;
// margin-left:6px;
// }
//}
} }
} }
</style> </style>
src/views/myOrder/detail/orderDetail.vue
View file @ 4e98e6c5
...@@ -13,10 +13,10 @@ ...@@ -13,10 +13,10 @@
<van-icon name="orders-o" class="order-icon info-icon"/> <van-icon name="orders-o" class="order-icon info-icon"/>
<div class="info-text"> <div class="info-text">
<div style="display: flex"> <div style="display: flex">
<span class="order-code">{{detailData.orderNo}}</span> <span class="order-code">{{ detailData.orderNo }}</span>
<span class="order-copy"><van-icon :name="icons.copy"/>复制</span> <span class="order-copy"><van-icon :name="icons.copy"/>复制</span>
</div> </div>
下单时间: {{detailData.orderDate}} 下单时间: {{ detailData.orderDate }}
</div> </div>
</div> </div>
<div class="info-state"> <div class="info-state">
...@@ -46,8 +46,8 @@ ...@@ -46,8 +46,8 @@
<div class="location-content"> <div class="location-content">
<van-icon name="location-o" class="order-icon location-icon"/> <van-icon name="location-o" class="order-icon location-icon"/>
<div class="location-text"> <div class="location-text">
<div class="location-client">{{detailData.clientName}}</div> <div class="location-client">{{ detailData.clientName }}</div>
<div class="location-receive">{{detailData.shippingAdress}}</div> <div class="location-receive">{{ detailData.shippingAdress }}</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -61,13 +61,16 @@ ...@@ -61,13 +61,16 @@
<goods-simple-item v-for="item in detailData.goodsInfos" :key="item.goodsId" :item="item"/> <goods-simple-item v-for="item in detailData.goodsInfos" :key="item.goodsId" :item="item"/>
</div> </div>
<!-- 订单发票信息 --> <!-- 订单发票信息 -->
<div class="order-common order-invoice"> <div>
<div class="invoice-all" @click="openPager('orderInvoice')"> <div class="goods-all" @click="openPager('orderInvoice')">
<span class="all-title">发票信息</span> <span class="all-title">发票信息 ({{invoiceData.total}})</span>
全部 <span class="title-more">更多</span>
<van-icon class="title-arrow" name="arrow"/> <van-icon class="title-arrow" name="arrow"/>
</div> </div>
<invoice-simple-item @itemClick="openPager('orderInvoiecDetail')"/> <div class="order-common">
<invoice-simple-item v-for="item in invoiceData.invoiceList" :item="item" :key="item.invoiceNo"
@itemClick="openPager('orderInvoiecDetail')"/>
</div>
</div> </div>
</div> </div>
</template> </template>
...@@ -77,7 +80,7 @@ import OrderStateItem from '../components/orderStateItem' ...@@ -77,7 +80,7 @@ import OrderStateItem from '../components/orderStateItem'
import OrderState from '../components/orderState' import OrderState from '../components/orderState'
import GoodsSimpleItem from '../components/goodsSimpleItem' import GoodsSimpleItem from '../components/goodsSimpleItem'
import InvoiceSimpleItem from '../components/invoiceSimpleItem' import InvoiceSimpleItem from '../components/invoiceSimpleItem'
import {getMyOrderList, getDeliveryOrder} from '@/api/myOrder' import {getMyOrderList, getDeliveryOrder, getOrderInvoiceList} from '@/api/myOrder'
export default { export default {
name: 'orderDetail', name: 'orderDetail',
...@@ -85,6 +88,7 @@ export default { ...@@ -85,6 +88,7 @@ export default {
data() { data() {
return { return {
detailData: {}, detailData: {},
invoiceData: {},
icons: { icons: {
inDelivery: require('@/assets/img/u546.svg'), inDelivery: require('@/assets/img/u546.svg'),
copy: require('@/assets/img/u533.svg') copy: require('@/assets/img/u533.svg')
...@@ -111,6 +115,7 @@ export default { ...@@ -111,6 +115,7 @@ export default {
}, },
mounted() { mounted() {
this.getOrderDetail() this.getOrderDetail()
this.getInvoiceDetail()
}, },
destroyed() { destroyed() {
}, },
...@@ -174,6 +179,44 @@ export default { ...@@ -174,6 +179,44 @@ export default {
// }).catch(err => { // }).catch(err => {
// console.log(err) // console.log(err)
// }) // })
},
getInvoiceDetail() {
let params = {
'clientID': [],
'endDate': '',
'goodsCode': '',
'goodsDesc': '',
'goodsId': '',
'goodsName': '',
'goodsSpec': '',
'invoiceCode': '',
'invoiceDate': '',
'invoiceFullNo': '',
'invoiceNo': '',
'isTwoTicket': '',
'manufacturer': '',
'mdmClientCode': '',
'mdmGoodsCode': '',
'order': '',
'orderId': '',
'orderNo': '301202103160009', // this.$route.query.orderNo,
'pageNum': 1,
'pageSize': 3,
'sort': '',
'sourceDb': 'SHYY', // this.$route.query.sourceDb,
'startDate': '',
'supplierId': []
}
getOrderInvoiceList(params).then(res => {
if (res.code === 200 && res.data && res.data.code === '00000' &&
res.data.entity && res.data.entity.invoiceList && res.data.entity.invoiceList.length > 0) {
this.invoiceData = res.data.entity
} else {
console.log('请求失败')
}
}).catch(err => {
console.log(err)
})
} }
} }
} }
...@@ -189,7 +232,7 @@ export default { ...@@ -189,7 +232,7 @@ export default {
padding: 10px; padding: 10px;
border-radius: 4px; border-radius: 4px;
background-color: #fff; background-color: #fff;
margin: 5px 15px 1px 15px; margin: 10px 15px 1px 15px;
.order-icon { .order-icon {
width: 40px; width: 40px;
...@@ -312,7 +355,7 @@ export default { ...@@ -312,7 +355,7 @@ export default {
} }
.logistics-time { .logistics-time {
margin-top:4px; margin-top: 4px;
font-size: 12px; font-size: 12px;
color: #7f7f7f; color: #7f7f7f;
} }
...@@ -351,7 +394,7 @@ export default { ...@@ -351,7 +394,7 @@ export default {
.goods-all { .goods-all {
display: flex; display: flex;
align-items: center; align-items: center;
margin: 15px 15px 8px 15px; margin: 15px 15px 0 15px;
.all-title { .all-title {
flex: 1; flex: 1;
...@@ -361,11 +404,11 @@ export default { ...@@ -361,11 +404,11 @@ export default {
} }
.title-more { .title-more {
color:$txtGray9 color: $txtGray9
} }
.title-arrow { .title-arrow {
color:$txtGray9; color: $txtGray9;
font-size: 15px; font-size: 15px;
//margin-top: 1px; //margin-top: 1px;
margin-left: 6px; margin-left: 6px;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment