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

pages/task/audit/charge_against_revenue.vue

@@ -15,7 +15,7 @@
 					<!-- {{auditList.length > 0 ?auditList[auditList.length - 1].operatorMajorRoleName:""}} -->
 					<view class="infoText">待决策人审核</view>
 				</view>
-				<view class="infoData">{{updateDate}}</view>
+				<view class="infoData">{{auditInfo.updateDate}}</view>
 			</view>
 		</view>
 		<!-- 	<view class='content1'>
@@ -338,7 +338,6 @@
 					id: this.id
 				}).then(res1 => {
 					if (res1.data.code == 200) {
-						debugger
 						this.auditInfo = res1.data.data
 						if (this.auditInfo.addressUrl && this.auditInfo.addressUrl != '') {
 							this.auditInfo.srcList = this.auditInfo.addressUrl.split(',')
@@ -416,29 +415,29 @@
 										mask: true
 									})
 									var count = 0
-									for (let num = 0; num < that.List.length; num++) {
-										that.$api.doRequest('post', '/workflow/api/handle', {
-											taskId: that.auditInfo.taskId,
-											approved: false,
-											auditMind: that.auditMind ? that.auditMind : "",
-											needReapply: true
-										}).then(res => {
-											count++
-											if (count == that.List.length) {
-												uni.hideLoading()
-												that.$api.msg('审核成功！')
-												setTimeout(function() {
-													uni.navigateBack();
-												}, 2000);
-											}
-										})
-									}
+									// for (let num = 0; num < that.List.length; num++) {
+									that.$api.doRequest('post', '/workflow/api/handle', {
+										taskId: that.auditInfo.taskId,
+										approved: false,
+										auditMind: that.auditMind ? that.auditMind : "",
+										needReapply: true
+									}).then(res => {
+										count++
+										if (count == that.List.length) {
+											uni.hideLoading()
+											that.$api.msg('审核成功！')
+											console.log('驳回成功！')
+											setTimeout(function() {
+												uni.navigateBack();
+											}, 2000);
+										}
+									})
+									// }
 								}
 							}
 						})
 					}
 				} else {
-					debugger
 					var that = this
 					this.show = false
 					uni.showModal({
@@ -451,24 +450,25 @@
 									title: "审核中...",
 									mask: true
 								})
-								for (let num = 0; num < that.List.length; num++) {
-									var tmp = 0
-									that.$api.doRequest('post', '/workflow/api/handle', {
-										taskId: that.auditInfo.taskId,
-										approved: true,
-										auditMind: that.auditMind ? that.auditMind : "",
-										needReapply: false
-									}).then(res => {
-										tmp++
-										if (tmp == that.List.length) {
-											uni.hideLoading()
-											that.$api.msg('审核成功！')
-											setTimeout(function() {
-												uni.navigateBack();
-											}, 2000);
-										}
-									})
-								}
+								// for (let num = 0; num < that.List.length; num++) {
+								var tmp = 0
+								that.$api.doRequest('post', '/workflow/api/handle', {
+									taskId: that.auditInfo.taskId,
+									approved: true,
+									auditMind: that.auditMind ? that.auditMind : "",
+									needReapply: false
+								}).then(res => {
+									tmp++
+									// if (tmp == that.List.length) {
+									uni.hideLoading()
+									that.$api.msg('审核成功！')
+									console.log('审核通过！')
+									setTimeout(function() {
+										uni.navigateBack();
+									}, 2000);
+									// }
+								})
+								// }
 							}
 						}
 					})

pages/task/audit/charge_against_revenue_detail.vue

