Merge branch 'main-cq'

pages/backMaterialReceive/backMaterialReceive.vue

@@ -9,7 +9,7 @@
 				class="single-fetch"
 				v-for="(fetch, index) in fetchMaterialList"
 				:key="index"
-				@click="optionClick($event, fetch.id)"
+				@click="optionClick($event, fetch.id, fetch.modelId)"
 			>
 					<view class="fetch-upper">
 						<!-- {{ fetch.taskStatus }} -->
@@ -124,10 +124,10 @@ import { basePath } from '../../public'
 			}
 		},
 		methods: {
-			optionClick (e, id) {
+			optionClick (e, id, modelId) {
 				console.log(id);
 				uni.navigateTo({
-					url: `/pages/seeBackMaterialDetail/seeBackMaterialDetail?id=${id}`
+					url: `/pages/seeBackMaterialDetail/seeBackMaterialDetail?id=${id}&typeId=${modelId}`
 				})
 			},
 			seeDetail (item) {

pages/crashExam/crashExam.vue

@@ -91,13 +91,15 @@
 					<uni-icons 
 						style="color: #AAAAAA; font-weight: bold;" 
 						type="closeempty" 
-						size="32"
 						@click="closePopup"
 					>
 					</uni-icons>
 				</view>
+				<h4 style="width: 85%; margin: 2vh auto; font-weight: normal; text-align: center;">是否通过审批？</h4>
 				<view class="select-area">
-					<uni-forms ref="examForm" :modelValue="examFormData" :rules="rules" label-position="top">
+					<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"
@@ -110,7 +112,7 @@
 							<uni-easyinput type="textarea" v-model="examFormData.noPassReason" placeholder="请输入内容"></uni-easyinput>
 						</uni-forms-item>
 						<button class="submit-btn" @click="formSubmit">确认</button>
-					</uni-forms>
+					</uni-forms> -->
 				</view>
 			</view>
 		</uni-popup>
@@ -208,7 +210,8 @@
 					for (let i = 0; i < that.taskIdList.length; i++) {
 						that.subArr.push(that.taskIdList[i].taskId)
 					}
-					uni.showModal({
+					that.openPopup()
+					/* uni.showModal({
 						title: '审核通过',
 						content: '确认审核通过吗？',
 						confirmText: '通过',
@@ -222,7 +225,7 @@
 								that.subInStore(that.subObj)
 							}
 						}
-					})
+					}) */
 				}
 			},
 			subInStore (obj) {
@@ -235,9 +238,7 @@
 							icon: 'none',
 							title: res.data.msg,
 							success: () => {
-								/* uni.redirectTo({
+								that.closePopup()
-									url: '/pages/repairTestInStore/repairTestInStore'
-								}) */
 								uni.redirectTo({
 									url: '/pages/crashExam/crashExam'
 								})
@@ -251,12 +252,29 @@
 					}
 				})
 			},
+			openPopup () {
+				this.$refs.popup.open()
+			},
 			closePopup () {
 				this.$refs.popup.close()
 			},
-			seeExam (name) {
+			modalConfirm () {
-				console.log(name);
+				let that = this
-				this.$refs.popup.open()
+				that.subObj = {
+					checkResult: '通过',
+					taskIdList: that.taskIdList
+				}
+				console.log(that.subObj);
+				that.subInStore(that.subObj)
+			},
+			modalReject () {
+				let that = this
+				that.subObj = {
+					checkResult: '驳回',
+					taskIdList: that.taskIdList
+				}
+				console.log(that.subObj);
+				that.subInStore(that.subObj)
 			},
 			formSubmit () {
 				let that = this
@@ -454,7 +472,7 @@
 	}
 	.popup{
 		width: 80vw;
-		height: 60vh;
+		height: 20vh;
 		background-color: #fff;
 		border-radius: 15rpx;
 		overflow: hidden;
@@ -471,9 +489,16 @@
 		.select-area{
 			width: 85%;
 			margin: 40rpx auto;
-			.submit-btn{
+			display: flex;
-				background-color: #409EFF;
+			justify-content: space-around;
+			align-items: center;
+			view{
+				box-sizing: border-box;
+				font-size: 30rpx;
+				padding: 12rpx 24rpx;
+				background-color: #3788FF;
 				color: #fff;
+				border-radius: 20rpx;
 			}
 		}
 	}

pages/numLoanReceive/numLoanReceive.vue

@@ -201,43 +201,6 @@
 						
 					})
 				}
