From 344c9972ad673948b7fdbc2741c8d0623e9efdb6 Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Tue, 23 Jun 2026 15:10:32 +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-=E7=89=A9=E6=96=99=E3=80=81=E5=A4=87=E4=BB=B6-?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BA=93=E5=AD=98=E5=8D=95=E4=BD=8D=E3=80=81?=
 =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=8D=A2=E7=AE=97=E6=95=B0=E9=87=8F=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stock/in/components/StockInItemForm.vue   | 29 +++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/views/erp/stock/in/components/StockInItemForm.vue b/src/views/erp/stock/in/components/StockInItemForm.vue
index ded64709..122547bd 100644
--- a/src/views/erp/stock/in/components/StockInItemForm.vue
+++ b/src/views/erp/stock/in/components/StockInItemForm.vue
@@ -80,11 +80,11 @@
           <el-input :model-value="row.packagingSchemeName || '-'" readonly />
         </template>
       </el-table-column>
-      <!-- <el-table-column v-if="isProductStockIn" :label="t('ErpStock.PackagingScheme.palletPackageQuantity')" min-width="120">
+      <el-table-column v-if="isProductStockIn" :label="t('ErpStock.PackagingScheme.palletPackageQuantity')" min-width="120">
         <template #default="{ row }">
           <el-input :model-value="row.palletPackageQuantity ?? '-'" readonly />
         </template>
-      </el-table-column> -->
+      </el-table-column>
       <el-table-column v-if="isProductStockIn" :label="t('ErpStock.Item.packageItemCount')" min-width="120">
         <template #default="{ row }">
           <el-input :model-value="row.packageQuantity ?? '-'" readonly />
@@ -104,6 +104,13 @@
           </el-form-item>
         </template>
       </el-table-column>
+      <el-table-column v-if="isPurchaseUnitStockIn" :label="t('ErpStock.Item.inventoryUnit')" min-width="80">
+        <template #default="{ row }">
+          <el-form-item class="mb-0px!">
+            <el-input readonly v-model="row.productUnitName" />
+          </el-form-item>
+        </template>
+      </el-table-column>
       <el-table-column v-if="isPurchaseUnitStockIn" :label="t('ErpStock.Item.purchaseUnit')" min-width="100">
         <template #default="{ row }">
           <el-form-item class="mb-0px!">
@@ -118,6 +125,23 @@
           </el-form-item>
         </template>
       </el-table-column>
+      <el-table-column v-if="isPurchaseUnitStockIn" min-width="120">
+        <template #header>
+          {{ t('ErpStock.Item.purchaseUnitConvertQuantity') }}
+          <el-tooltip effect="dark" placement="top">
+            <template #content>
+              {{ purchaseUnitConvertTipText }}
+            </template>
+            <Icon icon="ep:question-filled" class="ml-4px"
+              style="vertical-align: middle; color: #909399; cursor: pointer;" />
+          </el-tooltip>
+        </template>
+        <template #default="{ row }">
+          <el-form-item class="mb-0px!">
+            <el-input readonly v-model="row.purchaseUnitConvertQuantity" />
+          </el-form-item>
+        </template>
+      </el-table-column>
       <el-table-column v-if="!isProductStockIn" :label="t('ErpStock.Item.count')" prop="count" min-width="140">
         <template #default="{ row, $index }">
           <el-form-item :prop="`${$index}.count`" :rules="formRules.count" class="mb-0px!">
@@ -504,6 +528,7 @@ const activeCategoryType = computed(() => stockInCategoryTypeMap[props.inType ||
 const isProductMaterialStockIn = computed(() => Boolean(activeCategoryType.value))
 const isProductStockIn = computed(() => activeCategoryType.value === 1)
 const isPurchaseUnitStockIn = computed(() => activeCategoryType.value === 2 || activeCategoryType.value === 3)
+const purchaseUnitConvertTipText = computed(() => t('FactoryModeling.ProductInformation.dialogPurchaseUnitConvertTip'))
 const selectorColumnLabel = computed(() => {
   const rows = formData.value || []
   return rows.length > 0 && rows.every((row) => isRowRelatedTask(row))