313

pages/addNewBatch/index.vue

@@ -8,14 +8,19 @@
 						:key='index'>
 						<!-- ,'batchNoCheck':batchNoCheck === item -->
 						<!-- @click="handleCheckBatchNo(item)" -->
-						{{item.lotCode}}
+						{{ item.lotCode }}{{ item.isLast == 1 ? ' (尾批)': '' }}
 					</view>
 				</view>
-				<view class="inpAndScan uni-row">
+				<view class="inpAndScan ">
 					<uni-easyinput v-if="batchNoList.length > 0" class="inp" suffixIcon="checkmarkempty"
 						v-model="inpValue" placeholder="可手动修正批次" @iconClick="iconClick"></uni-easyinput>
-					<view v-if="batchNoList.length > 0" class="scanLotCode" @click="handleConfirmLotCode">
-						<text>扫码修正批次</text>
+					<view class="uni-row" style="justify-content: space-between;">
+						<view v-if="batchNoList.length > 0" class="scanLotCode" @click="handleDoLastLot">
+							<text>是否加工尾批</text>
+						</view>
+						<view v-if="batchNoList.length > 0" class="scanLotCode" @click="handleConfirmLotCode">
+							<text>扫码修正批次</text>
+						</view>
 					</view>
 				</view>
 			</view>
@@ -24,7 +29,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">
@@ -60,12 +65,14 @@
 				<!-- <view class='segment' style="width: 90%;margin: 20rpx auto;"></view> -->
 				<view class="uni-row info">
 					<label for="productionPlanNo">计划单号:</label>
-					<text id="productionPlanNo" class="uni-input">{{ basicInfo.productionPlanNo ? basicInfo.productionPlanNo : '-'}}</text>
+					<text id="productionPlanNo"
+						class="uni-input">{{ basicInfo.productionPlanNo ? basicInfo.productionPlanNo : '-'}}</text>
 				</view>
 				<!-- <view class='segment' style="width: 90%;margin: 20rpx auto;"></view> -->
 				<view class="uni-row info">
 					<label for="lineNumber">序号:</label>
-					<text id="lineNumber" class="uni-input">{{ basicInfo.lineNumber ? basicInfo.lineNumber : '-'}}</text>
+					<text id="lineNumber"
+						class="uni-input">{{ basicInfo.lineNumber ? basicInfo.lineNumber : '-'}}</text>
 				</view>
 				<!-- <view class='segment' style="width: 90%;margin: 20rpx auto;"></view> -->
 				<view class="uni-row info">
@@ -80,13 +87,11 @@
 				</view>
 				<view class="uni-row info">
 					<label for="spec">规格:</label>
-					<text id="spec"
-						class="material uni-input">{{ basicInfo.spec ? basicInfo.spec : '-' }}</text>
+					<text id="spec" class="material uni-input">{{ basicInfo.spec ? basicInfo.spec : '-' }}</text>
 				</view>
 				<view class="uni-row info">
 					<label for="shape">形状:</label>
-					<text id="shape"
-						class="material uni-input">{{ basicInfo.shape ? basicInfo.shape : '-'}}</text>
+					<text id="shape" class="material uni-input">{{ basicInfo.shape ? basicInfo.shape : '-'}}</text>
 				</view>
 				<view class="uni-row info">
 					<label for="diameter">材料直径:</label>
@@ -198,7 +203,7 @@
 			Authorization: token
 		}
 		uni.request({
-			url:  path.furnaceNoURL + '/business/furnaceNoInfo/getFurnaceNoInfo',
+			url: path.furnaceNoURL + '/business/furnaceNoInfo/getFurnaceNoInfo',
 			data: {
 				productionPlanNo: store.planDetails.productionPlanNo,
 				lineNumber: store.planDetails.lineNumber
@@ -223,7 +228,7 @@
 				}
 			}
 		})
-		
+
 		getProcessList({
 			deptId: store.curDeptDetails.deptId,
 		}).then(res => {
@@ -240,7 +245,7 @@
 				}
 				selectedProcess.value = filteredData[0].id;
 				dayWork.value.processId = selectedProcess.value;
-			} 
+			}
 		})
 	}
 
@@ -290,6 +295,34 @@
 		}
 	}
 
+	function handleDoLastLot() {
+		uni.showModal({
+			title: '提示',
+			content: '确认是否加工尾批?',
+			success: function(res) {
+				if (res.confirm) {
+					if(lotList.value.some(item => item.isLast == 1)){
+						for (let i = 0; i < lotList.value.length; i++) {
+							if (lotList.value[i].isLast == 1) {
+								batchNoList.value = [lotList.value[i]];
+								dayWork.value.lotId = lotList.value[i].id;
+								dayWork.value.lotCode = lotList.value[i].lotCode;
+								dayWork.value.isLast = '1';
+								return;
+							}
+						}
+					}else{
+						uni.showToast({
+							icon: 'none',
+							title: '当前计划尾批已被加工',
+							duration: 2500
+						})
+					}	
+				} else if (res.cancel) {}
+			}
+		});
+	}
+
 	function handleConfirmLotCode() {
 		// 引入原生插件
 		const mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module");
@@ -315,7 +348,7 @@
 				// });
 				if (ret.resp_result) {
 					checkLotCode(ret.resp_result);
-				} 
+				}
 			}
 		);
 	}
@@ -323,7 +356,7 @@
 	function handleFurnaceNumberChange() {
 		dayWork.value.furnaceNoInfo = basicInfo.value;
 	}
-	
+
 	function handleProcessChange() {
 		dayWork.value.processId = selectedProcess.value;
 	}
@@ -369,7 +402,7 @@
 	// }
 
 	function handleAdd() {
-		if(selectedProcess.value == null){
+		if (selectedProcess.value == null) {
 			uni.showToast({
 				icon: 'none',
 				title: '请选择工序后再开始批次'
@@ -459,8 +492,8 @@
 		margin: 0 auto;
 
 		.inp {
-			width: 52%;
-			margin: 10rpx;
+			width: calc(100% - 16rpx);
+			margin: 10rpx auto;
 			height: 74rpx;
 		}
 
@@ -470,7 +503,7 @@
 			height: 60rpx;
 			margin: 10rpx;
 			height: 72rpx;
-			width: 36%;
+			width: 46%;
 			text-align: center;
 			line-height: 72rpx;
 			background-color: rgba(22, 132, 252, 1);
@@ -574,7 +607,7 @@
 		height: auto;
 		width: 60%;
 	}
-	
+
 	.selectedProcess {
 		width: 88%;
 		margin: 20rpx auto 40rpx;

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['oneLotQuantity'] : item['processQualifiedNum']}}</text>
+						class="label right">{{item['processQualifiedNum'] == 0 ? item['isLast'] == 1 ? item['lastLotQuantity'] : item['oneLotQuantity'] : item['processQualifiedNum']}}</text>
 				</view>
 				<view class="item-info uni-row">
 					<text class="label">上道工序</text>