1.24

components/dialog-end-work/dialog-end-work.vue

@@ -108,8 +108,9 @@
 				for (let i = 0; i < itemListData.length; i++) {
 					sumReject += itemListData[i].rejectNum;
 				}
-				workInfo.value.qualifiedNum = workInfo.value.daywork.processQualifiedNum - sumReject;
-				temp.value = workInfo.value.qualifiedNum;
+				workInfo.value.qualifiedNum = store.dayworkInfo.processQualifiedNum > 0 ? store.dayworkInfo.processQualifiedNum - sumReject : store.dayworkInfo.oneLotQuantity - sumReject;
+				temp.value = workInfo.value.qualifiedNum;sumReject
+				console.log(store.dayworkInfo)
 			} else {
 				workInfo.value.qualifiedNum = 0;
 			}

components/dialog-turnoverApplication/dialog-turnoverApplication.vue

@@ -173,8 +173,9 @@
 
 	function handleConfirm() {
 		curDayworkItem.value.id = null;
-		curDayworkItem.value.status = curDayworkItem.value.turnoverType == '1' ? '6' : '4';
+		curDayworkItem.value.status = curDayworkItem.value.turnoverType == '1' ? '7' : '4';
 		curDayworkItem.value.startTime = timestampToTime(new Date());
+		curDayworkItem.value.endTime = timestampToTime(new Date());
 		curDayworkItem.value.technologicalProcessId  = dayworkInfo.value.technologicalProcessId;
 		curDayworkItem.value.dayworkId = dayworkInfo.value.id;
 		curDayworkItem.value.productionPlanDetailId = dayworkInfo.value.productionPlanDetailId;

pages/addNewBatch/index.vue

@@ -15,7 +15,7 @@
 				<uni-icons type="link" size="30" style="margin: 10rpx;  transform: rotate(135deg);"></uni-icons>
 				<view class='segment'></view>
 			</view>
-			<view>
+<!-- 			<view>
 				<text class='title'>扫码绑定载具</text>
 				<view class="vehicleList uni-row">
 					<view class="vehicleNo uni-row" v-for="(item,index) in vehicleList">
@@ -33,7 +33,7 @@
 				<view class='segment'></view>
 				<uni-icons type="paperclip" size="30" style="margin: 10rpx;"></uni-icons>
 				<view class='segment'></view>
-			</view>
+			</view> -->
 			<view>
 				<text class='title' style="margin-bottom: 50rpx;">基础信息</text>
 				<view class="uni-row info">
@@ -134,7 +134,12 @@
 		obj.productionPlanDetailId = store.planDetails.id;
 		getLotList(obj).then(res => {
 			console.log(res)
-			batchNoList.value = res.rows;
+			if(res.rows.length > 0){
+				batchNoList.value = [res.rows[0]];
+			}else{
+				batchNoList.value = res.rows;
+			}
+			
 		})
 	}