1

pages/task/audit/charge_against_revenue.vue

@@ -565,14 +565,17 @@
 						}
 						this.auditInfo.amountIngPayableTotal1 = helper.convertCurrency(this.auditInfo
 							.amountIngPayableTotal)
-						if(this.auditInfo.status == '已收款' || this.auditInfo.status == '待付款'){
+						if((this.auditInfo.status == '已收款' && this.vesselId == '点击切换任务状态') 
+						|| (this.auditInfo.status == '待付款' && this.vesselId == '点击切换任务状态')){
 							this.$api.doRequest('post', '/expenseInfo/editCollectionStatus',
 								that.detialData).then(res1 => {
 								if (res1.data.code == 200) {
-									// that.$api.msg('任务状态切换成功！')
-									// setTimeout(function() {
-									// 	uni.navigateBack();
-									// }, 2000);
+									that.$api.msg('任务状态切换成功！')
+									setTimeout(function() {
+										uni.navigateBack();
+									}, 2000);
+								}else{
+									return
 								}
 							})
 						}

pages/task/my_task.vue

@@ -797,9 +797,10 @@
 						})
 					}
 				} else if (item.businessCode == 'FEIYONGGUANLI-APPROVE') {
+					debugger
 					if (this.statusFlag == 1) {
 						uni.navigateTo({
-							url: `/pages/task/audit/charge_against_revenue?id=` + item.businessId
+							url: `/pages/task/audit/charge_against_revenue?id=` + item.businessId + '&vesselId=' + item.vesselId
 						})
 					} else {
 						uni.navigateTo({