diff --git a/src/pages/count/job/countLightDetail.vue b/src/pages/count/job/countLightDetail.vue
index 263159a8..fe050dd9 100644
--- a/src/pages/count/job/countLightDetail.vue
+++ b/src/pages/count/job/countLightDetail.vue
@@ -47,7 +47,9 @@
 		</view>
 
 		<win-scan-button @goScan='openScanPopup'></win-scan-button>
-		<win-scan-pack-and-location :allowModifyLocation="false" ref="scanPopup" :noShowBalanceMessage="true"
+		<win-scan-pack-and-location 
+		headerType="HPQ,HMQ,HEQ"
+		:allowModifyLocation="false" ref="scanPopup" :noShowBalanceMessage="true"
 			:isHavePackNumber="true" :pdaCountBalanceQuery="true" :isShowHistory="false"
 			@getCountScanResult='getCountScanResult'>
 		</win-scan-pack-and-location>
@@ -704,15 +706,16 @@
 			},
 
 			getCountScanResult(result, managementPrecision) {
+				
 				var itemCode = result.label.itemCode
 				var packingNumber = result.label.packingNumber
 				var pack = result.package
-				var batch = result.label.batch
+				var batch = result.label.batch?result.label.batch:""
 				var inventoryStatus = result.balance ? result.balance.inventoryStatus : "OK"
 				var qty = result.balance ? result.balance.qty : 0;
-				var handleQty = result.label.qty
+				var handleQty = result.label.qty?result.label.qty:0
 
-				var uom = pack.uom
+				var uom = pack.uom? pack.uom:result.label.uom
 				var locationCode = this.locationCode
 
 				var recordItem = {
@@ -756,7 +759,9 @@
 						//批次管理，包装赋值为空
 						scanItem.toPackingNumber = ""
 						//在任务列表中,添加到对应的recordList
+					
 						if (mainItem) {
+								console.log("存在")
 							if (!mainItem.recordList) {
 								mainItem.recordList = []
 							}
@@ -778,6 +783,7 @@
 								mainItem.recordList.unshift(scanItem)
 							}
 						} else {
+							console.log("不存在")
 							//不在任务列表中,添加到列表中
 							var detail = this.createAddDetailInfo(scanItem)
 							scanItem.isNewJobDetail = "true"