添加意见

pages/task/audit/Issueandreceipt_task_approval.vue

@@ -237,7 +237,7 @@
 		<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"
+				<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>
@@ -261,6 +261,8 @@
 	export default {
 		data() {
 			return {
+				height: 100,
+				autoHeight: true,
 				id: "",
 				OutList: {}, //出
 				EnterList: {}, //入
@@ -343,7 +345,6 @@
 					confirmText: '确定',
 					success: function(res) {
 						if (res.confirm) {
-							debugger
 							that.OutList.inOutFlag = 1
 							that.EnterList.inOutFlag = 2
 							if (that.OutList.taskTypeKey == 1) {
@@ -780,8 +781,10 @@
 		border: 1px solid #ccc;
 		border-radius: 10rpx;
 		background-color: #F9F9FA;
-		height: 100px;
 		margin: 30rpx;
+		overflow-y: auto;
+		// height: 300rpx;
+		background: red;
 	}
 
 	.uForm_item {

pages/task/audit/acquisition_settlement_approval.vue

@@ -36,11 +36,35 @@
 				</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="rejectInfo" 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'>
 			<!-- getRoles("acquisitionQuality.initial") -->
-			<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>
+<!-- 			<u-button @click='rejectSubmit()' type="error" class="btn1" hover-class='none'>驳回</u-button>
+			<u-button @click='passSubmit()' type="success" class="btn2">通过</u-button> -->
 		</view>
 	</view>
 </template>
@@ -52,9 +76,15 @@
 	export default {
 		data() {
 			return {
+				height: 200,
+				autoHeight: true,
+				border: false,
+				show2:false,
+				show1:false,
 				id: "",
 				currentPage: 1,
 				pageSize: 100,
+				rejectInfo: "", //审核意见
 				List: [{
 					approveStatus: "",
 				}],
@@ -98,33 +128,43 @@
 			},
 			//驳回
 			rejectSubmit() {
-				var that = this
-				if (this.List.length > 0) {
+				if (!this.rejectInfo) {
+					this.$api.msg('驳回原因不能为空！')
+				}else{
+					var that = this
+					if (this.List.length > 0) {
+						uni.showModal({
+							content: "确定驳回付款申请？",
+							showCancel: true,
+							confirmText: '确定',
+							success: function(res) {
+								if (res.confirm) {
+									that.audit(that.List[0], 0, false, '', '')
+								}
+							}
+						})
+					}
+				}
+		
+			},
+			//通過
+			passSubmit() {
+				if (!this.rejectInfo) {
+					this.$api.msg('驳回原因不能为空！')
+				}else{
+					var that = this
 					uni.showModal({
-						content: "确定驳回付款申请？",
+						content: "确定通过付款申请？",
 						showCancel: true,
 						confirmText: '确定',
 						success: function(res) {
 							if (res.confirm) {
-								that.audit(that.List[0], 0, false, '', '')
+								that.audit(that.List[0], 0, true)
 							}
 						}
 					})
 				}
-			},
-			//通過
-			passSubmit() {
-				var that = this
-				uni.showModal({
-					content: "确定通过付款申请？",
-					showCancel: true,
-					confirmText: '确定',
-					success: function(res) {
-						if (res.confirm) {
-							that.audit(that.List[0], 0, true)
-						}
-					}
-				})
+		
 			},
 			audit(item, index, status, status2, reason) {
 				if (this.List.length > 0) {
@@ -274,4 +314,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>