Merge branch 'main-cq'

pages/crashExam/crashExamDetails.vue

@@ -67,6 +67,42 @@
 				</view>
 			</view>
 		</view>
+		<uni-popup
+			ref="popup" 
+			type="center"
+			:mask-click="false"
+		>
+			<view class="popup">
+				<view class="pop-top">
+					<h4>审批</h4>
+					<uni-icons 
+						style="color: #AAAAAA; font-weight: bold;" 
+						type="closeempty" 
+						@click="closePopup"
+					>
+					</uni-icons>
+				</view>
+				<h4 style="width: 85%; margin: 2vh auto; font-weight: normal; text-align: center;">是否通过审批？</h4>
+				<view class="select-area">
+					<view @click="modalConfirm">通过</view>
+					<view @click="modalReject">驳回</view>
+					<!-- <uni-forms ref="examForm" :modelValue="examFormData" :rules="rules" label-position="top">
+						<uni-forms-item name="ifPass" required label="是否通过" label-width="150">
+							<uni-data-select
+							  v-model="examFormData.ifPass"
+							  :localdata="ifPassRange"
+							  :clear="false"
+							  @change="ifPassChange"
+							></uni-data-select>
+						</uni-forms-item>
+						<uni-forms-item required v-show="examFormData.ifPass == '1'" name="noPassReason" label="不通过原因" label-width="150">
+							<uni-easyinput type="textarea" v-model="examFormData.noPassReason" placeholder="请输入内容"></uni-easyinput>
+						</uni-forms-item>
+						<button class="submit-btn" @click="formSubmit">确认</button>
+					</uni-forms> -->
+				</view>
+			</view>
+		</uni-popup>
 	</view>
 </template>
 
@@ -140,7 +176,8 @@
 						title: '未选中审核项！'
 					})
 				} else {
-					uni.showModal({
+					that.openPopup()
+					/* uni.showModal({
 						title: '确认审核',
 						content: '是否通过审核？',
 						confirmText: '通过',
@@ -156,15 +193,15 @@
 								}
 								console.log(that.subObj);
 								that.subInStore(that.subObj)
-							}/* else if (res.cancel) {
+							}else if (res.cancel) {
 								that.inStoreList.forEach((item) => {
 									item.checkType = 2
 								})
 								console.log(that.inStoreList);
 								that.subInStore(that.inStoreList)
-							} */
+							}
 						}
-					})
+					}) */
 				}
 			},
 			subInStore (obj) {
@@ -177,9 +214,7 @@
 							icon: 'none',
 							title: res.data.msg,
 							success: () => {
-								/* uni.redirectTo({
-									url: '/pages/repairTestInStore/repairTestInStore'
-								}) */
+								that.closePopup()
 								uni.navigateBack()
 							}
 						})
@@ -190,6 +225,34 @@
 						})
 					}
 				})
+			},
+			openPopup () {
+				this.$refs.popup.open()
+			},
+			closePopup () {
+				this.$refs.popup.close()
+			},
+			modalConfirm () {
+				let that = this
+				that.taskIdList.push(that.taskId)
+				that.subObj = {
+					checkResult: '通过',
+					taskIdList: that.taskIdList,
+					scrapDetailList: that.auditDetailList
+				}
+				console.log(that.subObj);
+				that.subInStore(that.subObj)
+			},
+			modalReject () {
+				let that = this
+				that.taskIdList.push(that.taskId)
+				that.subObj = {
+					checkResult: '驳回',
+					taskIdList: that.taskIdList,
+					auditDetailList: that.auditDetailList
+				}
+				console.log(that.subObj);
+				that.subInStore(that.subObj)
 			}
 		},
 		onLoad(params) {
@@ -341,4 +404,41 @@
 		width: 150rpx;
 		text-align: center;
 	}
+	
+	.popup{
+		width: 80vw;
+		height: 20vh;
+		background-color: #fff;
+		border-radius: 15rpx;
+		overflow: hidden;
+		background: linear-gradient(#D9E7FE, #fff, #fff, #fff);
+	}
+	
+	.popup>.pop-top{
+		width: 100%;
+		height: 5vh;
+		box-sizing: border-box;
+		padding: 0 25rpx;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+	
+	.popup>.select-area{
+		width: 85%;
+		margin: 40rpx auto;
+		display: flex;
+		justify-content: space-around;
+		align-items: center;
+	}
+	
+	.popup>.select-area>view{
+		box-sizing: border-box;
+		font-size: 30rpx;
+		padding: 12rpx 24rpx;
+		background-color: #3788FF;
+		color: #fff;
+		border-radius: 20rpx;
+	}
+	
 </style>