仓库-出库入库，扫码根据客户需求进行改动

pages/inWarehouse/inWarehouse.vue

@@ -17,7 +17,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" :warehouseInfo="warehouseInfo"></PdaScanInput>
 					</view>
 				</view>
 			</view>
@@ -39,7 +39,8 @@
 		</view>
 		<!-- 底部按钮 -->
 		<view class="button-box">
-			<button type="default" @click="handlerSubmit">入库</button>
+			<button style="width: 40%" type="default" @click="clear">全部重置</button>
+			<button style="width: 40%" type="default" @click="handlerSubmit">入库</button>
 		</view>
 	</view>
 </template>
@@ -122,7 +123,6 @@ export default {
 			this.searchType = 1;
 		},
 		handleGetInfo(data, type) {
-			console.log(data, type);
 			if (type === 1) {
 				// 仓库扫完后是箱号
 				this.searchType = 2;
@@ -145,8 +145,8 @@ export default {
 					// 此时扫描的是箱号
 					// 当前录入的箱号是否在同一批次录入过
 					// 曾经是否扫过
-					if(this.newMaterialList.length > 0){
-						for(let item of this.newMaterialList){
+					if (this.newMaterialList.length > 0) {
+						for (let item of this.newMaterialList) {
 							if (item.patchCode === data.patchCode) {
 								uni.showModal({
 									title: '提示',
@@ -227,7 +227,9 @@ export default {
 									icon: 'success',
 									title: '入库成功！'
 								});
-								this.clear();
+								this.oldMaterialList = JSON.parse(JSON.stringify(this.clearData.oldMaterialList));
+								this.newMaterialList = JSON.parse(JSON.stringify(this.clearData.newMaterialList));
+								// this.clear();
 							} else {
 								uni.showToast({
 									icon: 'error',
@@ -322,5 +324,8 @@ export default {
 .button-box {
 	width: 80%;
 	margin: 10px auto;
+	display: flex;
+	align-items: center;
+	justify-content: center;
 }
 </style>