@@ -240,7 +240,6 @@
 					id: this.id
 				}).then(res1 => {
 					if (res1.data.code == 200) {
-						debugger
 						this.auditInfo = res1.data.data
 						if (this.auditInfo.addressUrl && this.auditInfo.addressUrl != '') {
 							this.auditInfo.srcList = this.auditInfo.addressUrl.split(',')

pages/task/audit/freight_settlement_approval.vue

@@ -146,7 +146,6 @@
 					batchId: this.id
 				}).then(res => {
 					if (res.data.code == 200) {
-						debugger
 						this.list = res.data.data
 						// console.log(this.list, 124)
 					}

pages/task/audit/freight_settlement_details.vue

@@ -99,7 +99,6 @@
 					batchId: this.id
 				}).then(res => {
 					if (res.data.code == 200) {
-						debugger
 						this.list = res.data.data
 						// console.log(this.list, 124)
 					}

pages/task/audit/warehouse_warrant.vue

@@ -43,7 +43,7 @@
 				<view class="left">合计金额（元）</view>
 				<view class="right">{{auditInfo.requestFundsTotal}}</view>
 			</view>
-		<!-- 	<view class="row">
+			<!-- 	<view class="row">
 				<view class="left">仓库名称</view>
 				<view class="right">{{auditInfo.warehouseName}}</view>
 			</view>
@@ -72,7 +72,7 @@
 				</view>
 				<view class="mx-bottom">
 					<view class="mx-row1">
-						
+
 						<!-- <view class="mx-item">
 							平均容重
 						</view>
@@ -322,7 +322,6 @@
 			// },
 			//审核确定
 			passSubmit() {
-				debugger
 				var that = this
 				that.show = false
 				if (this.title == '驳回原因（驳回）') {
@@ -342,21 +341,21 @@
 									})
 									var count = 0
 									// for (let num = 0; num < that.List.length; num++) {
-										that.$api.doRequest('post', '/workflow/api/handle', {
-											taskId: that.auditInfo.taskId,
-											approved: false,
-											auditMind: that.auditMind ? that.auditMind : "",
-											needReapply: true
-										}).then(res => {
-											// count++
-											// if (count == that.List.length) {
-												uni.hideLoading()
-												that.$api.msg('审核成功！')
-												setTimeout(function() {
-													uni.navigateBack();
-												}, 2000);
-											// }
-										})
+									that.$api.doRequest('post', '/workflow/api/handle', {
+										taskId: that.auditInfo.taskId,
+										approved: false,
+										auditMind: that.auditMind ? that.auditMind : "",
+										needReapply: true
+									}).then(res => {
+										// count++
+										// if (count == that.List.length) {
+										uni.hideLoading()
+										that.$api.msg('审核成功！')
+										setTimeout(function() {
+											uni.navigateBack();
+										}, 2000);
+										// }
+									})
 									// }
 								}
 							}
@@ -377,21 +376,21 @@
 								})
 								// for (let num = 0; num < that.List.length; num++) {
 								// 	var tmp = 0
-									that.$api.doRequest('post', '/workflow/api/handle', {
-										taskId: that.auditInfo.taskId,
-										approved: true,
-										auditMind: that.auditMind ? that.auditMind : "",
-										needReapply: false
-									}).then(res => {
-										// tmp++
-										// if (tmp == that.List.length) {
-											uni.hideLoading()
-											that.$api.msg('审核成功！')
-											setTimeout(function() {
-												uni.navigateBack();
-											}, 2000);
-										// }
-									})
+								that.$api.doRequest('post', '/workflow/api/handle', {
+									taskId: that.auditInfo.taskId,
+									approved: true,
+									auditMind: that.auditMind ? that.auditMind : "",
+									needReapply: false
+								}).then(res => {
+									// tmp++
+									// if (tmp == that.List.length) {
+									uni.hideLoading()
+									that.$api.msg('审核成功！')
+									setTimeout(function() {
+										uni.navigateBack();
+									}, 2000);
+									// }
+								})
 								// }
 							}
 						}
@@ -750,7 +749,7 @@
 		}
 
 		.mx-item {
-			text-align:left;
+			text-align: left;
 			// width: 33%;
 			// text-align: center;
 		}

pages/task/my_task.vue

@@ -479,7 +479,6 @@
 				this.getIndexBuyData(statusFlag)
 			},
 			navToDetailPage(item) {
-				debugger
 				if (item.businessCode == 'PROCUREMENT-ORDER-APPROVE') {
 					uni.navigateTo({
 						url: '/pages/task/procurement_details?id=' + item.businessId + "&isShowbtn=true"
@@ -660,7 +659,7 @@
 							url: `/pages/task/audit/warehouse_warrant_detail?id=` + item.businessId
 						})
 					}
-				}  else if (item.businessCode == 'FEIYONGGUANLI-APPROVE') {
+				} else if (item.businessCode == 'FEIYONGGUANLI-APPROVE') {
 					if (this.statusFlag == 1) {
 						uni.navigateTo({
 							url: `/pages/task/audit/charge_against_revenue?id=` + item.businessId