12.4

components/dialog-turnoverApplication/dialog-turnoverApplication.vue

@@ -161,6 +161,7 @@
 	}
 
 	function init() {
+		console.log(dayworkInfo.value)
 		getDictInfoByType('daywork_turnover_type').then(res => {
 			turnoverType.value = res.data;
 			getTurnoverByWorkshop({
@@ -318,9 +319,12 @@
 			} else {
 				uni.showToast({
 					icon: 'none',
-					title: res.msg
+					title: res.msg,
+					duration:2000
 				});
-				emit('reflushDaywork');
+				setTimeout(() => {
+				 emit('reflushDaywork')
+				}, 1000);
 			}
 		})
 		}
@@ -417,11 +421,17 @@
 						});
 						emit('reflushDaywork');
 					} else {
+						console.log("999")
+						console.log(res.msg)
 						uni.showToast({
 							icon: 'none',
-							title: res.msg
+							title: res.msg,
+							duration:2000
 						});
-						emit('reflushDaywork');
+						setTimeout(() => {
+						 emit('reflushDaywork')
+						}, 1000);
+						
 					}
 				})
 			}

pages/batchReporting/index.vue

@@ -635,7 +635,9 @@
 					duration: 2000
 				})
 				isLoding.value = false;
-				init(store.planDetails.id);
+				setTimeout(() => {
+				 init(store.planDetails.id);
+				}, 1000);
 			} else {
 				uni.showToast({
 					icon: "none",
@@ -643,7 +645,9 @@
 					duration: 2000
 				})
 				isLoding.value = false;
-
+				setTimeout(() => {
+				 init(store.planDetails.id);
+				}, 1000);
 			}
 		})
 		}

pages/deliveryInspection/form.vue

@@ -403,6 +403,7 @@
 		//没有咨询
 		if(consultations.value && consultations.value.length == 0){
 			processInspecion.value.status = e.detail.value
+			processInspecion.value.adoptStatus = e.detail.value
 		}
 	}
 
@@ -663,6 +664,7 @@ function handleDrawingMenu() {
 		consultations.value = consultations.value.concat(info)
 		isEventTriggered.value = true; // 更新标志位状态
 		 processInspecion.value.status = 0
+		 processInspecion.value.adoptStatus = 0
 	}
 
 	/***************************** 定义了一些事件 *****************************/

pages/fastProductionPlan/index.vue

@@ -464,12 +464,17 @@
 					if (res.code === 200) {
 						init()
 					} else {
-						loading.value = false
-						uni.hideLoading()
+						// loading.value = false
+						// uni.hideLoading()
+						uni.showToast({
+							icon: 'none',
+							title: res.msg,
+							duration:2000
+						});
+						setTimeout(() => {
+						 init()
+						}, 1500);
 					}
-				}).catch(error => {
-					loading.value = false
-					uni.hideLoading()
 				})
 			}
 		})

pages/sortBatchReporting/index.vue

@@ -785,13 +785,19 @@
 							title: "取消成功",
 							duration: 2000
 						})
-						init(store.planDetails.id);
+						
+						setTimeout(() => {
+						 init(store.planDetails.id);
+						}, 1500);
 					} else {
 						uni.showToast({
 							icon: "none",
 							title: "取消失败",
 							duration: 2000
 						})
+						setTimeout(() => {
+						 init(store.planDetails.id);
+						}, 1000);
 					}
 				})
 			}

pages/sorting/form.vue

@@ -578,8 +578,7 @@ uni.navigateTo({
 				return false
 			}
 		}
-
-		if (!dayworkItem.value.qualifiedNum) {
+		if (dayworkItem.value.qualifiedNum === null || dayworkItem.value.qualifiedNum === "") {
 			uni.showToast({
 				icon: 'none',
 				title: "合格数不能为空",