提交

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

@@ -319,6 +319,32 @@
 					}
 				}
 			);
+		} else {
+			let vehicleObj = {
+				carrierCode: bindList.value[0].carrierCode
+			};
+			let hasInFlag = false
+			for (let i = 0; i < bindList.value.length; i++) {
+				if (vehicleObj.carrierCode == bindList.value[i].carrierCode) {
+					hasInFlag = true
+					if (!bindList.value[i].flag) {
+						endFlag.value += 1;
+					}
+					bindList.value[i].flag = true;
+				}
+			}
+			if (!hasInFlag) {
+				uni.showToast({
+					icon: 'none',
+					title: '该批次没有绑定此箱',
+					duration: 2000
+				})
+			}
+			if (endFlag.value < bindList.value.length && hasInFlag) {
+				setTimeout(() => {
+					handleScanCode();
+				}, 700);
+			}
 		}
 	}
 

pages/deliveryInspection/form.vue

@@ -465,10 +465,10 @@
 		getInstrumentRoomInspection(processInspecion.value).then(res => {
 			if (res.data.length > 0) {
 				showTransfer.value = false
-				processInspecion.value.flag = true
+				// processInspecion.value.flag = true
 			} else {
 				showTransfer.value = true
-				processInspecion.value.flag = false
+				// processInspecion.value.flag = false
 			}
 		})
 	}

pages/factoryInspection/form.vue

@@ -265,6 +265,7 @@
 					title: '加载中'
 				});
 				processInspecion.value = store.processInspection
+				isAllChecked.value = (processInspecion.value.isAllChecked == 1)
 				selectInspecion(processInspecion.value).then(res => {
 					if (res.code == 200) {
 						processInspecion.value = res.data;

pages/firstInspection/form.vue

@@ -282,6 +282,7 @@
 					title: '加载中'
 				});
 				processInspecion.value = store.processInspection
+				isAllChecked.value = (processInspecion.value.isAllChecked == 1)
 				selectInspecion(processInspecion.value).then(res => {
 					if (res.code == 200) {
 						processInspecion.value = res.data;
@@ -320,10 +321,10 @@
 		getInstrumentRoomInspection(processInspecion.value).then(res => {
 			if (res.data.length > 0) {
 				showTransfer.value = false
-				processInspecion.value.flag = true
+				// processInspecion.value.flag = true
 			} else {
 				showTransfer.value = true
-				processInspecion.value.flag = false
+				// processInspecion.value.flag = false
 			}
 		})
 	}

pages/onSiteInspection/form.vue

@@ -337,6 +337,7 @@
 					title: '加载中'
 				});
 				processInspecion.value = store.processInspection
+				isAllChecked.value = (processInspecion.value.isAllChecked == 1)
 				selectInspecion(processInspecion.value).then(res => {
 					if (res.code == 200) {
 						processInspecion.value = res.data;

pages/queryLotInfo/index.vue

@@ -191,7 +191,8 @@
 				<view class="item-info uni-row"> <text class="label">检查员:</text>
 					<text class="label right ">{{ item['nickName'] }}</text>
 				</view>
-				<view v-if="item.processInspectionDetails && item.processInspectionDetails.length>0" v-for="(info, index) in item.processInspectionDetails" :key="index">
+				<view v-if="item.processInspectionDetails && item.processInspectionDetails.length>0"
+					v-for="(info, index) in item.processInspectionDetails" :key="index">
 					<view class="item-info uni-row">
 						<text class="label">检测项目:</text>
 						<text class="label right">{{ info['checkStandard']}}</text>
@@ -206,13 +207,16 @@
 					</view>
 				</view>
 				<!-- 拍照上传部分 -->
-						<view v-if="item.processInspectionPictureList && item.processInspectionPictureList.length>0" class="item-info uni-row">
-							<text class="label">拍照上传:</text>
-							<text class=" label right" >
-							<uni-file-picker v-model="item.processInspectionPictureList" :readonly="true"   return-type="array" :image-styles="imageStyles"  file-mediatype="image" class="my-files" ></uni-file-picker>
-							</text>
-						</view>
-						
+				<view v-if="item.processInspectionPictureList && item.processInspectionPictureList.length>0"
+					class="item-info uni-row">
+					<text class="label">拍照上传:</text>
+					<text class=" label right">
+						<uni-file-picker v-model="item.processInspectionPictureList" :readonly="true"
+							return-type="array" :image-styles="imageStyles" file-mediatype="image"
+							class="my-files"></uni-file-picker>
+					</text>
+				</view>
+
 				<view v-for="(data, index) in item.dayworkItemConsults" :key="index">
 					<view class="item-info uni-row">
 						<text class="label">咨询信息:</text>
@@ -356,9 +360,9 @@
 	const urlList = JSON.parse(uni.getStorageSync('baseUrl'))
 	const webHost = ref(urlList.baseUrl)
 	const imageStyles = {
-				width:50,
-				height:50
-			}
+		width: 50,
+		height: 50
+	}
 	// 查询主对象
 	let query = null
 	// 定义tab2的【SelectorQuery】对象
@@ -447,7 +451,7 @@
 		} else {
 			// 测试时用
 			getDayworkCarrierByCarrierCode({
-				carrierCode: '000605'
+				carrierCode: '000267'
 			}).then(res => {
 				if (res.code == 200) {
 					if (res.data.length > 0) {
@@ -512,9 +516,10 @@
 			dayworkId: dayworkId.value
 		}).then(response => {
 			if (response.code == 200) {
-				response.data.forEach(item =>{
-					if(item.processInspectionPictureList && item.processInspectionPictureList.length>0){
-						item.processInspectionPictureList.forEach(i=>{
+				response.data.forEach(item => {
+					if (item.processInspectionPictureList && item.processInspectionPictureList.length >
+						0) {
+						item.processInspectionPictureList.forEach(i => {
 							i.url = webHost.value + i.url
 						})
 					}
@@ -724,13 +729,14 @@
 			background-color: #1684fc;
 		}
 	}
+
 	.my-files {
 		display: flex;
 		justify-content: center;
-		
+
 		:deep(.uni-file-picker__container) {
-		flex-direction: row;
-			
+			flex-direction: row;
+
 		}
 	}
 </style>