Browse Source

Merge remote-tracking branch 'origin/master'

wangxin 1 year ago
parent
commit
42cf944401
1 changed files with 8 additions and 3 deletions
  1. 8 3
      pages/addNewBatch/index.vue

+ 8 - 3
pages/addNewBatch/index.vue

@@ -284,6 +284,7 @@
 	// 	}
 	// 	}
 	// }
 	// }
 	function getFurnaceInfo(data) {
 	function getFurnaceInfo(data) {
+		console.log(data)
 		if(data.isWasteRecycling==0) {
 		if(data.isWasteRecycling==0) {
 			let token = 'Bearer ' + getToken();
 			let token = 'Bearer ' + getToken();
 			let header = {
 			let header = {
@@ -311,7 +312,10 @@
 						// basicInfo.value = res.data.data[0];
 						// basicInfo.value = res.data.data[0];
 						// dayWork.value.furnaceNoInfo = basicInfo.value;
 						// dayWork.value.furnaceNoInfo = basicInfo.value;
 						}
 						}
-					}
+					},
+			 fail: (err) => {
+				 console.log(err)
+			 }
 			})
 			})
 		}else{
 		}else{
 			furnaceInfo.value.furnaceNumber = "废品回用"
 			furnaceInfo.value.furnaceNumber = "废品回用"
@@ -461,6 +465,7 @@
 	}
 	}
 
 
 	function handleFurnaceNumberChange() {
 	function handleFurnaceNumberChange() {
+		
 		dayWork.value.furnaceNoInfo = basicInfo.value;
 		dayWork.value.furnaceNoInfo = basicInfo.value;
 	}
 	}
 
 
@@ -514,7 +519,6 @@
 	// }
 	// }
 
 
 	function handleAdd() {
 	function handleAdd() {
-		console.log(dayWork.value)
 		if (selectedProcess.value == null) {
 		if (selectedProcess.value == null) {
 			uni.showToast({
 			uni.showToast({
 				icon: 'none',
 				icon: 'none',
@@ -522,7 +526,8 @@
 			})
 			})
 			return;
 			return;
 		}
 		}
-		if(basicInfo.value) {
+		console.log(basicInfo.value)
+		if(dayWork.value.furnaceNoInfo == null) {
 			uni.showToast({
 			uni.showToast({
 				icon: 'none',
 				icon: 'none',
 				title: '请选择炉号再开始批次'
 				title: '请选择炉号再开始批次'