lilei 7 months ago
parent
commit
13c57f9628
2 changed files with 37 additions and 28 deletions
  1. 15 15
      pagesB/procureOrder/orderDetail.vue
  2. 22 13
      pagesB/procureOrder/orderList.vue

+ 15 - 15
pagesB/procureOrder/orderDetail.vue

@@ -1,6 +1,6 @@
 <template>
 <template>
 	<view class="orderDetail-digitalShel flex flex_column">
 	<view class="orderDetail-digitalShel flex flex_column">
-		<view class="contHead" :style="{background:state!= 'error'&&state!= 'AUDIT_REJECT'&&state!='CANCEL' ? '#066cff':'#f34503',color:'#fff'}">
+		<view class="contHead" :style="{background:state!= 'error'&&state!= 'AUDIT_REJECT'&&state!='CANCEL' ? '#066cff':'#e61100',color:'#fff'}">
 			<view class="statusH">
 			<view class="statusH">
 				<view class="flex flex_column align_center">
 				<view class="flex flex_column align_center">
 					<view class="status-row">
 					<view class="status-row">
@@ -8,7 +8,7 @@
 						</u-icon>
 						</u-icon>
 						<text>{{statusText}}</text>
 						<text>{{statusText}}</text>
 					</view>
 					</view>
-					<view class="messageText"><text>{{statusMessage}}</text></view>
+					<view class="messageText" v-if="statusMessage"><text>{{statusMessage}}</text></view>
 				</view>
 				</view>
 			</view>
 			</view>
 		</view>
 		</view>
@@ -125,11 +125,11 @@
 				</view>
 				</view>
 			</view>
 			</view>
 		</view>
 		</view>
-		<view class="footer" v-if="info">
-			<view class="flex align_center justify_center">
+		<view v-if="info&&info.billStatus == 'WAIT_AUDIT'||info.billStatus == 'WAIT_PAY'||info.billStatus == 'WAIT_RECEIVE'" style="background-color: #fff;">
+			<view class="footer flex align_center justify_center">
 				<u-button style="margin-left: 10px;" v-if="info.billStatus == 'WAIT_AUDIT'" size="mini" shape="round" type="default" plain @click="cancelOrder(info)">取消订单</u-button>
 				<u-button style="margin-left: 10px;" v-if="info.billStatus == 'WAIT_AUDIT'" size="mini" shape="round" type="default" plain @click="cancelOrder(info)">取消订单</u-button>
 				<u-button style="margin-left: 10px;" v-if="info.billStatus == 'WAIT_AUDIT'" size="mini" shape="round" type="error" plain @click="payOrder(info)">立即支付</u-button>
 				<u-button style="margin-left: 10px;" v-if="info.billStatus == 'WAIT_AUDIT'" size="mini" shape="round" type="error" plain @click="payOrder(info)">立即支付</u-button>
-				<!-- <u-button style="margin-left: 10px;" v-if="info.billStatus == 'CANCEL'" size="mini" shape="round" type="error" plain @click="buyAgain(info)">再次购买</u-button> -->
+				<!-- <u-button style="margin-left: 10px;" v-if="info.billStatus == 'FINISH'" size="mini" shape="round" type="error" plain @click="buyAgain(info)">再次购买</u-button> -->
 				<u-button style="margin-left: 10px;" v-if="info.billStatus == 'WAIT_RECEIVE'" size="mini" shape="round" type="error" plain @click="receiveOrder(info)">确认收货</u-button>
 				<u-button style="margin-left: 10px;" v-if="info.billStatus == 'WAIT_RECEIVE'" size="mini" shape="round" type="error" plain @click="receiveOrder(info)">确认收货</u-button>
 			</view>
 			</view>
 			<view :style="{height:safeAreaBottom+'px'}"></view>
 			<view :style="{height:safeAreaBottom+'px'}"></view>
@@ -174,16 +174,16 @@
 			  this.info = data
 			  this.info = data
 			  this.state = data.billStatus
 			  this.state = data.billStatus
 			  this.purchaseSn = data.purchaseSn
 			  this.purchaseSn = data.purchaseSn
