1

pages/index/index.vue

@@ -29,7 +29,9 @@ export default {
 				{ name: '移库', icon: 'cart-filled' },
 				{ name: '退库', icon: 'undo-filled' },
 				{ name: '拼箱', icon: 'folder-add-filled' },
-				{ name: '货物查看', icon: 'eye-filled' }
+				{ name: '货物查看', icon: 'eye-filled' },
+				{ name: '入库记录', icon: 'list' },
+				{ name: '出库记录', icon: 'list' }
 			]
 		};
 	},
@@ -71,14 +73,28 @@ export default {
 					});
 					break;
 				case 6:
-					uni.navigateTo({
-						url: '/pages/returnWarehose/returnWarehose'
-					});
+					//TODO 拼箱
+					// uni.navigateTo({
+					// 	url: '/pages/returnWarehose/returnWarehose'
+					// });
 					break;
-				case 6:
-					uni.navigateTo({
-						url: '/pages/returnWarehose/returnWarehose'
-					});
+				case 7:
+					// 货物查看
+					// uni.navigateTo({
+					// 	url: '/pages/returnWarehose/returnWarehose'
+					// });
+					break;
+				case 8:
+					// 货物查看
+					// uni.navigateTo({
+					// 	url: '/pages/returnWarehose/returnWarehose'
+					// });
+					break;
+				case 9:
+					// 货物查看
+					// uni.navigateTo({
+					// 	url: '/pages/returnWarehose/returnWarehose'
+					// });
 					break;
 				default:
 					break;

pages/outWarehouse/outWarehouse.vue

@@ -149,8 +149,12 @@ export default {
 				let list = JSON.parse(JSON.stringify(this.outOrderPlan));
 				for(let item of list){
 					// 扫描箱的工单号与计划中的批次号对比，数字是否在其中
-					if(item.Patchcode === data.workoderID){
+					if(!item.Patchcode){
+						continue;
+					}
+					if(item.Patchcode.includes(data.workoderID)){
 						flag = true;
+						break;
 					}
 				}
 				if(!flag){

pages/stocktake/stocktake.vue

@@ -19,7 +19,7 @@
 					<view v-if="searchType === 2" class="color2 aciton-box">操作指示-请扫货物码</view>
 					<!-- 扫描操作 -->
 					<view class="pda-search-box">
-						<PdaScanInput @getInfo="handleGetInfo" :type="searchType"></PdaScanInput>
+						<PdaScanInput @getInfo="handleGetInfo" :type="searchType" :hasFocus="false"></PdaScanInput>
 					</view>
 				</view>
 			</view>
@@ -27,7 +27,7 @@
 		<!-- 货物列表 -->
 		<view class="scroll-view-box">
 			<view class="scroll-view-title">盘点清单</view>
-			<packageCard v-if="newMaterialList.length > 0" :packageInfo="newMaterialList[newMaterialList.length - 1]" :hasFocus="false"></packageCard>
+			<packageCard v-if="newMaterialList.length > 0" :packageInfo="newMaterialList[newMaterialList.length - 1]"></packageCard>
 		</view>
 		<!-- 底部按钮 -->
 		<view class="button-box">