From bbfdde936d56b8350d455757cf9ea9d89b869e61 Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Tue, 23 Jun 2026 17:44:07 +0800
Subject: [PATCH] =?UTF-8?q?style=EF=BC=9A=E5=85=A5=E5=BA=93=E5=8D=95?=
 =?UTF-8?q?=E6=8D=AE-=E6=89=98=E7=9B=98=E7=A0=81-=E4=BB=93=E5=BA=93?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0/=E5=BA=93=E5=8C=BA=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/erp/stock/in/components/StockInItemForm.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/views/erp/stock/in/components/StockInItemForm.vue b/src/views/erp/stock/in/components/StockInItemForm.vue
index c5b3723a..1fe22d22 100644
--- a/src/views/erp/stock/in/components/StockInItemForm.vue
+++ b/src/views/erp/stock/in/components/StockInItemForm.vue
@@ -485,7 +485,7 @@
     </component>
     <template #footer>
       <component :is="palletDialogGuardTag" v-bind="disabled ? formEnabledAttrs : {}">
-        <el-button v-if="!disabled" type="primary" @click="confirmPalletSelect">{{ t('common.ok') }}</el-button>
+        <el-button v-if="!disabled" type="primary" :disabled="isPalletConfirmDisabled" @click="confirmPalletSelect">{{ t('common.ok') }}</el-button>
         <el-button @click="palletDialogVisible = false">{{ t('common.cancel') }}</el-button>
       </component>
     </template>
@@ -600,6 +600,9 @@ const selectedPalletPackageCountLabel = computed(() => {
   const packageQuantity = currentSelectRow.value?.packageQuantity ?? '-'
   return t('ErpStock.Item.packageCountWithItems', { count: packageQuantity })
 })
+const isPalletConfirmDisabled = computed(() =>
+  selectedPalletRows.value.some((row) => !row.warehouseId || !row.areaId)
+)
 const formEnabledAttrs = { disabled: false, labelWidth: '0px' }
 const palletDialogGuardTag = computed(() => (props.disabled ? 'el-form' : 'div'))
 
@@ -1169,6 +1172,7 @@ const removeSelectedPallets = () => {
 const confirmPalletSelect = () => {
   if (props.disabled) return
   if (!currentSelectRow.value) return
+  if (isPalletConfirmDisabled.value) return
   const row = currentSelectRow.value
   row.pallets = selectedPalletRows.value.map((pallet) => ({
     palletId: pallet.id,