-			  const stateText = {'WAIT_AUDIT':'待审核','WAIT_PAY':'待付款','AUDIT_REJECT':'审核不通过','WAIT_OUT_WAREHOUSE':'待收货','FINISH':'已完结','CANCEL':'已取消'}
+			  const stateText = {'WAIT_AUDIT':'待审核','WAIT_PAY':'待付款','AUDIT_REJECT':'审核不通过','WAIT_OUT_WAREHOUSE':'待收货','WAIT_RECEIVE':'待收货','FINISH':'已完结','CANCEL':'已取消'}
 			  this.statusText = stateText[this.state]
 			  this.statusText = stateText[this.state]
-			  this.statusIcon = this.state == 'FINISH' ? 'checkmark-circle' : (this.state == 'AUDIT_REJECT'?'close':'hourglass')
-			  this.statusMessage = this.state == 'WAIT_OUT_WAREHOUSE' ? '请耐心等待汽配经销商进行配送' : ''
+			  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()
 			  this.getDetailList()
 			  // 更改标题栏背景色
 			  // 更改标题栏背景色
 			  uni.setNavigationBarColor({
 			  uni.setNavigationBarColor({
 			  	frontColor: '#ffffff',
 			  	frontColor: '#ffffff',
-			  	backgroundColor: this.state!= 'error'&&this.state!= 'AUDIT_REJECT'&&this.state!= 'CANCEL' ? '#066cff':'#f34503',
+			  	backgroundColor: this.state!= 'error'&&this.state!= 'AUDIT_REJECT'&&this.state!= 'CANCEL' ? '#066cff':'#e61100',
 			  })
 			  })
 		  }
 		  }
 	   },
 	   },
