|
@@ -133,7 +133,7 @@
|
|
|
</view>
|
|
|
<view class="infoList" v-if="isPayOk">
|
|
|
<text>支付方式</text>
|
|
|
- <text>{{info.payInfo.payWay||'--'}}</text>
|
|
|
+ <text>{{info.payInfo.payWay=='WXPAY_ONLINE_XCX'?'微信支付':'--'}}</text>
|
|
|
</view>
|
|
|
<view class="infoList" v-if="isPayOk">
|
|
|
<text>支付时间</text>
|
|
@@ -168,13 +168,13 @@
|
|
|
<view :style="{height:safeAreaBottom+'px'}"></view>
|
|
|
</view>
|
|
|
<!-- 付款弹框 -->
|
|
|
- <payModal :showPopu="showPopu" :payInfo="payInfo" :payData="payData" @close="showPopu=false" @payComplete="payComplete"></payModal>
|
|
|
+ <payModal :showPopu="showPopu" :payInfo="info" :payData="payData" @close="showPopu=false" @payComplete="payComplete"></payModal>
|
|
|
</view>
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
import payModal from '../components/payModal.vue'
|
|
|
- import { purchaseQueryDetailPage,purchaseDetail,purchaseCancel,purchaseReceive,purchasePay } from '@/api/purchase.js'
|
|
|
+ import { purchaseQueryDetailPage,purchaseQueryPage,purchaseCancel,purchaseReceive,purchasePay } from '@/api/purchase.js'
|
|
|
import moment from 'moment'
|
|
|
export default {
|
|
|
name: 'procureDetailOrder',
|
|
@@ -204,23 +204,16 @@
|
|
|
uni.setNavigationBarTitle({
|
|
|
title: '采购订单详情'
|
|
|
})
|
|
|
- const data = this.$store.state.vuex_tempOrderData //获取订单信息
|
|
|
- if(data){
|
|
|
- this.info = data
|
|
|
- this.state = data.billStatus
|
|
|
- this.purchaseSn = data.purchaseSn
|
|
|
- const stateText = {'WAIT_AUDIT':'待审核','WAIT_PAY':'待付款','AUDIT_REJECT':'审核不通过','WAIT_OUT_WAREHOUSE':'待收货','WAIT_RECEIVE':'待收货','FINISH':'已完结','CANCEL':'已取消'}
|
|
|
- this.statusText = stateText[this.state]
|
|
|
- this.statusIcon = this.state == 'FINISH' ? 'checkmark-circle' : ((this.state == 'AUDIT_REJECT'||this.state == 'CANCEL')?'close-circle':'hourglass')
|
|
|
- this.statusMessage = this.state == 'WAIT_OUT_WAREHOUSE'||this.state == 'WAIT_RECEIVE' ? '请耐心等待汽配经销商进行配送' : ''
|
|
|
- // 获取明细
|
|
|
- this.getDetailList()
|
|
|
- // 更改标题栏背景色
|
|
|
- uni.setNavigationBarColor({
|
|
|
- frontColor: '#ffffff',
|
|
|
- backgroundColor: this.state!= 'error'&&this.state!= 'AUDIT_REJECT'&&this.state!= 'CANCEL'&&this.state!= 'WAIT_PAY' ? '#066cff':'#e61100',
|
|
|
- })
|
|
|
- }
|
|
|
+ // 查明细
|
|
|
+ if(option.purchaseSn){
|
|
|
+ this.getDetail()
|
|
|
+ }else{
|
|
|
+ // 从列表过来不需要查
|
|
|
+ const data = this.$store.state.vuex_tempOrderData //获取订单信息
|
|
|
+ if(data){
|
|
|
+ this.pageInit(data)
|
|
|
+ }
|
|
|
+ }
|
|
|
},
|
|
|
onUnload() {
|
|
|
this.$store.state.vuex_tempOrderData = null
|
|
@@ -240,14 +233,43 @@
|
|
|
//是否已付款
|
|
|
isPayOk(){
|
|
|
const item = this.info
|
|
|
- return this.hasPay && item.payInfo.payState!='WAIT'
|
|
|
+ return this.hasPay && item.payInfo.payState=='FINISH'
|
|
|
},
|
|
|
- // 付款信息
|
|
|
- payInfo(){
|
|
|
- return this.$store.state.vuex_tempOrderData
|
|
|
- }
|
|
|
},
|
|
|
methods: {
|
|
|
+ pageInit(data){
|
|
|
+ this.info = data
|
|
|
+ if(this.info.payInfo){
|
|
|
+ this.info.payInfo.payDate = moment(this.info.payInfo.payDate).format('YYYY-MM-DD hh:mm:ss')
|
|
|
+ }
|
|
|
+ this.state = data.billStatus
|
|
|
+ this.purchaseSn = data.purchaseSn
|
|
|
+ const stateText = {'WAIT_AUDIT':'待审核','WAIT_PAY':'待付款','AUDIT_REJECT':'审核不通过','WAIT_OUT_WAREHOUSE':'待收货','WAIT_RECEIVE':'待收货','FINISH':'已完结','CANCEL':'已取消'}
|
|
|
+ this.statusText = stateText[this.state]
|
|
|
+ this.statusIcon = this.state == 'FINISH' ? 'checkmark-circle' : ((this.state == 'AUDIT_REJECT'||this.state == 'CANCEL')?'close-circle':'hourglass')
|
|
|
+ this.statusMessage = this.state == 'WAIT_OUT_WAREHOUSE'||this.state == 'WAIT_RECEIVE' ? '请耐心等待汽配经销商进行配送' : ''
|
|
|
+ // 更改标题栏背景色
|
|
|
+ uni.setNavigationBarColor({
|
|
|
+ frontColor: '#ffffff',
|
|
|
+ backgroundColor: this.state!= 'error'&&this.state!= 'AUDIT_REJECT'&&this.state!= 'CANCEL'&&this.state!= 'WAIT_PAY' ? '#066cff':'#e61100',
|
|
|
+ })
|
|
|
+ // 获取明细列表
|
|
|
+ this.getDetailList()
|
|
|
+ },
|
|
|
+ // 实时查询详情
|
|
|
+ getDetail(){
|
|
|
+ purchaseQueryPage({pageNo:1,pageSize:1,purchaseSn: this.purchaseSn}).then(res => {
|
|
|
+ const data = res.data ? res.data.list[0] : null
|
|
|
+ if(data){
|
|
|
+ data.billStatus = data.billStatus == 'WAIT_AUDIT'&&data.payOnlineFlag==1&&data.payInfo&&data.payInfo.payState=='WAIT'?'WAIT_PAY':data.billStatus
|
|
|
+ // 计算待付款剩余倒计时
|
|
|
+ if(data.billStatus== 'WAIT_PAY'){
|
|
|
+ data.timestamp = (new Date(data.createDate.replace(/-/g,'/')).getTime() + 1800000 - new Date().getTime())/1000
|
|
|
+ }
|
|
|
+ this.pageInit(data)
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
getRow(pageNo){
|
|
|
this.pageNo = pageNo
|
|
|
this.getDetailList()
|