Commit bdca55ac authored by xiejb's avatar xiejb

订单发票列表和订单发票详情页面对接接口

parent 431e3d6f
import { fetch } from '@/utils'
// 获取商品列表
// 获取发票列表
export function getMyInvoiceList(params) {
return fetch({
url: '/product/queryGoods_PS',
url: '/OrderLife/Invoice',
method: 'post',
data: params,
loading: true
......
import { fetch } from '@/utils'
// 获取商品列表
// 获取订单列表
export function getMyOrderList(params) {
return fetch({
url: '/OrderLife/queryOrder',
......@@ -8,3 +8,12 @@ export function getMyOrderList(params) {
loading: true
})
}
// 获取订单发票列表
export function getOrderInvoiceList(params) {
return fetch({
url: '/OrderLife/Invoice',
method: 'post',
data: params,
loading: true
})
}
......@@ -75,23 +75,47 @@ export default {
getPostData() {
let _this = this
let data = {
'dbName': 'erp_test_shaphar-上药控股有限公司-204-23528', // 'erp_ogg_shaphar',
'start': _this.currentPage,
'length': _this.pageSize,
'goods': ''
'clientID': [
'3168'
],
'endDate': '2021-03-15',
'goodsCode': '',
'goodsDesc': '',
'goodsId': '',
'goodsName': '',
'goodsSpec': '',
'invoiceCode': '',
'invoiceDate': '',
'invoiceFullNo': '',
'invoiceNo': '',
'isTwoTicket': '',
'manufacturer': '',
'mdmClientCode': '',
'mdmGoodsCode': '',
'order': '',
'orderId': '',
'orderNo': '',
'pageNum': this.currentPage,
'pageSize': this.pageSize,
'sort': '',
'sourceDb': 'SHYY',
'startDate': '2021-03-08',
'supplierId': [
'305','879','301'
]
}
getMyInvoiceList(data).then(rt => {
if (rt.code === 1 || rt.code === '1') {
if (rt.data.code === '00000') {
if (_this.isRefreshing) {
_this.invoiceList = rt.data
} else if (rt.data || rt.data.length > 0) {
_this.invoiceList = _this.invoiceList.concat(rt.data)
_this.invoiceList = rt.data.entity.invoiceList
} else if (rt.data.entity.invoiceList || rt.data.entity.invoiceList.length > 0) {
_this.invoiceList = _this.invoiceList.concat(rt.data.entity.invoiceList)
}
// 重置刷新提示
_this.isRefreshing = false
// 重置加载更多提示
_this.isLoading = false
if (rt.data.length < 10) {
if (rt.data.entity.invoiceList.length < 10) {
_this.finished = true
} else {
// 加载成功后下一页自增1
......
......@@ -141,7 +141,7 @@ export default {
// console.log(window.location.href.split('?')[1])
this.$router.push({
path: '/orderInvoice',
query: this.$store.state.linkInfo
query: model
})
},
// 查看 清货单
......@@ -176,7 +176,6 @@ export default {
// this.$refs.all[0].httpAction(this.moreSearchInfo)
})
this.moreSearchInfo = JSON.parse(JSON.stringify(data))
console.log(data)
console.log(this.moreSearchInfo)
this.$EventBus.$emit('myOrderMoreSearch', this.moreSearchInfo)
},
......
......@@ -67,10 +67,12 @@ export default {
methods: {
// 跳转发票详情
gotoDetail(model) {
// console.log()
this.$router.push({
let item = this.$route.query
item.invoiceNo = model.invoiceNo
console.log()
this.$router.push({
path: '/orderInvoiecDetail',
query: this.$store.state.linkInfo
query: item
});
},
onBrowserBack() {
......
<template>
<div id="orderInvoiecDetailList">
<div class="content">
<van-pull-refresh class="list" ref="supplierList" v-model="isRefreshing" @refresh="onRefresh">
<!-- <van-pull-refresh class="list" ref="supplierList" v-model="isRefreshing" @refresh="onRefresh">
<van-list
v-model="isLoading"
:finished="finished"
finished-text="没有更多了"
:error.sync="error"
error-text="请求失败,点击重新加载"
@load="onLoad">
@load="onLoad"> -->
<div class="invoiceItem" @click="gotoDetail(item)"
v-for="(item, index) in invoiceList"
v-for="(item, index) in invoiceItem.goodsInfos"
:key="index">
<order-invoiec-list-item :item="item"/>
</div>
</van-list>
</van-pull-refresh>
<!-- </van-list>
</van-pull-refresh> -->
</div>
</div>
</template>
......@@ -43,6 +43,15 @@ export default {
sphImage: require('@/assets/img/u48.png'),
}
},
props: {
invoiceItem: {
type: Object,
default: () => {
return {
}
}
}
},
computed: {
linkInfo () {
return this.$store.state.linkInfo
......
......@@ -2,24 +2,24 @@
<div id="invoiecHead">
<div class="content">
<div class="taxIncluded">
<div class="taxAmount">377,898.00</div>
<div class="taxAmount">{{invoiceItem.totalTaxAmount}}</div>
<div class="taxAmountSub">含税金额</div>
</div>
<div class="noTaxInfo">
<div class="noTax">
<div class="noTaxAmount">377,000.00</div>
<div class="noTaxAmount">{{invoiceItem.totalTaxFreeAmount}}</div>
<div class="noTaxAmountSub">无税金额</div>
</div>
<div class="taxNumber">
<div class="tax">377,000.00</div>
<div class="taxSub">无税金</div>
<div class="tax">{{invoiceItem.totalTaxFee}}</div>
<div class="taxSub"></div>
</div>
</div>
<van-divider :style="{ color: '#FFFFFF', borderColor: '#FFFFFF', margin: '10PX 0 10PX 0'}"/>
<div class="invoiecInfo">
<div class="cellInfo">
<div class="title">发票号:</div>
<div class="info">837418787438178</div>
<div class="info">{{invoiceItem.invoiceNo}}</div>
</div>
<!-- <div class="cellInfo">
<div class="title">发票代码:</div>
......@@ -27,7 +27,7 @@
</div> -->
<div class="cellInfo">
<div class="title">发票日期:</div>
<div class="info">2020-11-13 09:00</div>
<div class="info">{{invoiceItem.invoiceDate}}</div>
</div>
</div>
</div>
......@@ -38,7 +38,8 @@
import {getFormateDate} from '@/utils/common'
export default {
name: 'InvoiecHead',
components: {
components: {
orderInvoiecItem: {}
},
data() {
return {
......@@ -59,6 +60,15 @@ export default {
invoiceList: []
}
},
props: {
invoiceItem: {
type: Object,
default: () => {
return {
}
}
}
},
computed: {
linkInfo () {
return this.$store.state.linkInfo
......@@ -72,6 +82,7 @@ export default {
}
},
mounted() {
this.orderInvoiecItem = this.$route.query
},
methods: {
onBrowserBack() {
......
......@@ -3,45 +3,45 @@
<div class="itemInfo">
<div class="orderNum">
<van-image fit="contain" width="45" height="50" :src="sphImage"/>
<div class="num">订单号:34678649876</div>
<div class="num">订单号:{{item.orderNo}}</div>
<van-button style="margin: auto;width: 50PX" class="numBtn" round plain size="mini" type="info">复制</van-button>
</div>
<div class="divider"></div>
<div class="invoiecInfo">
<div class="name">[132521] 阿西匹林/0.25g*200s/浙江恒瑞制药有限公司</div>
<div class="name">[{{item.goodsId}}]{{item.goodsName}}/{{item.goodsSpec}}/{{item.manufacturer}}</div>
<div class="cellInfo">
<div class="batch">开票数量:4809</div>
<div class="batch">开票数量:{{item.invoiceQty}}</div>
<!-- <div class="numBer"> 开票数量:480</div> -->
</div>
<van-divider :style="{ color: '#999999', borderColor: '#999999', margin: '5PX 0 5PX 0'}"/>
<div class="cellInfo">
<div class="leftInfo">
<div class="title">无税单价:</div>
<div class="value">7.52</div>
<div class="value">{{item.taxFreePrice}}</div>
</div>
<div class="rightInfo">
<div class="title">单品无税金额:</div>
<div class="value"> 3616.00</div>
<div class="value">{{item.taxFreeAmount}}</div>
</div>
</div>
<div class="cellInfo">
<div class="leftInfo">
<div class="title">含税单价:</div>
<div class="value">7.52</div>
<div class="value">{{item.taxPrice}}</div>
</div>
<div class="rightInfo">
<div class="title">单品含税金额:</div>
<div class="value"> 3616.00</div>
<div class="value">{{item.taxAmount}}</div>
</div>
</div>
<div class="cellInfo">
<div class="leftInfo">
<div class="title">税率:</div>
<div class="value">7.52</div>
<div class="value">{{item.taxRate}}</div>
</div>
<div class="rightInfo">
<div class="title">税额:</div>
<div class="value"> 3616.00</div>
<div class="value">{{item.taxFee}}</div>
</div>
</div>
</div>
......
......@@ -22,7 +22,7 @@
<script>
// 引入接口
import { getMyInvoiceList } from '@/api/myInvoice'
import { getOrderInvoiceList } from '@/api/myOrder'
import orderInvoiecListItem from './orderInvoiecListItem.vue'
export default {
name: 'OrderInvoiceList',
......@@ -75,23 +75,45 @@ export default {
getPostData() {
let _this = this
let data = {
'dbName': 'erp_test_shaphar-上药控股有限公司-204-23528', // 'erp_ogg_shaphar',
'start': _this.currentPage,
'length': _this.pageSize,
'goods': ''
'clientID': [
],
'endDate': '',
'goodsCode': '',
'goodsDesc': '',
'goodsId': '',
'goodsName': '',
'goodsSpec': '',
'invoiceCode': '',
'invoiceDate': '',
'invoiceFullNo': '',
'invoiceNo': '',
'isTwoTicket': '',
'manufacturer': '',
'mdmClientCode': '',
'mdmGoodsCode': '',
'order': '',
'orderId': '',
'orderNo': this.$route.query.orderNo,
'pageNum': this.currentPage,
'pageSize': this.pageSize,
'sort': '',
'sourceDb': this.$route.query.sourceDb,
'startDate': '',
'supplierId': [
]
}
getMyInvoiceList(data).then(rt => {
if (rt.code === 1 || rt.code === '1') {
getOrderInvoiceList(data).then(rt => {
if (rt.data.code === '00000') {
if (_this.isRefreshing) {
_this.invoiceList = rt.data
} else if (rt.data || rt.data.length > 0) {
_this.invoiceList = _this.invoiceList.concat(rt.data)
_this.invoiceList = rt.data.entity.invoiceList
} else if (rt.data.entity.invoiceList || rt.data.entity.invoiceList.length > 0) {
_this.invoiceList = _this.invoiceList.concat(rt.data.entity.invoiceList)
}
// 重置刷新提示
_this.isRefreshing = false
// 重置加载更多提示
_this.isLoading = false
if (rt.data.length < 10) {
if (rt.data.entity.invoiceList.length < 10) {
_this.finished = true
} else {
// 加载成功后下一页自增1
......
<template>
<div id="orderInvoiecDetail">
<div class="content">
<order-invoiec-head/>
<order-invoiec-head :invoiceItem="invoiceItem"/>
</div>
<div class="list">
<order-invoiec-detail-list/>
<order-invoiec-detail-list :invoiceItem="invoiceItem"/>
</div>
<!-- <high-search v-model="moreSearchShow" @onsearch="moreSearchConfirm" @onclean="moreSearchClean"/> -->
</div>
......@@ -12,6 +12,7 @@
<script>
import {getFormateDate} from '@/utils/common'
import { getOrderInvoiceList } from '@/api/myOrder'
import orderInvoiecHead from './invoiecDetail/orderInvoiecHead.vue'
import orderInvoiecDetailList from './invoiecDetail/orderInvoiecDetailList.vue'
export default {
......@@ -24,6 +25,8 @@ export default {
return {
tabsTitle: [],
moreSearchShow: false,
currentPage: 1,
pageSize: 10,
activeTab: 'home',
moreSearchInfo: {
//接收搜索更多回传的数据
......@@ -36,7 +39,7 @@ export default {
end: getFormateDate(new Date(), "yyyy-MM-dd"),
},
},
invoiceList: []
invoiceItem: {}
}
},
computed: {
......@@ -64,6 +67,7 @@ export default {
})
// 给window添加一个popstate事件,拦截返回键,执行this.onBrowserBack事件,addEventListener需要指向一个方法
window.addEventListener('popstate', this.onBrowserBack, false)
this.getPostData()
},
destroyed() {
// 当页面销毁必须要移除这个事件,vue不刷新页面,不移除会重复执行这个事件
......@@ -93,6 +97,54 @@ export default {
closeAppPage() {
console.log('关闭页面')
bridge.closeWindow_c()
},
getPostData() {
let _this = this
let data = {
'clientID': [
],
'endDate': '',
'goodsCode': '',
'goodsDesc': '',
'goodsId': '',
'goodsName': '',
'goodsSpec': '',
'invoiceCode': '',
'invoiceDate': '',
'invoiceFullNo': '',
'invoiceNo': this.$route.query.invoiceNo,
'isTwoTicket': '',
'manufacturer': '',
'mdmClientCode': '',
'mdmGoodsCode': '',
'order': '',
'orderId': '',
'orderNo': this.$route.query.orderNo,
'pageNum': this.currentPage,
'pageSize': this.pageSize,
'sort': '',
'sourceDb': this.$route.query.sourceDb,
'startDate': '',
'supplierId': [
]
}
getOrderInvoiceList(data).then(rt => {
if (rt.data.code === '00000') {
if (rt.data.entity && rt.data.entity.invoiceList.length > 0) {
_this.invoiceItem = rt.data.entity.invoiceList[0]
}
} else {
_this.$toast(rt.message)
}
// 加载状态结束
_this.isLoading = false
}).catch(e => {
this.$toast('获取信息失败!')
_this.isRefreshing = false
_this.isLoading = false
_this.error = true
_this.finished = true
})
}
}
}
......
......@@ -3,15 +3,15 @@
<div class="invoiecrInfo">
<div class="cellInfo">
<div class="title">发票号:</div>
<div class="info">XS837418787438178</div>
<div class="info">{{item.invoiceNo}}</div>
</div>
<div class="cellInfo">
<div class="title">发票日期:</div>
<div class="info">2021-03-08</div>
<div class="info">{{item.invoiceDate}}</div>
</div>
<div class="cellInfo">
<div class="title">发票金额:</div>
<div class="info" style="font-weight: 600;font-size: 16PX;"><span class="price">377,899.00</span></div>
<div class="info" style="font-weight: 600;font-size: 16PX;"><span class="price">{{item.totalTaxAmount}}</span></div>
</div>
</div>
</div>
......
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