diff --git a/pages/manage/merge-pallet.vue b/pages/manage/merge-pallet.vue
index c2181fe..8d5caf2 100644
--- a/pages/manage/merge-pallet.vue
+++ b/pages/manage/merge-pallet.vue
@@ -152,6 +152,7 @@
 		methods: {
 			toCancel() {
 				this.show = false
+				this.clearUp()
 			},
 			handleChange (e) {
 				if (e) {
@@ -265,6 +266,7 @@
 					})
 				} else {
 					this._combineMaterials()
+					// this.show = true
 				}
 			},
 			async _combineMaterials () {
@@ -277,16 +279,24 @@
 							icon: 'none'
 						})
 					} else if (res.need_store_in) {
-						uni.showModal({
-							title: '提示',
-							content: '请将托盘放置在SD01/SD02点位，扫描托盘码进行入库。',
-							showCancel: false,
-							success: (res) => {
-								if (res.confirm) {
-									this.show = true
+						// 如果全选 现在只会进行1次入库；如果没有全选 仍然进行两次入库
+						if (this.selectedItems.length < this.oPalletData.length) {
+							// 部分选择 弹出二次入库
+							uni.showModal({
+								title: '提示',
+								content: '请将托盘放置在SD01/SD02点位，扫描托盘码进行入库。',
+								showCancel: false,
+								success: (res) => {
+									if (res.confirm) {
+										this.show = true
+									}
 								}
-							}
-						})
+							})
+						} else {
+							// 全选 直接入库
+							this.show = true
+							// this._generateStoreInTask()
+						}
 					}
 					this.disabled = false
 				} catch (e) {
@@ -314,6 +324,9 @@
 							this.val2 = ''
 							this.val3 = ''
 							this.times = 1
+							if (this.selectedItems.length === this.oPalletData.length) {
+								this.clearUp()
+							}
 						}
 					} else {
 						if (res.is_second_store_in) {