1231

pages/unpacking/unpacking.vue

@@ -27,17 +27,18 @@
 			</scroll-view>
 			<!-- <packageCard v-if="newMaterialList.length > 0" :packageInfo="newMaterialList[newMaterialList.length - 1]"></packageCard> -->
 		</view>
+		
+		<!-- 底部按钮 -->
+		<view class="button-box">
+			<u-button style="width: 40%" type="error" @click="clear">清空</u-button>
+			<u-button style="width: 40%" type="primary" @click="handlerSubmit">拆箱</u-button>
+		</view>
 		<!-- 数量选择 -->
 		<u-modal :show="modalShow" showCancelButton title="请输入拆箱后数量" @confirm="modalConfirm" @cancel="modalCancel">
 			<view class="slot-content">
 				<u--input placeholder="请输入第一箱数量" type="number" border="surround" v-model="firstNum"></u--input>
 			</view>
 		</u-modal>
-		<!-- 底部按钮 -->
-		<view class="button-box">
-			<button type="default" @click="clear">清空</button>
-			<button type="default" @click="handlerSubmit">拆箱</button>
-		</view>
 	</view>
 </template>
 
@@ -144,17 +145,13 @@
 				if (type === 2) {
 					// 此时扫描的是箱号
 					if (this.newMaterialList.length > 0) {
-						for (let item of this.newMaterialList) {
-							if (data.patchCode === item.patchCode) {
-								uni.showModal({
-									title: '提示',
-									content: '已扫过此箱！',
-									showCancel: false,
-									confirmText: '确定'
-								});
-								return;
-							}
-						}
+						uni.showModal({
+							title: '提示',
+							content: '只可拆一个货物！',
+							showCancel: false,
+							confirmText: '确定'
+						});
+						return;
 					}
 					const checkData = {
 						originalCode: data.originalCode