0419

pages/batchReporting/index.vue

@@ -53,7 +53,7 @@
 				<view class="item-info uni-row">
 					<text class="label">投入数</text>
 					<text
-						class="label right">{{item['processQualifiedNum'] == 0 ? item['isLast'] == 1 ? item['lastLotQuantity'] : item['oneLotQuantity'] : item['processQualifiedNum']}}</text>
+						class="label right">{{item['processQualifiedNum'] == 0 ?  item['productionQuantity']  : item['processQualifiedNum']}}</text>
 				</view>
 				<view class="item-info uni-row">
 					<text class="label">上道工序</text>
@@ -141,6 +141,9 @@
 		showDayworkSave,
 		turnoverDelete
 	} from '@/api/business/dayWork.js'
+	import {
+		getWasteRecyclingLot
+	} from '@/api/business/lot.js'
 	import {
 		carrierFinishedCheck
 	} from '@/api/business/carrier.js'
@@ -162,6 +165,7 @@
 	const reqParam = ref(null);
 	const curDayworkItem = ref({}) // 当前报工记录,回显是否显示取消周转的状态	
 	const keywords = ref(null)
+	const wasteRecyclingList = ref([])//废品回用批次
 	const notPreProcess = ref(true)
 	const curProcessAfte = ref([])
 	const showRight = ref(null) // 抽屉
@@ -169,14 +173,22 @@
 	onLoad(() => {
 		curPlan.value = store.planDetails;
 		console.log(curPlan.value)
-		if (store.planDetails.requisitionDepartmentId == store.curDeptDetails.deptId) {
-			bottomStatus.value = true;
-			store.isPreProcess = true;
-		} else {
-			bottomStatus.value = false;
-			store.isPreProcess = false;
-		}
-		console.log(bottomStatus.value)
+		//废品回用的领料部门如果是当前工段，也要可以开始新批次
+		//查找当前计划单下的批次废品回用是当前工段
+		getWasteRecyclingLot({productionPlanDetailId:store.planDetails.id,requisitionDepartmentId :store.curDeptDetails.deptId}).then(res => {
+			wasteRecyclingList.value = res.rows
+			console.log(wasteRecyclingList.value.length)
+			if (store.planDetails.requisitionDepartmentId == store.curDeptDetails.deptId || wasteRecyclingList.value.length >0 ) {
+				bottomStatus.value = true;
+				store.isPreProcess = true;
+			} else {
+				bottomStatus.value = false;
+				store.isPreProcess = false;
+			}
+			
+		})
+		
+		console.log(wasteRecyclingList.value.length)
 	})
 
 	onShow(() => {