fix: bug

src/pages/deviceReport/addForm.vue

@@ -220,7 +220,11 @@
 						loading.value = false
 					}, 1500)
 				} else {
-					proxy.$modal.showToast('添加失败')
+					if(res.msg){
+						proxy.$modal.showToast(res.msg)
+					}else{
+						proxy.$modal.showToast('添加失败')
+					}
 					loading.value = false
 				}
 			}).catch(() => {

src/pages/overhaulOrder/addForm.vue

@@ -149,7 +149,11 @@
 							loading.value = false
 						}, 1500)
 					} else {
-						proxy.$modal.showToast('添加失败')
+						if(res.msg){
+							proxy.$modal.showToast(res.msg)
+						}else{
+							proxy.$modal.showToast('添加失败')
+						}
 						loading.value = false
 					}
 				}).catch(() => {
@@ -170,7 +174,11 @@
 							loading.value = false
 						}, 1500)
 					} else {
-						proxy.$modal.showToast('添加失败')
+						if(res.msg){
+							proxy.$modal.showToast(res.msg)
+						}else{
+							proxy.$modal.showToast('添加失败')
+						}
 						loading.value = false
 					}
 				}).catch(() => {

src/pages/overhaulOrder/addServiceRecord.vue

@@ -282,7 +282,11 @@
 							loading.value = false
 						}, 1500)
 					} else {
-						proxy.$modal.showToast('添加失败')
+						if(res.msg){
+							proxy.$modal.showToast(res.msg)
+						}else{
+							proxy.$modal.showToast('添加失败')
+						}
 						loading.value = false
 					}
 				}).catch(() => {
@@ -303,7 +307,11 @@
 							loading.value = false
 						}, 1500)
 					} else {
-						proxy.$modal.showToast('添加失败')
+						if(res.msg){
+							proxy.$modal.showToast(res.msg)
+						}else{
+							proxy.$modal.showToast('添加失败')
+						}
 						loading.value = false
 					}
 				}).catch(() => {

src/pages/repairOrder/addForm.vue

@@ -234,7 +234,11 @@
 							loading.value = false
 						}, 1500)
 					} else {
-						proxy.$modal.showToast('添加失败')
+						if(res.msg){
+							proxy.$modal.showToast(res.msg)
+						}else{
+							proxy.$modal.showToast('添加失败')
+						}
 						loading.value = false
 					}
 				}).catch(() => {
@@ -255,7 +259,11 @@
 							loading.value = false
 						}, 1500)
 					} else {
-						proxy.$modal.showToast('添加失败')
+						if(res.msg){
+							proxy.$modal.showToast(res.msg)
+						}else{
+							proxy.$modal.showToast('添加失败')
+						}
 						loading.value = false
 					}
 				}).catch(() => {

src/pages/repairOrder/addServiceRecord.vue

@@ -178,7 +178,11 @@
 							loading.value = false
 						}, 1500)
 					} else {
-						proxy.$modal.showToast('添加失败')
+						if(res.msg){
+							proxy.$modal.showToast(res.msg)
+						}else{
+							proxy.$modal.showToast('添加失败')
+						}
 						loading.value = false
 					}
 				}).catch(() => {
@@ -199,7 +203,11 @@
 							loading.value = false
 						}, 1500)
 					} else {
-						proxy.$modal.showToast('添加失败')
+						if(res.msg){
+							proxy.$modal.showToast(res.msg)
+						}else{
+							proxy.$modal.showToast('添加失败')
+						}
 						loading.value = false
 					}
 				}).catch(() => {

src/pages/repairOrder/detail.vue

@@ -322,7 +322,7 @@
 		orderClick(2)
 	}
 	// APP维修工单接单、点击完成、验证
-	function orderClick(type) {
+	async function orderClick(type) {
 		// 如果是接单
 		// if (this.data.status == 'PENDING') {
 		// 	if (this.$store.state.user.dept.parentId != this.data.factoryAreaNumber) {
@@ -353,9 +353,7 @@
 			classes: data.value.classes,
 			faultType: data.value.faultType
 		}
-		let tips = data.value.status == 'PENDING' ? '是否接单？' : data.value.status == 'PECEIVED' ? '是否完成？' : data
-			.value.status == 'COMPLETED' ? '是否验证完结？' : ''
-		proxy.$modal.confirm(tips).then(async () => {
+		if(type ==2){
 			proxy.$modal.loading('加载中')
 			loading.value = true
 			// 如果直接点击完成先走修改工单接口
@@ -380,7 +378,36 @@
 				proxy.$modal.closeLoading()
 				loading.value = false
 			})
-		})
+		}else{
+			let tips = data.value.status == 'PENDING' ? '是否接单？' : data.value.status == 'PECEIVED' ? '是否完成？' : data
+				.value.status == 'COMPLETED' ? '是否验证完结？' : ''
+			proxy.$modal.confirm(tips).then(async () => {
+				proxy.$modal.loading('加载中')
+				loading.value = true
+				// 如果直接点击完成先走修改工单接口
+				if (data.value.status == 'PECEIVED') {
+					await repairOrderApi.repairOrderUpdate(dataTwo).then((res) => { }).catch(() => {
+						proxy.$modal.closeLoading()
+						loading.value = false
+					})
+				}
+				await repairOrderApi.orderClick(dataOne).then((res) => {
+					if (res.data) {
+						proxy.$modal.showToast('操作成功')
+						setTimeout(() => {
+							proxy.$tab.navigateBack()
+							loading.value = false
+						}, 1500)
+					} else {
+						proxy.$modal.showToast('操作失败')
+						loading.value = false
+					}
+				}).catch(() => {
+					proxy.$modal.closeLoading()
+					loading.value = false
+				})
+			})
+		}
 	}
 	// 获取维修报修信息
 	function getDeviceRepairDetailsByNumber() {

src/pages/repairOrder/transfer.vue

@@ -183,7 +183,11 @@
 						loading.value = false
 					}, 1500)
 				} else {
-					proxy.$modal.showToast('转办失败')
+					if(res.msg){
+						proxy.$modal.showToast(res.msg)
+					}else{
+						proxy.$modal.showToast('转办失败')
+					}
 					loading.value = false
 				}
 			}).catch(() => {

src/pages/sparePartsApplication/addForm.vue

@@ -185,7 +185,11 @@
 						loading.value = false
 					}, 1500)
 				} else {
-					proxy.$modal.showToast('添加失败')
+					if(res.msg){
+						proxy.$modal.showToast(res.msg)
+					}else{
+						proxy.$modal.showToast('添加失败')
+					}
 					loading.value = false
 				}
 			}).catch(() => {

src/pages/sparePartsServiceWorkOrderList/addForm.vue

@@ -162,7 +162,11 @@
 						loading.value = false
 					}, 1500)
 				} else {
-					proxy.$modal.showToast('添加失败')
+					if(res.msg){
+						proxy.$modal.showToast(res.msg)
+					}else{
+						proxy.$modal.showToast('添加失败')
+					}
 					loading.value = false
 				}
 			}).catch(() => {

src/pages/spotCheckOrder/addForm.vue

@@ -189,7 +189,11 @@
 						loading.value = false
 					}, 1500)
 				} else {
-					proxy.$modal.showToast('添加失败')
+					if(res.msg){
+						proxy.$modal.showToast(res.msg)
+					}else{
+						proxy.$modal.showToast('添加失败')
+					}
 					loading.value = false
 				}
 			}).catch(() => {

src/pages/upkeepOrder/addServiceRecord.vue

@@ -9,10 +9,10 @@
 				<u-input v-model="form.equipmentParts"  placeholder="请输入保养部位" maxlength="50" disabled/>
 			</u-form-item> -->
 			<u-form-item label="预估人数" prop="peoples"  class="disabled">
-				<u-input v-model="form.peoples" type="number" placeholder="请输入预估人数"  maxlength="50"/>
+				<u-input v-model="form.peoples" type="number" placeholder="请输入预估人数"  maxlength="50" disabled/>
 			</u-form-item>
 			<u-form-item label="预估分钟" prop="estimatedMinutes"  class="disabled">
-				<u-input v-model="form.estimatedMinutes" type="number" placeholder="请输入预估分钟"  maxlength="50"/>
+				<u-input v-model="form.estimatedMinutes" type="number" placeholder="请输入预估分钟"  maxlength="50" disabled/>
 			</u-form-item>
 			<u-form-item label="实际分钟" prop="actualMinutes" required>
 				<u-input v-model="form.actualMinutes" type="number" placeholder="请输入实际分钟"  maxlength="50"/>
@@ -263,7 +263,11 @@ const form = ref({
 							loading.value = false
 						}, 1500)
 					} else {
-						proxy.$modal.showToast('添加失败')
+						if(res.msg){
+							proxy.$modal.showToast(res.msg)
+						}else{
+							proxy.$modal.showToast('添加失败')
+						}
 						loading.value = false
 					}
 				}).catch(() => {
@@ -284,7 +288,11 @@ const form = ref({
 							loading.value = false
 						}, 1500)
 					} else {
-						proxy.$modal.showToast('添加失败')
+						if(res.msg){
+							proxy.$modal.showToast(res.msg)
+						}else{
+							proxy.$modal.showToast('添加失败')
+						}
 						loading.value = false
 					}
 				}).catch(() => {