前端 sdy

pages/task/audit/Issueandreceipt_task_approval.vue

@@ -64,7 +64,7 @@
 							<view class="right">{{retreatList.predictDate}}</view>
 						</view>
 						<view class='row'>
-							<view class="left">发货人</view>
+							<view class="left">收货人</view>
 							<view class="right">{{retreatList.publisher}}</view>
 						</view>
 					</view>
@@ -236,19 +236,30 @@
 		</view>
 		<u-popup v-model="show1" mode="center">
 			<view style="width: 300px;padding: 30rpx 10rpx;border-radius: 20rpx;">
-				<view class="rejectText">驳回原因</view>
+				<view class="rejectText">审核意见（驳回）</view>
 				<u-input v-model="rejectInfo" type="textarea" :border="border" :height="height" :auto-height="autoHeight"  class="rejectInfoCss"
-					placeholder="请输入驳回原因" />
+					placeholder="请输入审核意见" />
 				<view class="flex">
 					<u-button @click="show1 = false" type="error" hover-class='none'>取消</u-button>
 					<u-button @click="rejectSubmit()" type="success">确定</u-button>
 				</view>
 			</view>
 		</u-popup>
+		<u-popup v-model="show2" mode="center">
+			<view style="width: 300px;padding: 30rpx 10rpx;border-radius: 20rpx;">
+				<view class="rejectText">审核意见（通过）</view>
+				<u-input v-model="rejectInfo1" type="textarea" :border="border" :height="height" :auto-height="autoHeight"  class="rejectInfoCss"
+					placeholder="请输入审核意见" />
+				<view class="flex">
+					<u-button @click="show2 = false" type="error" hover-class='none'>取消</u-button>
+					<u-button @click="passSubmit()" type="success">确定</u-button>
+				</view>
+			</view>
+		</u-popup>
 		<u-toast ref="uToast" />
 		<view style='padding:10px;' class='flex bottom-btn'>
 			<u-button @click='show1 = true' type="error" class="btn1" hover-class='none'>驳回</u-button>
-			<u-button @click='passSubmit()' type="success" class="btn2">通过</u-button>
+			<u-button @click='show2 = true' type="success" class="btn2">通过</u-button>
 		</view>
 	</view>
 