@@ -249,7 +249,7 @@
 		 				purchaseCancel({purchaseSn:_this.purchaseSn}).then(res => {
 		 				purchaseCancel({purchaseSn:_this.purchaseSn}).then(res => {
 		 					if (res.status == 200) {
 		 					if (res.status == 200) {
 		 						_this.message('取消成功')
 		 						_this.message('取消成功')
-								uni.$emit('refreshPurcaOrder')
+								uni.$emit('refreshPurcaOrder',item,'CANCEL')
 								uni.navigateBack()
 								uni.navigateBack()
 		 					} else {
 		 					} else {
 		 						_this.message(res.message)
 		 						_this.message(res.message)
@@ -267,7 +267,7 @@
 		 payComplete(item,isOk){
 		 payComplete(item,isOk){
 		 	this.showPopu = false
 		 	this.showPopu = false
 		 	if(isOk){
 		 	if(isOk){
-		 		uni.$emit('refreshPurcaOrder')
+		 		uni.$emit('refreshPurcaOrder',item,'WAIT_AUDIT')
 				uni.navigateBack()
 				uni.navigateBack()
 		 	}
 		 	}
 		 },
 		 },
@@ -286,7 +286,7 @@
 		 				purchaseReceive({purchaseSn:_this.purchaseSn}).then(res => {
 		 				purchaseReceive({purchaseSn:_this.purchaseSn}).then(res => {
 		 					if (res.status == 200) {
 		 					if (res.status == 200) {
 		 						_this.message('收货成功')
 		 						_this.message('收货成功')
-								uni.$emit('refreshPurcaOrder')
+								uni.$emit('refreshPurcaOrder',item,'FINISH')
 		 						uni.navigateBack()
 		 						uni.navigateBack()
 		 					} else {
 		 					} else {
 		 						_this.message(res.message)
 		 						_this.message(res.message)
@@ -388,12 +388,12 @@
 			}
 			}
 			.item-list-box{
 			.item-list-box{
 				border-bottom: 2rpx solid #f2f2f2;
 				border-bottom: 2rpx solid #f2f2f2;
-			}
-			.item-list{
-				padding: 20rpx 0;
 				&:last-child{
 				&:last-child{
 					border: none;
 					border: none;
 				}
 				}
+			}
+			.item-list{
+				padding: 20rpx 0;
 				> view{
 				> view{
 					&:first-child{
 					&:first-child{
 						margin-right: 20rpx;
 						margin-right: 20rpx;

+ 22 - 13
pagesB/procureOrder/orderList.vue

@@ -138,7 +138,7 @@
 			let _this = this
 			let _this = this
 			_this.pageInit()
 			_this.pageInit()
 			uni.$on('refreshPurcaOrder',function(data){
 			uni.$on('refreshPurcaOrder',function(data){
-				 _this.resetList()
+				 _this.resetList(data)
 			})
 			})
 		},
 		},
 		methods:{
 		methods:{
@@ -152,10 +152,19 @@
 				const str = Number(value).toFixed(2).split('.')
 				const str = Number(value).toFixed(2).split('.')
 				return str;
 				return str;
 			},
 			},
-			resetList(){
-				this.list = []
-				this.status = "loading"
-				this.pageInit()
+			// 刷新列表
+			resetList(item,state){
+				// 全部列表,改变状态
+				if(this.swiperCurrent==0){
+					item.billStatus = state
+					this.list.splice()
+				}else{
+					// 其它列表,删除当前操作的订单
+					const index = this.list.findIndex((key)=>key.purchaseSn == item.purchaseSn)
+					if(index>-1){
+						this.list.splice(index,1)
+					}
+				}
 			},
 			},
 			pageInit(){
 			pageInit(){
 				this.total = 0
 				this.total = 0
@@ -211,7 +220,7 @@
 							purchaseCancel({purchaseSn:item.purchaseSn}).then(res => {
 							purchaseCancel({purchaseSn:item.purchaseSn}).then(res => {
 								if (res.status == 200) {
 								if (res.status == 200) {
 									_this.message('取消成功')
 									_this.message('取消成功')
-									_this.pageInit()
+									_this.resetList(item,'CANCEl')
 								} else {
 								} else {
 									_this.message(res.message)
 									_this.message(res.message)
 								}
 								}
@@ -231,7 +240,7 @@
 				if(isOk){
 				if(isOk){
 					this.viewRow(item)
 					this.viewRow(item)
 					setTimeout(()=>{
 					setTimeout(()=>{
-						this.resetList()
+						this.resetList(item,'WAIT_AUDIT')
 					},150)
 					},150)
 				}
 				}
 			},
 			},
@@ -250,7 +259,7 @@
 							purchaseReceive({purchaseSn:item.purchaseSn}).then(res => {
 							purchaseReceive({purchaseSn:item.purchaseSn}).then(res => {
 								if (res.status == 200) {
 								if (res.status == 200) {
 									_this.message('收货成功')
 									_this.message('收货成功')
-									_this.pageInit()
+									_this.resetList(item,'FINISH')
 								} else {
 								} else {
 									_this.message(res.message)
 									_this.message(res.message)
 								}
 								}
@@ -402,16 +411,16 @@
 					}
 					}
 					.img-item{
 					.img-item{
 						display: inline-block;
 						display: inline-block;
-						width: 200rpx;
-						height: 200rpx;
+						width: 160rpx;
+						height: 160rpx;
 						background: #f8f8f8;
 						background: #f8f8f8;
 						border-radius: 5px;
 						border-radius: 5px;
-						margin-right: 10px;
+						margin-right: 5px;
 					}
 					}
 					.product-info{
 					.product-info{
 						flex-grow: 1;
 						flex-grow: 1;
 						width: 60%;
 						width: 60%;
-						padding-right: 10px;
+						padding:0 5px;
 						> text{
 						> text{
 							&:last-child{
 							&:last-child{
 								margin-top: 5px;
 								margin-top: 5px;
@@ -432,7 +441,7 @@
 						justify-content: center;
 						justify-content: center;
 						align-items: flex-end;
 						align-items: flex-end;
 						padding:0 5px;
 						padding:0 5px;
-						height: 200rpx;
+						height: 160rpx;
 						min-width: 100rpx;
 						min-width: 100rpx;
 						text-align: right;
 						text-align: right;
 						font-size: 10px;
 						font-size: 10px;