haugnfuli il y a 3 ans
Parent
commit
d35565c131
2 fichiers modifiés avec 20 ajouts et 2 suppressions
  1. 6 1
      pages/task/audit/purchasecontract.vue
  2. 14 1
      pages/task/audit/salecontract.vue

+ 6 - 1
pages/task/audit/purchasecontract.vue

@@ -205,13 +205,15 @@
 				}).then(res => {
 				}).then(res => {
 					that.$api.msg('驳回成功')
 					that.$api.msg('驳回成功')
 					that.show=false
 					that.show=false
+					setTimeout(function() {
+						uni.navigateBack()
+					}, 1000);
 				})
 				})
 			},
 			},
 			close(){
 			close(){
 				this.show=false
 				this.show=false
 			},
 			},
 			pass(){
 			pass(){
-				console.log(1111)
 				this.show=true
 				this.show=true
 				this.title='通过原因'
 				this.title='通过原因'
 			},
 			},
@@ -233,6 +235,9 @@
 					}).then(res => {
 					}).then(res => {
 						that.$api.msg('通过成功')
 						that.$api.msg('通过成功')
 						that.show=false
 						that.show=false
+						setTimeout(function() {
+							uni.navigateBack()
+						}, 1000);
 					})
 					})
 				}
 				}
 				
 				

+ 14 - 1
pages/task/audit/salecontract.vue

@@ -131,7 +131,7 @@
 				<view style='padding:10px;'>
 				<view style='padding:10px;'>
 					<input v-model='auditMind' placeholder="请输入审核意见,不超过100字" type="text" value="" />
 					<input v-model='auditMind' placeholder="请输入审核意见,不超过100字" type="text" value="" />
 				</view>
 				</view>
-				<view  @click='passSubmit()' class="cancel">取消</view>
+				<view  @click='close()' class="cancel">取消</view>
 				<view  @click='passSubmit()' class="confirm">确定</view>
 				<view  @click='passSubmit()' class="confirm">确定</view>
 			</view>
 			</view>
 		</view>
 		</view>
@@ -196,8 +196,14 @@
 				}).then(res => {
 				}).then(res => {
 					that.$api.msg('驳回成功')
 					that.$api.msg('驳回成功')
 					that.show=false
 					that.show=false
+					setTimeout(function() {
+						uni.navigateBack()
+					}, 1000);
 				})
 				})
 			},
 			},
+			close(){
+				this.show=false
+			},
 			pass(){
 			pass(){
 				console.log(1111)
 				console.log(1111)
 				this.show=true
 				this.show=true
@@ -210,6 +216,9 @@
 			//通过
 			//通过
 			passSubmit() {
 			passSubmit() {
 				var that = this
 				var that = this
+				if(this.title=='驳回原因'){
+					this.rejectSubmit()
+				}else{
 				that.$api.doRequest('post', '/workflow/api/handle', {
 				that.$api.doRequest('post', '/workflow/api/handle', {
 					taskId: that.list.taskId,
 					taskId: that.list.taskId,
 					approved: true,
 					approved: true,
@@ -218,7 +227,11 @@
 				}).then(res => {
 				}).then(res => {
 					that.$api.msg('通过成功')
 					that.$api.msg('通过成功')
 					that.show=false
 					that.show=false
+					setTimeout(function() {
+						uni.navigateBack()
+					}, 1000);
 				})
 				})
+				}
 			},
 			},
 			//审核方法
 			//审核方法
 			audit(item, index, status, status2, reason) {
 			audit(item, index, status, status2, reason) {