提交

components/dialog-selectInviteUser/dialog-selectInviteUser.vue

@@ -158,8 +158,10 @@
 							inviteUser.commonName = selectedUserList.value[i].nickName
 							inviteUser.protemDayworkId = store.dayworkInfo.id
 							inviteUser.protemProcessId = itemList.value[0].processId
-							inviteUser.protemProcessStepNumber = itemList.value[0].technologicalProcessDetail.processStepNumber
-							inviteUser.technologicalProcessDetailId = itemList.value[0].technologicalProcessDetailId
+							inviteUser.protemProcessStepNumber = itemList.value[0].technologicalProcessDetail
+								.processStepNumber
+							inviteUser.technologicalProcessDetailId = itemList.value[0]
+								.technologicalProcessDetailId
 							inviteUserList.push(inviteUser)
 						}
 						console.log(inviteUserList)
@@ -173,9 +175,10 @@
 								});
 								close()
 							} else {
+								console.log(res)
 								uni.showToast({
 									icon: 'none',
-									title: '添加失败',
+									title: res.msg != null ? res.msg : '添加失败',
 								});
 							}
 						})

pages/batchReporting/index.vue

@@ -94,11 +94,14 @@
 					<text class="label">所在区域</text>
 					<text class="label right">{{ item['place'] ? item['place'] : '-' }}</text>
 				</view>
-				<view v-if="item.protemResourceGroupDetailList && item.protemResourceGroupDetailList.length>0" class="item-info uni-row">
+				<view v-if="item.protemResourceGroupDetailList && item.protemResourceGroupDetailList.length>0"
+					class="item-info uni-row">
 					<text class="label">邀请者</text>
-					<text class="label right">{{ item['protemResourceGroupDetailList'] && item['protemResourceGroupDetailList'].length>0 ? item['protemResourceGroupDetailList'][0].protemCreatorName : '-' }}</text>
+					<text
+						class="label right">{{ item['protemResourceGroupDetailList'] && item['protemResourceGroupDetailList'].length>0 ? item['protemResourceGroupDetailList'][0].protemCreatorName : '-' }}</text>
 				</view>
-				<view v-if="item.protemResourceGroupDetailList&& item.protemResourceGroupDetailList.length>0" class="item-info uni-row">
+				<view v-if="item.protemResourceGroupDetailList&& item.protemResourceGroupDetailList.length>0"
+					class="item-info uni-row">
 					<text class="label">已完成数量</text>
 					<text class="label right">{{ item['totalQuantity'] ? item['totalQuantity'] : 0 }}</text>
 				</view>
@@ -297,16 +300,18 @@
 		// console.log(normalStatus.value)
 
 		getDayWorkList(reqData).then(res => {
+			console.log(res.data)
 			if (res.code == 200) {
-			res.data.forEach(item => {
-			  let quantitySum = 0;
-			  item.dayworkItemList.forEach(info => {
-				  if(info.status <4) {
-			    quantitySum += info.qualifiedNum;
-				}
-			  });
-			  item.totalQuantity = quantitySum;
-			});
+				res.data.forEach(item => {
+					let quantitySum = 0;
+					item.dayworkItemList.forEach(info => {
+						if (info.status < 4 && item.currentProcess.processStepNumber == info
+							.processStepNumber) {
+							quantitySum += info.qualifiedNum;
+						}
+					});
+					item.totalQuantity = quantitySum;
+				});
 				tempList.value = res.data
 				// console.log(res)
 				if (normalStatus.value) {

pages/outsourcedInspection/form.vue

@@ -341,6 +341,14 @@
 				})
 				return;
 			}
+			if (unf[i].checkStandard == '' || unf[i].checkResult == '') {
+				uni.showToast({
+					icon: 'none',
+					title: "废品信息不能为空",
+					duration: 2000
+				})
+				return;
+			}
 			if (unf[i].rejectNum < 0 || unf[i].examiningNum < 0 || unf[i].disqualificationNum < 0) {
 				uni.showToast({
 					icon: 'none',

pages/outsourcedInspection/scan.vue

@@ -26,14 +26,15 @@
 				<view class="label">序检箱号</view>
 				<view class="value">{{ lot.inspectionCarrierCode }}</view>
 			</view>
-			<input type="text" v-model="carrierCode" placeholder="请输入箱号或检查载具号" />
+			<!-- <input type="text" v-model="carrierCode" placeholder="请输入箱号或检查载具号" /> -->
 			<view class="btn uni-row" style="background-color: #ff5555;" @click.stop="handleScanCode">
 				<uni-icons type="scan" size="16" style="color: #ffffff; margin-right: 8rpx;" />
 				<text>扫描箱码或载具二维码</text>
 			</view>
-			<view class="btn uni-row" style="margin-top: 48rpx;" @click.stop="handleConfirm">箱码确定</view>
-			<view class="btn uni-row" style="background-color: #26d01d;" @click.stop="handleSave">保存
-			</view>
+			<!-- <view class="btn uni-row" style="margin-top: 48rpx;" @click.stop="handleConfirm">箱码确定</view> -->
+			<!-- <view class="btn uni-row" style="background-color: #26d01d;" @click.stop="handleSave">保存
+			</view> -->
+			<view class="btn uni-row" style="margin-top: 48rpx;" @click.stop="handleSave">保存</view>
 		</view>
 		<dialog-processInspection ref='selectProcessInspection'
 			@handleSelectProcessInspection='handleSelectProcessInspection'></dialog-processInspection>