-				/* if (!this.lowerIpt.passedNum && !this.lowerIpt.waitRepairNum && !this.lowerIpt.waitCrashNum) {
-					uni.showToast({
-						icon: 'none',
-						title: '请至少填写一个数据！'
-					})
-					return
-				}
-				that.totalNum = Number(that.lowerIpt.passedNum) + Number(that.lowerIpt.waitRepairNum) + Number(that
-					.lowerIpt.waitCrashNum)
-				console.log(that.totalNum);
-				if (that.totalNum > that.upperInfo.num) {
-					uni.showToast({
-						icon: 'none',
-						title: '接收总量不能大于退库数量！'
-					})
-				} else if (that.totalNum == 0) {
-					uni.showToast({
-						icon: 'none',
-						title: '请确保退料总量不为0！'
-					})
-				} else {
-					console.log(this.handleSubmitData());
-					that.$api.backMaterialReceive.backMaterialSetNumBack({
-						taskId: this.upperInfo.taskId,
-						arr: this.handleSubmitData()
-					}).then(res => {
-						console.log("res===", res)
-						uni.showToast({
-							icon: 'none',
-							title: '接收成功'
-						})
-						setTimeout(() => {
-							uni.navigateBack()
-						},
-						300)
-					})
-				} */
 			},
 			handleSubmitData() {
 				let list = []

pages/seeBackMaterialDetail/seeBackMaterialDetail.vue

@@ -49,7 +49,7 @@
 		},
 		onLoad(params) {
 			let that = this
-			console.log(params.id);
+			console.log(params.id, params.typeId);
 			// 初始化查询退料明细
 			that.$api.backMaterialReceive.seeBackMaterialDetail({
 				parentId: params.id

pages/testExam/testExam.vue

@@ -87,13 +87,15 @@
 					<uni-icons 
 						style="color: #AAAAAA; font-weight: bold;" 
 						type="closeempty" 
-						size="32"
 						@click="closePopup"
 					>
 					</uni-icons>
 				</view>
+				<h4 style="width: 85%; margin: 2vh auto; font-weight: normal; text-align: center;">是否通过审批？</h4>
 				<view class="select-area">
-					<uni-forms ref="examForm" :modelValue="examFormData" :rules="rules" label-position="top">
+					<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"
@@ -106,7 +108,7 @@
 							<uni-easyinput type="textarea" v-model="examFormData.noPassReason" placeholder="请输入内容"></uni-easyinput>
 						</uni-forms-item>
 						<button class="submit-btn" @click="formSubmit">确认</button>
-					</uni-forms>
+					</uni-forms> -->
 				</view>
 			</view>
 		</uni-popup>
@@ -204,7 +206,8 @@
 					for (let i = 0; i < that.taskIdList.length; i++) {
 						that.subArr.push(that.taskIdList[i].taskId)
 					}
-					uni.showModal({
+					that.openPopup()
+					/* uni.showModal({
 						title: '审核通过',
 						content: '确认审核通过吗？',
 						confirmText: '通过',
@@ -218,7 +221,7 @@
 								that.subInStore(that.subObj)
 							}
 						}
-					})
+					}) */
 				}
 			},
 			subInStore (obj) {
@@ -231,9 +234,7 @@
 							icon: 'none',
 							title: res.data.msg,
 							success: () => {
-								/* uni.redirectTo({
+								that.closePopup()
-									url: '/pages/repairTestInStore/repairTestInStore'
-								}) */
 								uni.redirectTo({
 									url: '/pages/testExam/testExam'
 								})
@@ -247,12 +248,29 @@
 					}
 				})
 			},
+			openPopup () {
+				this.$refs.popup.open()
+			},
 			closePopup () {
 				this.$refs.popup.close()
 			},
-			seeExam (name) {
+			modalConfirm () {
-				console.log(name);
+				let that = this
-				this.$refs.popup.open()
+				that.subObj = {
+					checkResult: '通过',
+					taskIdList: that.subArr
+				}
+				console.log(that.subObj);
+				that.subInStore(that.subObj)
+			},
+			modalReject () {
+				let that = this
+				that.subObj = {
+					checkResult: '驳回',
+					taskIdList: that.taskIdList
+				}
+				console.log(that.subObj);
+				that.subInStore(that.subObj)
 			},
 			formSubmit () {
 				let that = this
@@ -450,7 +468,7 @@
 	}
 	.popup{
 		width: 80vw;
-		height: 60vh;
+		height: 20vh;
 		background-color: #fff;
 		border-radius: 15rpx;
 		overflow: hidden;
@@ -467,9 +485,16 @@
 		.select-area{
 			width: 85%;
 			margin: 40rpx auto;
-			.submit-btn{
+			display: flex;
-				background-color: #409EFF;
+			justify-content: space-around;
+			align-items: center;
+			view{
+				box-sizing: border-box;
+				font-size: 30rpx;
+				padding: 12rpx 24rpx;
+				background-color: #3788FF;
 				color: #fff;
+				border-radius: 20rpx;
 			}
 		}
 	}