@@ -261,8 +272,9 @@
 	export default {
 		data() {
 			return {
-				height: 100,
+				height: 200,
 				autoHeight: true,
+				border: false,
 				id: "",
 				OutList: {}, //出
 				EnterList: {}, //入
@@ -270,8 +282,9 @@
 				type: '移库',
 				show: false,
 				show1: false,
-				border: false,
+				show2: false,
 				rejectInfo: "", //驳回原因
+				rejectInfo1: "",//通过意见
 				pjList: [{
 						type: '一等品'
 					},
@@ -338,37 +351,42 @@
 				this.EnterList.gradeKey = e[0] + 1
 			},
 			passSubmit() {
-				let that = this
-				uni.showModal({
-					content: "是否确定通过?",
-					showCancel: true,
-					confirmText: '确定',
-					success: function(res) {
-						if (res.confirm) {
-							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 (!this.rejectInfo1) {
+					this.$api.msg('审核意见不能为空！')
+				} else {
+					let that = this
+					that.show2 = false
+					uni.showModal({
+						content: "是否确定通过?",
+						showCancel: true,
+						confirmText: '确定',
+						success: function(res) {
+							if (res.confirm) {
+								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.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退库并出库）
@@ -383,7 +401,6 @@
 						confirmText: '确定',
 						success: function(res) {
 							if (res.confirm) {
-
 								if (that.OutList.taskTypeKey == 1) {
 									that.requestaudit(that.OutList)
 								} else if (that.OutList.taskTypeKey == 2) {
@@ -431,7 +448,7 @@
 						this.$api.doRequest('post', '/workflow/api/handle', {
 							taskId: list.taskId,
 							approved: true,
-							auditMind: '34',
+							auditMind: this.rejectInfo1,
 							needReapply: false
 						}).then(res => {
 							uni.hideLoading()
@@ -777,15 +794,15 @@
 	// 	padding: 30rpx;
 	// 	border-radius: 20rpx;
 	// }
-	.rejectInfoCss {
-		border: 1px solid #ccc;
-		border-radius: 10rpx;
-		background-color: #F9F9FA;
-		margin: 30rpx;
-		overflow-y: auto;
-		// height: 300rpx;
-		background: red;
-	}
+	// .rejectInfoCss {
+	// 	border: 1px solid #ccc;
+	// 	border-radius: 10rpx;
+	// 	background-color: #F9F9FA;
+	// 	margin: 30rpx;
+	// 	overflow-y: auto;
+	// 	// height: 300rpx;
+	// 	background: red;
+	// }
 
 	.uForm_item {
 		padding: 20rpx;
@@ -828,4 +845,18 @@
 			}
 		}
 	}
+	.rejectInfoCss {
+		border: 1px solid #ccc;
+		border-radius: 10rpx;
+		background-color: #F9F9FA;
+		// height: 100px;
+		overflow-y: auto;
+		margin: 30rpx;
+	}
+	.rejectText {
+		text-align: center;
+	}
+	/deep/.u-input__textarea{
+		height: 300rpx!important;
+	}
 </style>

pages/task/audit/Issueandreceipt_task_details.vue

@@ -61,7 +61,7 @@
 							<view class="right">{{retreatList.predictDate}}</view>
 						</view>
 						<view class='row'>
-							<view class="left">出库经办人</view>
+							<view class="left">收货人</view>
 							<view class="right">{{retreatList.publisher}}</view>
 						</view>
 					</view>
@@ -119,7 +119,7 @@
 							<view class="right">{{OutList.predictDate}}</view>
 						</view>
 						<view class='row'>
-							<view class="left">出库经办人</view>
+							<view class="left">发货人</view>
 							<view class="right">{{OutList.publisher}}</view>
 						</view>
 					</view>
@@ -190,7 +190,7 @@
 							<view class="right">{{EnterList.predictDate}}</view>
 						</view>
 						<view class='row'>
-							<view class="left">出库经办人</view>
+							<view class="left">收货人</view>
 							<view class="right">{{EnterList.publisher}}</view>
 						</view>
 					</view>

pages/task/audit/acquisition_settlement_approval.vue

@@ -38,7 +38,7 @@
 		</view>
 		<u-popup v-model="show1" mode="center">
 			<view style="width: 300px;padding: 30rpx 10rpx;border-radius: 20rpx;">
-				<view class="rejectText">审核意见</view>
+				<view class="rejectText">审核意见（驳回）</view>
 				<u-input v-model="rejectInfo" type="textarea" :border="border" class="rejectInfoCss"
 					placeholder="请输入审核意见" />
 				<view class="flex">
@@ -49,7 +49,7 @@
 		</u-popup>
 		<u-popup v-model="show2" mode="center">
 			<view style="width: 300px;padding: 30rpx 10rpx;border-radius: 20rpx;">
-				<view class="rejectText">审核意见</view>
+				<view class="rejectText">审核意见（通过）</view>
 				<u-input v-model="rejectInfo1" type="textarea" :border="border" :height="height" :auto-height="autoHeight"  class="rejectInfoCss"
 					placeholder="请输入审核意见" />
 				<view class="flex">
@@ -84,8 +84,8 @@
 				id: "",
 				currentPage: 1,
 				pageSize: 100,
-				rejectInfo: "", //审核意见
-				rejectInfo1: "", //审核意见
+				rejectInfo: "", //审核驳回意见
+				rejectInfo1: "", //审核通过意见
 				List: [{
 					approveStatus: "",
 				}],
@@ -133,6 +133,7 @@
 					this.$api.msg('驳回原因不能为空！')
 				}else{
 					var that = this
+					that.show1 = false
 					if (this.List.length > 0) {
 						uni.showModal({
 							content: "确定驳回付款申请？",
@@ -151,9 +152,10 @@
 			//通過
 			passSubmit() {
 				if (!this.rejectInfo1) {
-					this.$api.msg('驳回原因不能为空！')
+					this.$api.msg('审核意见不能为空！')
 				}else{
 					var that = this
+					this.show2 = false
 					uni.showModal({
 						content: "确定通过付款申请？",
 						showCancel: true,
@@ -182,7 +184,7 @@
 						this.$api.doRequest('post', '/workflow/api/handle', {
 							taskId: item.taskId,
 							approved: status,
-							auditMind: reason ? '已驳回' : '34',
+							auditMind: reason ? this.rejectInfo : this.rejectInfo1,
 							needReapply: status2 ? true : false
 						}).then(res => {
 							if (res.data.code == 200) {

pages/task/audit/freight_setting_approval.vue

@@ -38,6 +38,18 @@
 				</u-form-item>
 			</u-form>
 		</view>
+		<!-- 审核意见弹窗 -->
+		<!-- <u-popup v-model="show1" mode="center">
+			<view style="width: 300px;padding: 30rpx 10rpx;border-radius: 20rpx;">
+				<view class="rejectText">审核意见</view>
+				<u-input v-model="rejectInfo" type="textarea" :border="border" :height="height" :auto-height="autoHeight"  class="rejectInfoCss"
+					placeholder="请输入审核意见" />
+				<view class="flex">
+					<u-button @click="show1 = false" type="error" hover-class='none'>取消</u-button>
+					<u-button @click="passSubmit()" type="success">确定</u-button>
+				</view>
+			</view>
+		</u-popup> -->
 		<u-button type="primary" class="submit" @click="passSubmit()" v-if="list.priceStatus == '审核中'">通过</u-button>
 	</view>
 </template>
@@ -53,6 +65,12 @@
 					priceStatus: "",
 				},
 				id: "",
+				show1:false,
+				rejectInfo:"",//审核意见
+				//弹窗属性
+				// height:200,
+				// autoHeight: true,
+				// border: false,
 			}
 		},
 		onLoad(options) {
@@ -76,6 +94,11 @@
 					this.$api.msg('运费单价不能为空')
 					return
 				}
+				// if (!this.rejectInfo1) {
+				// 	this.$api.msg('审核意见不能为空！')
+				// }else{
+				
+				// }
 				uni.showModal({
 					content: "是否通过该设置?",
 					showCancel: true,
@@ -166,4 +189,18 @@
 		border-radius: 40rpx;
 		margin-top: 40rpx;
 	}
+	.rejectInfoCss {
+		border: 1px solid #ccc;
+		border-radius: 10rpx;
+		background-color: #F9F9FA;
+		// height: 100px;
+		overflow-y: auto;
+		margin: 30rpx;
+	}
+	.rejectText {
+		text-align: center;
+	}
+	/deep/.u-input__textarea{
+		height: 300rpx!important;
+	}
 </style>

pages/task/audit/freight_settlement_approval.vue

@@ -8,7 +8,7 @@
 							style="height: 40rpx;"></image><!-- 驳回 -->
 						<image src="../../../static/img/tongguo.png" mode="" v-if="list[0].approveStatus == '已通过'"
 							style="height: 40rpx;"></image><!-- 通过 -->
-						<image src="../../../static/img/daishenhe.png" mode="" v-if="list[0].approveStatus == '待决策人审核'"
+						<image src="../../../static/img/daishenhe.png" mode="" v-if="list[0].approveStatus == '待决策人审核'|| list[0].approveStatus == '待财务审核'"
 							style="height: 40rpx;"></image><!-- 待审核 -->
 					</view>
 					<view class="infoText">{{list[0].approveStatus}}</view>
@@ -51,10 +51,32 @@
 				</view>
 			</view>
 		</view>
+		<u-popup v-model="show1" mode="center">
+			<view style="width: 300px;padding: 30rpx 10rpx;border-radius: 20rpx;">
+				<view class="rejectText">审核意见（驳回）</view>
+				<u-input v-model="rejectInfo" type="textarea" :border="border" class="rejectInfoCss"
+					placeholder="请输入审核意见" />
+				<view class="flex">
+					<u-button @click="show1 = false" type="error" hover-class='none'>取消</u-button>
+					<u-button @click="rejectSubmit()" type="success">确定</u-button>
+				</view>
+			</view>
+		</u-popup>
+		<u-popup v-model="show2" mode="center">
+			<view style="width: 300px;padding: 30rpx 10rpx;border-radius: 20rpx;">
+				<view class="rejectText">审核意见（通过）</view>
+				<u-input v-model="rejectInfo1" type="textarea" :border="border" :height="height" :auto-height="autoHeight"  class="rejectInfoCss"
+					placeholder="请输入审核意见" />
+				<view class="flex">
+					<u-button @click="show2 = false" type="error" hover-class='none'>取消</u-button>
+					<u-button @click="passSubmit()" type="success">确定</u-button>
+				</view>
+			</view>
+		</u-popup>
 		<u-toast ref="uToast" />
 		<view style='padding:10px;' class='flex bottom-btn'>
-			<u-button @click="rejectSubmit()" type="error" class="btn1" hover-class='none'>驳回</u-button>
-			<u-button  @click="passSubmit()" type="success" class="btn2">通过</u-button>
+			<u-button @click="show1 = true" type="error" class="btn1" hover-class='none'>驳回</u-button>
+			<u-button  @click="show2 = true" type="success" class="btn2">通过</u-button>
 		</view>
 	</view>
 </template>
@@ -70,6 +92,13 @@
 						approveStatus:"",
 					}
 				],
+				rejectInfo:"",
+				rejectInfo1:"",
+				show1:false,
+				show2:false,
+				height:200,
+				autoHeight: true,
+				border: false,
 			}
 		},
 		onLoad() {
@@ -94,6 +123,10 @@
 				if (this.list.length == 0) {
 						this.$api.msg('没有要审核的条目！')
 				} else {
+					if (!this.rejectInfo) {
+						this.$api.msg('驳回原因不能为空！')
+					}else{
+					this.show1 = false
 					uni.showModal({
 						content: "是否确定驳回?",
 						showCancel: true,
@@ -104,6 +137,7 @@
 							}
 						}
 					})
+					}
 				}
 			},
 			//通过
@@ -112,6 +146,10 @@
 				if (this.list.length == 0) {
 					this.$api.msg('没有要审核的条目！')
 				} else {
+					if (!this.rejectInfo1) {
+						this.$api.msg('审核意见不能为空！')
+					}else{
+					this.show2 = false
 					uni.showModal({
 						content: "是否确定通过?",
 						showCancel: true,
@@ -122,7 +160,9 @@
 							}
 						}
 					})
+					}
 				}
+				
 			},
 			//审核方法
 			audit(item, index, status, status2, reason) {
@@ -130,7 +170,7 @@
 					this.$api.doRequest('post', '/workflow/api/handle', {
 						taskId: item.taskId,
 						approved: status,
-						auditMind: reason != undefined ? '已驳回' : '34',
+						auditMind: reason != undefined ? this.rejectInfo : this.rejectInfo1,
 						needReapply: status2 != undefined ? true : false,
 					}).then(res => {
 						this.audit(this.list[index + 1], index + 1, status)
@@ -272,4 +312,18 @@
 			}
 		}
 	}
+	.rejectInfoCss {
+		border: 1px solid #ccc;
+		border-radius: 10rpx;
+		background-color: #F9F9FA;
+		// height: 100px;
+		overflow-y: auto;
+		margin: 30rpx;
+	}
+	.rejectText {
+		text-align: center;
+	}
+	/deep/.u-input__textarea{
+		height: 300rpx!important;
+	}
 </style>

pages/task/audit/purchase_settlement_approval.vue

@@ -43,14 +43,33 @@
 				</view>
 			</view>
 		</view>
+		<u-popup v-model="show1" mode="center">
+			<view style="width: 300px;padding: 30rpx 10rpx;border-radius: 20rpx;">
+				<view class="rejectText">审核意见（驳回）</view>
+				<u-input v-model="rejectInfo" type="textarea" :border="border" :height="height" :auto-height="autoHeight"  class="rejectInfoCss"
+					placeholder="请输入审核意见" />
+				<view class="flex">
+					<u-button @click="show1 = false" type="error" hover-class='none'>取消</u-button>
+					<u-button @click="rejectSubmit()" type="success">确定</u-button>
+				</view>
+			</view>
+		</u-popup>
+		<u-popup v-model="show2" mode="center">
+			<view style="width: 300px;padding: 30rpx 10rpx;border-radius: 20rpx;">
+				<view class="rejectText">审核意见（通过）</view>
+				<u-input v-model="rejectInfo1" type="textarea" :border="border" :height="height" :auto-height="autoHeight"  class="rejectInfoCss"
+					placeholder="请输入审核意见" />
+				<view class="flex">
+					<u-button @click="show2 = false" type="error" hover-class='none'>取消</u-button>
+					<u-button @click="passSubmit()" type="success">确定</u-button>
+				</view>
+			</view>
+		</u-popup>
 		<u-toast ref="uToast" />
-		<!-- <view class="bottom-btn">
-			<u-button type="primary" class="submit" hover-class="none" @click="rejectSubmit()">驳回</u-button>
-			<u-button type="primary" class="submit" hover-class="none" @click="passSubmit()">通过</u-button>
-		</view> -->
+		
 		<view style='padding:10px;' class='flex bottom-btn'>
-			<u-button  @click='rejectSubmit' type="error" class="btn1" hover-class='none'>驳回</u-button>
-			<u-button  @click='passSubmit' type="success" class="btn2">通过</u-button>
+			<u-button  @click='show1 = true' type="error" class="btn1" hover-class='none'>驳回</u-button>
+			<u-button  @click='show2 = true' type="success" class="btn2">通过</u-button>
 		</view>
 	</view>
 </template>
@@ -68,6 +87,13 @@
 					}
 				],
 				contractNo: "",
+				rejectInfo: "",
+				rejectInfo1: "",
+				show1:false,
+				show2:false,
+				height: 200,
+				autoHeight: true,
+				border: false,
 			}
 		},
 		onLoad(options) {
@@ -100,15 +126,10 @@
 				if (this.list.length == 0) {
 					that.$api.msg('没有要审核的条目！')
 				} else {
-					// uni.showModal({
-					// 	content: "是否确定驳回?",
-					// 	success(res) {
-					// 		if(res)
-					// 		this.audit(this.list[0], 0, false, true, '已驳回')
-					// 	}
-					// })
-
-
+					if (!this.rejectInfo) {
+						this.$api.msg('驳回原因不能为空！')
+					}else{
+						that.show1 = false
 					uni.showModal({
 						content: "是否确定驳回？",
 						showCancel: true,
@@ -119,6 +140,7 @@
 							}
 						}
 					})
+					}
 				}
 			},
 			//通过
@@ -127,13 +149,10 @@
 				if (this.list.length == 0) {
 					that.$api.msg('没有要审核的条目！')
 				} else {
-					// uni.showModal({
-					// 	content: "是否确定通过?",
-					// 	success(res) {
-					// 		if(res)
-					// 		this.audit(this.list[0], 0, true, 2)
-					// 	}
-					// })
+				if (!this.rejectInfo1) {
+					this.$api.msg('审核意见不能为空！')
+				}else{
+					that.show2 = false
 					uni.showModal({
 						content: "是否确定通过？",
 						showCancel: true,
@@ -144,6 +163,7 @@
 							}
 						}
 					})
+					}
 				}
 			},
 			//审核方法
@@ -152,7 +172,7 @@
 					this.$api.doRequest('post', '/workflow/api/handle', {
 						taskId: item.taskId,
 						approved: status,
-						auditMind: reason != undefined ? '已驳回' : '34',
+						auditMind: reason != undefined ? this.rejectInfo : this.rejectInfo1,
 						needReapply: status2 != undefined ? true : false,
 					}).then(res => {
 						this.audit(this.list[index + 1], index + 1, status)
@@ -160,9 +180,9 @@
 				} else {
 					if (status == true) {
 						this.$api.msg('通过成功')
-						setTimeout(function() {
-								uni.navigateBack()
-						}, 1000);
+						// setTimeout(function() {
+						// 		uni.navigateBack()
+						// }, 1000);
 					} else if (status == false) {
 						this.$api.msg('驳回成功')
 						setTimeout(function() {
@@ -287,4 +307,18 @@
 				}
 			}
 		}
+		.rejectInfoCss {
+			border: 1px solid #ccc;
+			border-radius: 10rpx;
+			background-color: #F9F9FA;
+			// height: 100px;
+			overflow-y: auto;
+			margin: 30rpx;
+		}
+		.rejectText {
+			text-align: center;
+		}
+		/deep/.u-input__textarea{
+			height: 300rpx!important;
+		}
 </style>

pages/task/audit/warehouse_approval.vue

@@ -69,10 +69,32 @@
 				</view>
 			</view>
 		</view>
+		<u-popup v-model="show1" mode="center">
+			<view style="width: 300px;padding: 30rpx 10rpx;border-radius: 20rpx;">
+				<view class="rejectText">审核意见（驳回）</view>
+				<u-input v-model="rejectInfo" type="textarea" :border="border" class="rejectInfoCss"
+					placeholder="请输入审核意见" />
+				<view class="flex">
+					<u-button @click="show1 = false" type="error" hover-class='none'>取消</u-button>
+					<u-button @click="reject()" type="success">确定</u-button>
+				</view>
+			</view>
+		</u-popup>
+		<u-popup v-model="show2" mode="center">
+			<view style="width: 300px;padding: 30rpx 10rpx;border-radius: 20rpx;">
+				<view class="rejectText">审核意见（通过）</view>
+				<u-input v-model="rejectInfo1" type="textarea" :border="border" :height="height" :auto-height="autoHeight"  class="rejectInfoCss"
+					placeholder="请输入审核意见" />
+				<view class="flex">
+					<u-button @click="show2 = false" type="error" hover-class='none'>取消</u-button>
+					<u-button @click="audit()" type="success">确定</u-button>
+				</view>
+			</view>
+		</u-popup>
 		<u-toast ref="uToast" />
 		<view style='padding:10px;' class='flex bottom-btn'>
-			<u-button  @click='reject' type="error" class="btn1" hover-class='none'>驳回</u-button>
-			<u-button  @click='audit' type="success" class="btn2">通过</u-button>
+			<u-button  @click='show1 = true' type="error" class="btn1" hover-class='none'>驳回</u-button>
+			<u-button  @click='show2 = true' type="success" class="btn2">通过</u-button>
 		</view>
 	</view>
 </template>
@@ -86,14 +108,15 @@
 		data() {
 			return {
 				show: false,
+				height: 200,
+				autoHeight: true,
+				border: false,
+				show2:false,
+				show1:false,
+				rejectInfo:"",
+				rejectInfo1:"",
 				id: 0,
 				list: {},
-				form: {
-					name: '',
-					intro: '',
-					sex: ''
-				},
-				radio: '',
 				pcUserInfo: uni.getStorageSync('pcUserInfo'),
 				switchVal: false,
 				contractNoList: []
@@ -126,64 +149,74 @@
 				this.list.contractNo = item[0].value
 			},
 			audit() {
-				var that = this
-				uni.showModal({
-					content: "是否确定通过审核？",
-					showCancel: true,
-					confirmText: '确定',
-					success: function(res) {
-						if (res.confirm) {
-							that.$api.doRequest('post', '/purchasePrice/purchasePriceEdit',that.list ).then(res => {
-								if (res.data.code == 200) {
-									that.$api.doRequest('post', '/workflow/api/handle', {
-										approved: true,
-										auditMind: "",
-										needReapply: true,
-										taskId:  that.list.taskId,
-									}).then(res1 => {
-										if (res1.data.code == 200) {
-											that.$api.msg('审核成功');
-											setTimeout(function() {
-													uni.navigateBack()
-											}, 1000);
-										} else {
-											that.$api.msg(res1.data.message);
-										}
-									})
-								} else {
-									that.$api.msg('系统异常，请联系管理员');
-								}
-							})
+				if (!this.rejectInfo1) {
+					this.$api.msg('审核意见不能为空！')
+				}else{
+					var that = this
+					that.show2 = false
+					uni.showModal({
+						content: "是否确定通过审核？",
+						showCancel: true,
+						confirmText: '确定',
+						success: function(res) {
+							if (res.confirm) {
+								that.$api.doRequest('post', '/purchasePrice/purchasePriceEdit',that.list ).then(res => {
+									if (res.data.code == 200) {
+										that.$api.doRequest('post', '/workflow/api/handle', {
+											approved: true,
+											auditMind: that.rejectInfo1,
+											needReapply: true,
+											taskId:  that.list.taskId,
+										}).then(res1 => {
+											if (res1.data.code == 200) {
+												that.$api.msg('审核成功');
+												setTimeout(function() {
+														uni.navigateBack()
+												}, 1000);
+											} else {
+												that.$api.msg(res1.data.message);
+											}
+										})
+									} else {
+										that.$api.msg('系统异常，请联系管理员');
+									}
+								})
+							}
 						}
-					}
-				})
+					})
+				}
 			},
 			reject() {
-				var that = this
-				uni.showModal({
-					content: "是否确定驳回？",
-					showCancel: true,
-					confirmText: '确定',
-					success: function(res) {
-						if (res.confirm) {
-							that.$api.doRequest('post', '/workflow/api/handle', {
-								taskId: that.list.taskId,
-								approved: false,
-								auditMind: '已驳回',
-								needReapply: true,
-							}).then(res1 => {
-								if (res1.data.code == 200) {
-									that.$api.msg('驳回成功');
-									setTimeout(function() {
-											uni.navigateBack()
-									}, 1000);
-								} else {
-									that.$api.msg(res1.data.message);
-								}
-							})
+				if (!this.rejectInfo) {
+					this.$api.msg('驳回原因不能为空！')
+				}else{
+					var that = this
+					that.show1 = false
+					uni.showModal({
+						content: "是否确定驳回？",
+						showCancel: true,
+						confirmText: '确定',
+						success: function(res) {
+							if (res.confirm) {
+								that.$api.doRequest('post', '/workflow/api/handle', {
+									taskId: that.list.taskId,
+									approved: false,
+									auditMind: that.rejectInfo,
+									needReapply: true,
+								}).then(res1 => {
+									if (res1.data.code == 200) {
+										that.$api.msg('驳回成功');
+										setTimeout(function() {
+												uni.navigateBack()
+										}, 1000);
+									} else {
+										that.$api.msg(res1.data.message);
+									}
+								})
+							}
 						}
-					}
-				})
+					})
+				}
 			}
 		}
 	}
@@ -285,4 +318,18 @@
 			}
 		}
 	}
+	.rejectInfoCss {
+		border: 1px solid #ccc;
+		border-radius: 10rpx;
+		background-color: #F9F9FA;
+		// height: 100px;
+		overflow-y: auto;
+		margin: 30rpx;
+	}
+	.rejectText {
+		text-align: center;
+	}
+	/deep/.u-input__textarea{
+		height: 300rpx!important;
+	}
 </style>