Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

main.js

@@ -225,7 +225,7 @@ const doRequest = (method, url, data, header) => {
 			},
 			success: function(result) {
 				// console.log(result,111111111111)
-				uni.hideLoading()
+				// uni.hideLoading()
 					resolve(result)
 				// resolve调用后，即可传递到调用方使用then或者async+await同步方式进行处理逻辑
 				

pages/business/businessNew.vue

@@ -218,6 +218,8 @@
 		onShow() {
 			if(uni.getStorageSync('jiaoyikeyword')){
 				this.keyword=uni.getStorageSync('jiaoyikeyword')
+			}else{
+				this.keyword=''
 			}
 			let _tl = uni.getStorageSync('transactionLocation')
 			if (_tl) {

pages/business/search.vue

@@ -314,6 +314,7 @@
 </script>
 
 <style lang="scss" scoped>
+	
 	view {
 		// display: block;
 	}
@@ -321,6 +322,7 @@
 	.content {
 		overflow: hidden;
 		background: #fff;
+		height:100vh;
 	}
 
 	.cancel {

pages/task/audit/Issueandreceipt_task_approval.vue

@@ -732,34 +732,39 @@
 						confirmText: '确定',
 						success: function(res) {
 							if (res.confirm) {
+								uni.showLoading({
+									title: "审核中",
+									mask:true
+								})
 								console.log(that.OutList,that.EnterList)
 								that.OutList.inOutFlag = 1
 								that.EnterList.inOutFlag = 2
-								// if (that.OutList.taskTypeKey == 1) {
-								// 	that.requestadd(that.OutList)
-								// } else if (that.EnterList.taskTypeKey == 2) {
-								// 	that.requestadd(that.EnterList)
-								// } else if (
-								// 	that.OutList.taskTypeKey == 3 ||
-								// 	that.OutList.taskTypeKey == 4
-								// ) {
-								// 	that.requestadd(that.OutList, 'repetition')
-								// 	if (!that.deletetask) {
-								// 		that.requestadd(that.EnterList, 'repetition')
-								// 	}
-								// }
-								// if (that.retreatList.taskTypeKey == 1 || that.retreatList.taskTypeKey == 2) {
-								// 	that.requestadd(that.retreatList)
-								// } else if (that.retreatList.taskTypeKey == 3 || that.retreatList.taskTypeKey ==
-								// 	4) {
-								// 	that.requestadd(that.retreatList, 'repetition')
-								// }
+								if (that.OutList.taskTypeKey == 1) {
+									that.requestadd(that.OutList)
+								} else if (that.EnterList.taskTypeKey == 2) {
+									that.requestadd(that.EnterList)
+								} else if (
+									that.OutList.taskTypeKey == 3 ||
+									that.OutList.taskTypeKey == 4
+								) {
+									that.requestadd(that.OutList, 'repetition')
+									if (!that.deletetask) {
+										that.requestadd(that.EnterList, 'repetition')
+									}
+								}
+								if (that.retreatList.taskTypeKey == 1 || that.retreatList.taskTypeKey == 2) {
+									that.requestadd(that.retreatList)
+								} else if (that.retreatList.taskTypeKey == 3 || that.retreatList.taskTypeKey ==
+									4) {
+									that.requestadd(that.retreatList, 'repetition')
+								}
 							}
 						}
 					})
 				}
 			},
 			rejectSubmit() {
+				
 				// （1出库2入库3移库4退库并出库）
 				if (!this.auditMind) {
 					this.$api.msg('驳回原因不能为空！')
@@ -772,6 +777,10 @@
 						confirmText: '确定',
 						success: function(res) {
 							if (res.confirm) {
+								uni.showLoading({
+									title: "审核中",
+									mask:true
+								})
 								if (that.OutList.taskTypeKey == 1) {
 									that.requestaudit(that.OutList)
 								} else if (that.OutList.taskTypeKey == 2) {
@@ -808,14 +817,12 @@
 				}
 			},
 			requestadd(list, status) {
+				this.show1=false
 				let that = this
 				uni.getStorage({
 					key: 'pcUserInfo',
 					success(e) {
 						list.compId = e.data.compId //这就是你想要取的token
-						uni.showLoading({
-							title: "审核中"
-						})
 						that.$api.doRequest('post', '/inOutWarehouseTask/api/checkOrUpdateInOutTask', list).then(
 							res => {
 								if (res.data.code == 200) {
@@ -830,29 +837,34 @@
 										needReapply: false
 									}).then(res => {
 										if (res.data.code == 200) {
+											
 											that.$api.msg('审核成功！')
 											that.count++
 											if (that.everyCheck) {
 												helper.setAudit(that.list)
 											}
 										} else {
+											that.show1=true
 											that.$api.msg('审核失败！')
 										}
 										if (list.taskTypeKey == '3' || list.taskTypeKey == '4') {
 											if (that.count == 2) {
 												setTimeout(function() {
+													console.log(11111)
 													uni.hideLoading()
 													uni.navigateBack()
 												}, 1000);
 											}
 										} else {
 											setTimeout(function() {
+												console.log(2222222)
 												uni.hideLoading()
 												uni.navigateBack()
 											}, 1000);
 										}
 
 									}).catch(res => {
+										console.log(33333)
 										uni.hideLoading()
 										if (res.message) {
 											uni.showToast({
@@ -895,9 +907,6 @@
 			},
 			requestaudit(list, status) {
 
-				uni.showLoading({
-					title: "审核中"
-				})
 				let pcUserInfo = uni.getStorageSync('pcUserInfo')
 				if(pcUserInfo){
 					list.compId = pcUserInfo.compId

pages/task/audit/acquisition_information_approval.vue

@@ -93,6 +93,9 @@
 					confirmText: '确定',
 					success: function(res) {
 						if (res.confirm) {
+							uni.showLoading({
+								title: "审核中"
+							})
 							that.$api.doRequest('post', '/acquisitionInfo/api/examine', {
 								flag: 2,
 								id: that.toexamineId
@@ -117,6 +120,9 @@
 					confirmText: '确定',
 					success: function(res) {
 						if (res.confirm) {
+							uni.showLoading({
+								title: "审核中"
+							})
 							that.$api.doRequest('post', '/acquisitionInfo/api/examine', {
 								flag: 1,
 								id: that.toexamineId

pages/task/audit/leave_approve.vue

@@ -161,6 +161,9 @@
 						showCancel: true,
 						confirmText: '确定',
 						success: function(res) {
+							uni.showLoading({
+								title: "审核中"
+							})
 							that.$api.doRequest('post', '/newWorkflow/api/handle', {
 								approved: true,
 								taskId: that.dataList.taskId,
@@ -168,10 +171,12 @@
 								needReapply: false
 							}).then(res => {
 								if (res.data.code == 200) {
+									uni.hideLoading()
 									that.$api.msg('审核成功！')
 									uni.navigateTo({
 										url: "/pages/task/my_task"
 									})
+									
 								} else {
 									that.$api.msg('审核失败！')
 								}
@@ -208,6 +213,9 @@
 						showCancel: true,
 						confirmText: '确定',
 						success: function(res) {
+							uni.showLoading({
+								title: "审核中"
+							})
 							that.$api.doRequest('post', '/newWorkflow/api/handle', {
 								approved: false,
 								taskId: that.dataList.taskId,

pages/task/audit/supp_clock_approve.vue

@@ -137,12 +137,16 @@
 						showCancel: true,
 						confirmText: '确定',
 						success: function(res) {
+							uni.showLoading({
+								title: "审核中"
+							})
 							that.$api.doRequest('post', '/newWorkflow/api/handle', {
 								approved: true,
 								taskId: that.dataList.taskId,
 								auditMind: that.auditMind,
 								needReapply: false
 							}).then(res => {
+								uni.hideLoading()
 								if (res.data.code == 200) {
 									that.$api.msg('审核成功！')
 									uni.navigateTo({
@@ -184,6 +188,9 @@
 						showCancel: true,
 						confirmText: '确定',
 						success: function(res) {
+							uni.showLoading({
+								title: "审核中"
+							})
 							that.$api.doRequest('post', '/newWorkflow/api/handle', {
 								approved: false,
 								taskId: that.dataList.taskId,

pages/task/audit/tradeServices_audit.vue

@@ -283,12 +283,16 @@
 						this.$api.msg('驳回意见不能为空')
 						return
 					}
+					uni.showLoading({
+						title: "审核中"
+					})
 					this.$api.doRequest('post', '/newWorkflow/api/handle', {
 						taskId: this.tradeList.taskId,
 						approved: false,
 						auditMind: this.auditMind,
 						needReapply: true,
 					}).then(res => {
+						uni.hideLoading()
 						if (res.data.code == 200) {
 							uni.showToast({
 								title: "驳回成功",
@@ -298,6 +302,7 @@
 							uni.navigateBack()
 						}
 					}).catch(res => {
+						uni.hideLoading()
 						if (res.errmsg) {
 							uni.showToast({
 								title: res.errmsg,
@@ -306,7 +311,10 @@
 							})
 						}
 					});
-				} else {//通过
+				} else {
+					uni.showLoading({
+						title: "审核中"
+					})//通过
 				   if(this.tradeList.approveStatus == "待银行审批"){
 					   this.tradeList.amountToRepaid = this.tradeList.amountDue//设置待还金额 = 应还金额
 					   this.$api.doRequest('post', '/tradeWarehouseReceiptAppl/api/editTradeWarehouseReceiptAppl', this.tradeList)
@@ -318,6 +326,7 @@
 							   	auditMind: this.auditMind ? this.auditMind : "审核通过",
 							   	needReapply: false,
 							   }).then(res => {
+								   uni.hideLoading()
 							   	if (res.data.code == 200) {
 							   		uni.showToast({
 							   			title: "审核成功",
@@ -327,6 +336,7 @@
 							   		uni.navigateBack()
 							   	}
 							   }).catch(res => {
+								   uni.hideLoading()
 							   	if (res.errmsg) {
 							   		uni.showToast({
 							   			title: res.errmsg,
@@ -344,6 +354,7 @@
 						auditMind: this.auditMind ? this.auditMind : "审核通过",
 						needReapply: false,
 					}).then(res => {
+						uni.hideLoading()
 						if (res.data.code == 200) {
 							uni.showToast({
 								title: "审核成功",
@@ -353,6 +364,7 @@
 							uni.navigateBack()
 						}
 					}).catch(res => {
+						uni.hideLoading()
 						if (res.errmsg) {
 							uni.showToast({
 								title: res.errmsg,

pages/task/audit/warehouse_approval.vue

@@ -432,6 +432,9 @@
 						confirmText: '确定',
 						success: function(res) {
 							if (res.confirm) {
+								uni.showLoading({
+									title: "审核中"
+								})
 								that.$api.doRequest('post', '/newWorkflow/api/handle', {
 									taskId: that.list.taskId,
 									approved: false,