0603

pages/changeBox/index.vue

@@ -4,13 +4,13 @@
 			<view class='title uni-row'>
 				<text>当前箱号</text>
 			</view>
-			<view class="vehicleList uni-row">
+			<view :class="{ 'uni-row': true,'vehicleList':true,'totalBoxHeight':discardVehicleList.length == 0,'halfBoxHeight':discardVehicleList.length > 0}" >
 				<view class="vehicleNo uni-row" v-for="(item,index) in newBindList">
 					<text>{{item.carrierCode}}</text>
 					<text @click="handleDelVehicleNo(item,index)">×</text>
 				</view>
 			</view>
-			<view v-if="discardVehicleList.length > 0" class="disuseList">
+			<view v-if="discardVehicleList.length > 0" :class="{ 'disuseList': true, 'halfDisuseList':discardVehicleList.length > 0}">
 				<view class="uni-row" style="align-items: center;justify-content: space-evenly;">
 					<view>箱号</view>
 					<view>是否废弃</view>
@@ -346,13 +346,21 @@
 		margin: 50rpx auto;
 		padding-bottom: 50rpx;
 		border-radius: 12rpx;
-
+		.totalBoxHeight{
+			height:calc(100% - 20rpx); 
+		}
+		.halfBoxHeight{
+			height: 480rpx;
+		}
+		.halfDisuseList{
+			height: calc(100% - 480rpx - 20rpx);
+		}
 		.vehicleList {
 			justify-content: baseline;
 			align-content: flex-start;
 			flex-wrap: wrap;
 			width: 100%;
-			height: 480rpx;
+			//height: 480rpx;
 			padding: 0 64rpx;
 			overflow: auto;
 
@@ -370,7 +378,7 @@
 
 		.disuseList {
 			border-top: 2rpx solid #e1e1e1;
-			height: calc(100% - 480rpx - 20rpx);
+			//height: calc(100% - 480rpx - 20rpx);
 			overflow: auto;
 			width: 90%;
 			margin: 0 auto;

pages/sortBatchReporting/index.vue

@@ -66,8 +66,10 @@
 				</view>
 				<view class="item-info uni-row">
 					<text class="label">当前工序</text>
-					<text
-						class="label right">{{ item.currentProcess ? item.prevProcess && item['currentProcess'].processAlias == item['prevProcess'].processAlias ? '-' : item['currentProcess'].processAlias : '-'}}</text>
+					<!-- <text
+						class="label right">{{ item.currentProcess ? item.prevProcess && item['currentProcess'].processAlias == item['prevProcess'].processAlias ? '-' : item['currentProcess'].processAlias : '-'}}</text> -->
+						<text
+							class="label right">{{ item.currentProcess ?item['currentProcess'].processAlias : '-'}}</text>
 				</view>
 				<view class="item-info uni-row">
 					<text class="label">下道工序</text>
@@ -316,19 +318,20 @@
 				// listData.value = res.data.filter(item => {
 				// 	return item.isWasteRecycling == 0 && item.isAmend == 0;
 				// });
-				for (let i = 0; i < listData.value.length; i++) {
-					if (listData.value[i].prevProcess) {
-						let sum = 0;
-						for (let j = 0; j < listData.value[i].dayworkItemList.length; j++) {
-							if (listData.value[i].dayworkItemList[j].processId == listData.value[i].prevProcess
-								.id && (listData.value[i].dayworkItemList[j].status == 2 || listData.value[i]
-									.dayworkItemList[j].status == 3)) {
-								sum += listData.value[i].dayworkItemList[j].qualifiedNum;
-							}
-						}
-						listData.value[i].processQualifiedNum = sum;
-					}
-				}
+				/* 0531 */
+				// for (let i = 0; i < listData.value.length; i++) {
+				// 	if (listData.value[i].prevProcess) {
+				// 		let sum = 0;
+				// 		for (let j = 0; j < listData.value[i].dayworkItemList.length; j++) {
+				// 			if (listData.value[i].dayworkItemList[j].processId == listData.value[i].prevProcess
+				// 				.id && (listData.value[i].dayworkItemList[j].status == 2 || listData.value[i]
+				// 					.dayworkItemList[j].status == 3)) {
+				// 				sum += listData.value[i].dayworkItemList[j].qualifiedNum;
+				// 			}
+				// 		}
+				// 		listData.value[i].processQualifiedNum = sum;
+				// 	}
+				// }
 			}
 			uni.hideLoading();
 		})

pages/sorting/options.vue

@@ -70,18 +70,22 @@
 			// 传入当前报工信息 通过当前报工的产品和工序获取检查指导书和分选标准
 			if (data && data.data) {
 				dayworkItem.value = data.data
+				console.log(dayworkItem.value)
 				index.value = data.index
 				loadInspection({
 					technologicalProcessId: dayworkItem.value.technologicalProcessId,
-					processId: dayworkItem.value.processId
+					processId: dayworkItem.value.processId,
+					lotId:dayworkItem.value.lotId
 				})
 			}
 		})
 	})
 	function handleSearch() {
+		console.log(dayworkItem.value)
 	let data = {technologicalProcessId: dayworkItem.value.technologicalProcessId,
 		processId: dayworkItem.value.processId,
-		keywords:keywords.value}
+		keywords:keywords.value,
+		lotId:dayworkItem.value.lotId}
 		getInspectionList(data).then(res => {
 			console.log(res)
 			if (res.code === 200) {
@@ -151,7 +155,8 @@
 	const handleTabBarClick = (val) => {
 		let data = {technologicalProcessId: dayworkItem.value.technologicalProcessId,
 			processId: dayworkItem.value.processId,
-			keywords:keywords.value}
+			keywords:keywords.value,
+			lotId:dayworkItem.value.lotId}
 			getInspectionList(data).then(res => {
 				console.log(res)
 				if (res.code === 200) {