lilei 7 months ago
parent
commit
029802199a
2 changed files with 15 additions and 10 deletions
  1. 4 4
      pagesB/procureOrder/orderDetail.vue
  2. 11 6
      pagesB/procureOrder/orderList.vue

+ 4 - 4
pagesB/procureOrder/orderDetail.vue

@@ -144,7 +144,7 @@
 						<text>下单人员</text>
 						<text>{{info.purchaserName || '--'}}</text>
 					</view>
-					<view class="infoList" v-if="info&&info.billStatus != 'WAIT_AUDIT'&&info.billStatus != 'WAIT_PAY'&&isPayOk">
+					<view class="infoList" v-if="info&&info.billStatus != 'WAIT_AUDIT'&&info.billStatus != 'WAIT_PAY'&&info.billStatus != 'CANCEL'">
 						<text>审核时间</text>
 						<text>{{info.auditDate||'--'}}</text>
 					</view>
@@ -160,15 +160,15 @@
 						<text>取消时间</text>
 						<text>{{info.cancelDate ||'--'}}</text>
 					</view>
-					<view class="infoList" v-if="info&&info.billStatus == 'CANCEL'&&isPayOk">
+					<view class="infoList" v-if="info&&(info.billStatus == 'CANCEL'||info.billStatus == 'AUDIT_REJECT')&&isPayOk">
 						<text>退款方式</text>
 						<text>原支付返回</text>
 					</view>
-					<view class="infoList" v-if="info&&info.billStatus == 'CANCEL'&&isPayOk">
+					<view class="infoList" v-if="info&&(info.billStatus == 'CANCEL'||info.billStatus == 'AUDIT_REJECT')&&isPayOk">
 						<text>退款时间</text>
 						<text>{{info.payInfo.refundDate ||'--'}}</text>
 					</view>
-					<view class="infoList" v-if="info&&info.billStatus == 'CANCEL'&&isPayOk">
+					<view class="infoList" v-if="info&&(info.billStatus == 'CANCEL'||info.billStatus == 'AUDIT_REJECT')&&isPayOk">
 						<text>退款状态</text>
 						<text>{{info.payInfo.refundState=='FINISH'?'已退款':'退款失败'}}</text>
 					</view>

+ 11 - 6
pagesB/procureOrder/orderList.vue

@@ -43,8 +43,8 @@
 								 <view class="check-row">
 									 <view v-if="item.totalCategory>1" class="check-row-left">
 										 <scroll-view style="width: 100%;white-space: nowrap;" scroll-x="true">
-											 <view class="img-item" v-for="item in item.productList" :key="item.id">
-											 	 <image :src="item.images||'/static/def_imgs.png'" style="width: 100%;height: 100%;"></image>
+											 <view class="img-item" v-for="pitem in item.productList" :key="pitem.id">
+											 	 <image :src="pitem.images||'/static/def_imgs.png'" style="width: 100%;height: 100%;"></image>
 											 </view>
 										 </scroll-view>
 									 </view>
@@ -188,13 +188,18 @@
 			},
 			// 刷新列表
 			resetList(item,state){
+				// 其它列表,删除当前操作的订单
+				const index = this.list.findIndex((key)=>key.purchaseSn == item.purchaseSn)
 				// 全部列表,改变状态
 				if(this.swiperCurrent==0){
-					item.billStatus = state
-					this.list.splice()
+					purchaseQueryPage({pageNo:1,pageSize:1,purchaseSn: item.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
+							this.list.splice(index,1,data)
+						}
+					})
 				}else{
-					// 其它列表,删除当前操作的订单
-					const index = this.list.findIndex((key)=>key.purchaseSn == item.purchaseSn)
 					if(index>-1){
 						this.list.splice(index,1)
 					}