Skip to content

上
上药订单生命周期升级
Commit 1e9be754 authored by LynnQi's avatar LynnQi
Browse files
Options

Merge branch 'master' of http://gitlab.jiucaiyun.cn/sph/SH_OrderLifeCycleU

parents b21a3e95 b65ba724
Hide whitespace changes
Inline Side-by-side
Showing with 281 additions and 116 deletions
src/views/myInvoice/components/HighSearch.vue
View file @ 1e9be754
......@@ -230,7 +230,7 @@ export default {
},
methods: {
timeConfirm (data) {
this.time = data
this.moreSearchInfo.time = data
},
onSearchClick() {
this.moreSearchShow = false
......
src/views/myInvoice/index.vue
View file @ 1e9be754
<template>
<div id="myInvoice">
<my-invoice-list @gotoDetail="gotoDetail"/>
<my-invoice-list ref="invoiceList" @gotoDetail="gotoDetail"/>
<high-search v-model="moreSearchShow" @onsearch="moreSearchConfirm" @onclean="moreSearchClean"/>
</div>
</template>
......@@ -83,11 +83,11 @@ export default {
methods: {
// 跳转发票详情
gotoDetail(model) {
// console.log()
this.$router.push({
console.log(model)
this.$router.push({
path: '/invoiecDetail',
query: this.$store.state.linkInfo
});
query: model
});
},
onBrowserBack() {
if (this.moreSearchShow) {
......@@ -107,11 +107,13 @@ export default {
},
// 高级搜索查询
moreSearchConfirm(data) {
console.log('000000000')
console.log(data)
this.$refs.invoiceList[0].httpAction(this.moreSearchInfo)
},
// 高级搜索取消
moreSearchClean(data) {
this.moreSearchInfo = data;
this.$refs.invoiceList[0].httpAction(this.moreSearchInfo)
},
closeAppPage() {
console.log('关闭页面')
......
src/views/myInvoice/invoiecDetail.vue
View file @ 1e9be754
<template>
<div id="invoiecDetail">
<div class="content">
<invoiec-head/>
<invoiec-head :invoiceItem="invoiceItem"/>
</div>
<div class="list">
<invoiec-detail-list/>
<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 { getMyInvoiceList } from '@/api/myInvoice'
import invoiecHead from './invoiecDetail/invoiecHead.vue'
import invoiecDetailList from './invoiecDetail/invoiecDetailList.vue'
export default {
......@@ -22,6 +23,8 @@ export default {
},
data() {
return {
currentPage: 1,
pageSize: 10,
tabsTitle: [],
moreSearchShow: false,
activeTab: 'home',
......@@ -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': '2021-03-15',
'goodsCode': '',
'goodsDesc': '',
'goodsId': '',
'goodsName': '',
'goodsSpec': '',
'invoiceCode': '',
'invoiceDate': '',
'invoiceFullNo': '',
'invoiceNo': this.$route.query.invoiceNo,
'isTwoTicket': '',
'manufacturer': '',
'mdmClientCode': '',
'mdmGoodsCode': '',
'order': '',
'orderId': '',
'orderNo': '',
'pageNum': this.currentPage,
'pageSize': this.pageSize,
'sort': '',
'sourceDb': this.$route.query.sourceDb,
'startDate': '2021-03-08',
'supplierId': [
]
}
getMyInvoiceList(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.data.message)
}
// 加载状态结束
_this.isLoading = false
}).catch(e => {
this.$toast('获取信息失败！')
_this.isRefreshing = false
_this.isLoading = false
_this.error = true
_this.finished = true
})
}
}
}
......
src/views/myInvoice/invoiecDetail/invoiecDetailList.vue
View file @ 1e9be754
<template>
<div id="invoiecDetailList">
<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">
<invoiec-list-item :item="item"/>
</div>
</van-list>
</van-pull-refresh>
<!-- </van-list>
</van-pull-refresh> -->
</div>
</div>
</template>
......@@ -39,10 +39,18 @@ export default {
error: false,
logInfoShow: false,
invoiceList: [],
invoiceItem: {},
sphImage: require('@/assets/img/u48.png'),
}
},
props: {
invoiceItem: {
type: Object,
default: () => {
return {
}
}
}
},
computed: {
linkInfo () {
return this.$store.state.linkInfo
......
src/views/myInvoice/invoiecDetail/invoiecHead.vue
View file @ 1e9be754
......@@ -2,32 +2,32 @@
<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="cellInfo">
<div class="title">发票代码：</div>
<div class="info">837418787438178</div>
</div>
</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>
......@@ -59,6 +59,15 @@ export default {
invoiceList: []
}
},
props: {
invoiceItem: {
type: Object,
default: () => {
return {
}
}
}
},
computed: {
linkInfo () {
return this.$store.state.linkInfo
......@@ -87,7 +96,7 @@ export default {
<style lang="scss" scoped>
#invoiecHead {
.content{
height: 270PX;
height: 250PX;
width: 100%;
background-color: $main1;
padding: 10pX;
......
src/views/myInvoice/invoiecDetail/invoiecListItem.vue
View file @ 1e9be754
......@@ -3,44 +3,44 @@
<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>
</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">批次号：200409</div>
<div class="numBer"> 开票数量：480</div>
<div class="batch">开票数量：{{item.invoiceQty}}</div>
<!-- <div class="numBer">开票数量：{{item.invoiceQty}}</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>
......
src/views/myInvoice/myInvoiceList.vue
View file @ 1e9be754
......@@ -24,6 +24,7 @@
// 引入接口
import { getMyInvoiceList } from '@/api/myInvoice'
import myInvoiecListItem from './myInvoiecListItem.vue'
import {getFormateDate} from '@/utils/common'
export default {
name: 'MyInvoiceList',
components: {
......@@ -40,6 +41,17 @@ export default {
logInfoShow: false,
invoiceList: [],
invoiceItem: {},
moreSearchInfo: {
//接收搜索更多回传的数据
supplier: { comPartyId: "" }, //供应商ID
goods: { comGoodsId: "" }, //商品ID
orderNo: "", //订单编号
time: {
//起始时间
start: getFormateDate(new Date(), "yyyy-MM-dd"),
end: getFormateDate(new Date(), "yyyy-MM-dd"),
},
},
sphImage: require('@/assets/img/u48.png'),
}
},
......@@ -59,6 +71,11 @@ export default {
// this.onLoad()
},
methods: {
// 高级搜索
httpAction(model) {
this.moreSearchInfo = model
this.onRefresh()
},
gotoDetail(model) {
// console.log(model)
this.$emit('gotoDetail', model)
......@@ -78,7 +95,7 @@ export default {
'clientID': [
'3168'
],
'endDate': '2021-03-15',
'endDate': this.moreSearchInfo.time.end,
'goodsCode': '',
'goodsDesc': '',
'goodsId': '',
......@@ -99,7 +116,7 @@ export default {
'pageSize': this.pageSize,
'sort': '',
'sourceDb': 'SHYY',
'startDate': '2021-03-08',
'startDate': this.moreSearchInfo.time.start,
'supplierId': [
'305','879','301'
]
......@@ -151,7 +168,7 @@ export default {
padding: 10PX;
-webkit-overflow-scrolling: touch;
.invoiceItem{
height: 145PX;
// height: 145PX;
background-color: white;
margin-bottom: 10PX;
border-radius: 10PX;
......
src/views/myInvoice/myInvoiecListItem.vue
View file @ 1e9be754
......@@ -2,26 +2,26 @@
<div id="invoiecListItem">
<div class="itemInfo">
<div class="invoiecrNum">
<div class="company">浙江恒瑞制药公司</div>
<div class="time"><span>2020-11-13 09:00</span></div>
<div class="company">{{item.supplierName}}</div>
<div class="time"><span>{{item.invoiceDate}}</span></div>
</div>
<div class="divider"></div>
<div class="invoiecrInfo">
<div class="cellInfo">
<div class="title">发票金额：</div>
<div class="info">￥<span class="price">377,899.00</span></div>
<div class="info">￥<span class="price">{{item.totalTaxAmount}}</span></div>
<div class="btn">
<van-button round plain size="mini" type="info">预览</van-button>
</div>
</div>
<div class="cellInfo">
<div class="title">发票号：</div>
<div class="info">XS837418787438178</div>
<div class="info">{{item.invoiceNo}}</div>
</div>
<div class="cellInfo">
<!-- <div class="cellInfo">
<div class="title">发票代号：</div>
<div class="info">837418787438178</div>
</div>
</div> -->
</div>
</div>
</div>
......@@ -86,19 +86,20 @@ export default {
height: 40PX;
margin: 0PX 10PX;
.company{
width: 60%;
width: 70%;
padding-left: 5PX;
font-weight: 600;
}
.time{
width: 40%;
width: 30%;
text-align: right
}
}
.invoiecrInfo{
margin: 5PX 10PX;
// margin: 10PX;
padding: 5PX;
// display: flex;
height: 110PX;
// height: 110PX;
font-size: 15PX;
.cellInfo{
display: flex;
......
src/views/myOrder/components/invoiceSimpleItem.vue
View file @ 1e9be754
<template>
<div class="invoice-simple-content" @click="onItemClick">
<div class="invoice-company">
{{item.company}}
</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.ivNo}}</span></div>
<div class="invoice-info"><span class="info-key">发票日期:</span><span class="info-value">{{item.ivDate}}</span></div>
<!-- <div class="invoice-company">-->
<!-- {{item.company}}-->
<!-- </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.invoiceDate}}</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>
</template>
......@@ -18,10 +21,10 @@ export default {
type: Object,
default: () => {
return {
company: '上药控股新药分公司',
ivMoney: '388111133',
ivNo: '123456123456',
ivDate: '2021-03-11'
company: '',
totalTaxAmount: '',
invoiceNo: '',
invoiceDate: ''
}
}
}
......@@ -51,26 +54,34 @@ export default {
display: inline-block;
}
.invoice-info {
margin-top: 5px;
.info-key {
font-weight: 400;
font-style: normal;
font-size: 12px;
color: #555555;
text-align: right;
width: 53px;
display: inline-block;
margin: 4px 0;
span {
margin-left: 8px;
}
.info-value {
margin-left:20px;
font-size: 12px;
color: #555555;
span {
color:#D9001B;
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>
src/views/myOrder/detail/orderDetail.vue
View file @ 1e9be754
......@@ -13,10 +13,10 @@
<van-icon name="orders-o" class="order-icon info-icon"/>
<div class="info-text">
<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>
</div>
下单时间: {{detailData.orderDate}}
下单时间: {{ detailData.orderDate }}
</div>
</div>
<div class="info-state">
......@@ -33,7 +33,7 @@
</div>
<!-- 订单物流信息 -->
<div class="order-common order-logistics">
<div class="logistics-content" @click="openPager('logisticsDetail')">
<div class="logistics-content" @click="openLogistics()">
<van-icon :name="icons.inDelivery" class="order-icon logistics-icon"/>
<div class="logistics-text">
<div style="display:flex">
......@@ -46,13 +46,13 @@
<div class="location-content">
<van-icon name="location-o" class="order-icon location-icon"/>
<div class="location-text">
<div class="location-client">{{detailData.clientName}}</div>
<div class="location-receive">{{detailData.shippingAdress}}</div>
<div class="location-client">{{ detailData.clientName }}</div>
<div class="location-receive">{{ detailData.shippingAdress }}</div>
</div>
</div>
</div>
<!-- 订单商品 -->
<div class="goods-all" @click="openPager('goodsInfo')">
<div class="goods-all" @click="openGoodsList()">
<span class="all-title">商品明细</span>
<span class="title-more">更多</span>
<van-icon class="title-arrow" name="arrow"/>
......@@ -61,13 +61,16 @@
<goods-simple-item v-for="item in detailData.goodsInfos" :key="item.goodsId" :item="item"/>
</div>
<!-- 订单发票信息 -->
<div class="order-common order-invoice">
<div class="invoice-all" @click="openPager('orderInvoice')">
<span class="all-title">发票信息</span>
全部
<div>
<div class="goods-all" @click="openOrderInvoice()">
<span class="all-title">发票信息 ({{invoiceData.total}})</span>
<span class="title-more">更多</span>
<van-icon class="title-arrow" name="arrow"/>
</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="openInvoice(item)"/>
</div>
</div>
</div>
</template>
......@@ -77,7 +80,7 @@ import OrderStateItem from '../components/orderStateItem'
import OrderState from '../components/orderState'
import GoodsSimpleItem from '../components/goodsSimpleItem'
import InvoiceSimpleItem from '../components/invoiceSimpleItem'
import {getMyOrderList, getDeliveryOrder} from '@/api/myOrder'
import {getMyOrderList, getDeliveryOrder, getOrderInvoiceList} from '@/api/myOrder'
export default {
name: 'orderDetail',
......@@ -85,6 +88,7 @@ export default {
data() {
return {
detailData: {},
invoiceData: {},
icons: {
inDelivery: require('@/assets/img/u546.svg'),
copy: require('@/assets/img/u533.svg')
......@@ -111,6 +115,7 @@ export default {
},
mounted() {
this.getOrderDetail()
this.getInvoiceDetail()
},
destroyed() {
},
......@@ -118,15 +123,36 @@ export default {
onBrowserBack() {
this.$router.go(-1)
},
openPager(path) {
/* 打开物流页面 */
openLogistics() {
this.$router.push({
path: path,
path: 'logisticsDetail',
query: this.$store.state.linkInfo
})
},
openLogistics() {
this.openPager('logisticsDetail')
/* 打开商品列表页面 */
openGoodsList() {
this.$router.push({
path: 'goodsInfo',
query: this.$store.state.linkInfo
})
},
/* 打开发票列表页面 */
openOrderInvoice() {
this.$router.push({
path: 'orderInvoice',
query: this.$store.state.linkInfo
})
},
/* 打开单个发票页面 */
openInvoice(item) {
this.$router.push({
path: 'orderInvoiecDetail',
query: item
})
console.log(item)
},
/* 获取订单详情 */
getOrderDetail() {
let params = {
'businessType': '',
......@@ -174,6 +200,45 @@ export default {
// }).catch(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 +254,7 @@ export default {
padding: 10px;
border-radius: 4px;
background-color: #fff;
margin: 5px 15px 1px 15px;
margin: 10px 15px 1px 15px;
.order-icon {
width: 40px;
......@@ -312,7 +377,7 @@ export default {
}
.logistics-time {
margin-top:4px;
margin-top: 4px;
font-size: 12px;
color: #7f7f7f;
}
......@@ -349,27 +414,27 @@ export default {
/*订单商品*/
.goods-all {
display: flex;
align-items: center;
margin: 15px 15px 8px 15px;
.all-title {
flex: 1;
font-size: 16px;
color: #000;
font-weight: bold;
}
display: flex;
align-items: center;
margin: 15px 15px 0 15px;
.all-title {
flex: 1;
font-size: 16px;
color: #000;
font-weight: bold;
}
.title-more {
color:$txtGray9
}
.title-more {
color: $txtGray9
}
.title-arrow {
color:$txtGray9;
font-size: 15px;
//margin-top: 1px;
margin-left: 6px;
}
.title-arrow {
color: $txtGray9;
font-size: 15px;
//margin-top: 1px;
margin-left: 6px;
}
}
/*订单发票*/
......
src/views/myOrder/index.vue
View file @ 1e9be754
......@@ -133,7 +133,7 @@ export default {
gotoOrderDetail (model) {
this.$router.push({
path: '/orderDetail',
query: this.$store.state.linkInfo
query: model
})
},
// 查看发票
......
src/views/myOrder/myOrderList.vue
View file @ 1e9be754
......@@ -181,6 +181,7 @@ export default {
'sourceDb': 'SHYY', // 数据来源
'sourceOrderNo': '', // 来源订单号(网上订单号)
'sourceSystem': '', // 订单来源 来源订单号和订单来源必须同时不为空
'userSiteId': '1372122312286081024',
'supplierId': [
] // 供应商(部门)编码
}
......
src/views/myOrder/orderInvoice/index.vue
View file @ 1e9be754
......@@ -69,7 +69,6 @@ export default {
gotoDetail(model) {
let item = this.$route.query
item.invoiceNo = model.invoiceNo
console.log()
this.$router.push({
path: '/orderInvoiecDetail',
query: item
......
src/views/myOrder/orderInvoice/invoiecDetail/orderInvoiecDetailList.vue
View file @ 1e9be754
......@@ -39,7 +39,7 @@ export default {
error: false,
logInfoShow: false,
invoiceList: [],
invoiceItem: {},
// invoiceItem: {},
sphImage: require('@/assets/img/u48.png'),
}
},
......
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