From b4367cea76d7c1b1b5858e4685f898dd31618d46 Mon Sep 17 00:00:00 2001
From: liutao <790864623@qq.com>
Date: Sat, 11 Apr 2026 11:36:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/erp/stock/warehouse/index.ts          |  1 +
 src/locales/en.ts                             |  2 +-
 src/locales/zh-CN.ts                          |  3 +-
 .../in/components/StockInItemForm.vue         | 46 +++++++++++++++----
 4 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/src/api/erp/stock/warehouse/index.ts b/src/api/erp/stock/warehouse/index.ts
index 598824bf..114cfa00 100644
--- a/src/api/erp/stock/warehouse/index.ts
+++ b/src/api/erp/stock/warehouse/index.ts
@@ -12,6 +12,7 @@ export interface WarehouseVO {
   truckagePrice: number // 搬运费，单位：元
   status: number // 开启状态
   defaultStatus: boolean // 是否默认
+  warehouseId:number
 }
 
 // ERP 仓库 API
diff --git a/src/locales/en.ts b/src/locales/en.ts
index 9c1db108..5031015a 100644
--- a/src/locales/en.ts
+++ b/src/locales/en.ts
@@ -1304,7 +1304,7 @@ export default {
       name: 'Name',
       inspectionMethod: 'Inspection Method',
       valueType: 'Value Type',
-      judgmentCriteria: 'Judgment Criteria',
+      judgmentCriteria: 'Job Content',
       upperVal: 'Upper Value',
       lowerVal: 'Lower Value',
       creatorName: 'Creator',
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 62865f31..ca5fdaf0 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -1301,7 +1301,7 @@ export default {
       inspectionMethod: '作业方式',
       valueType: '结果类型',
       JobType:'作业类型',
-      judgmentCriteria: '判定基准',
+      judgmentCriteria: '作业内容',
       upperVal: '上限值',
       lowerVal: '下限值',
       creatorName: '创建人',
@@ -1663,6 +1663,7 @@ export default {
       validatorItemInIdRequired: '入库编号不能为空',
       validatorItemWarehouseRequired: '仓库不能为空',
       validatorItemProductRequired: '备件不能为空',
+      validatorItemCodeRequired: '备件不能为空',
       validatorItemCountRequired: '备件数量不能为空',
       confirmApprove: '确定审批该入库单吗？',
       confirmUnapprove: '确定反审批该入库单吗？',
diff --git a/src/views/erp/component/in/components/StockInItemForm.vue b/src/views/erp/component/in/components/StockInItemForm.vue
index 0df97a43..a236694a 100644
--- a/src/views/erp/component/in/components/StockInItemForm.vue
+++ b/src/views/erp/component/in/components/StockInItemForm.vue
@@ -21,6 +21,7 @@
               v-model="row.warehouseId"
               clearable
               filterable
+              disabled="true"
               :placeholder="t('SparePartsManagement.SpareIn.placeholderWarehouse')"
               @change="onChangeWarehouse($event, row)"
             >
@@ -34,6 +35,29 @@
           </el-form-item>
         </template>
       </el-table-column>
+      <el-table-column :label="t('SparePartsManagement.SpareIn.itemProductCode')" min-width="150">
+        <template #default="{ row, $index }">
+<!--          <el-form-item class="mb-0px!">
+            <el-input disabled v-model="row.productBarCode" />
+          </el-form-item>-->
+          <el-form-item :prop="`${$index}.productBarCode`"  class="mb-0px!">
+            <el-select
+              v-model="row.productBarCode"
+              clearable
+              filterable
+              @change="onChangeProductCode($event, row)"
+              :placeholder="t('SparePartsManagement.SpareIn.placeholderProduct')"
+            >
+              <el-option
+                v-for="item in productList"
+                :key="item.barCode"
+                :label="item.barCode"
+                :value="item.barCode"
+              />
+            </el-select>
+          </el-form-item>
+        </template>
+      </el-table-column>
       <el-table-column :label="t('SparePartsManagement.SpareIn.itemProductName')" min-width="180">
         <template #default="{ row, $index }">
           <el-form-item :prop="`${$index}.productId`" :rules="formRules.productId" class="mb-0px!">
@@ -61,13 +85,6 @@
           </el-form-item>
         </template>
       </el-table-column>
-      <el-table-column :label="t('SparePartsManagement.SpareIn.itemProductCode')" min-width="150">
-        <template #default="{ row }">
-          <el-form-item class="mb-0px!">
-            <el-input disabled v-model="row.productBarCode" />
-          </el-form-item>
-        </template>
-      </el-table-column>
       <el-table-column :label="t('SparePartsManagement.SpareIn.itemUnitName')" min-width="80">
         <template #default="{ row }">
           <el-form-item class="mb-0px!">
@@ -230,7 +247,7 @@ const getSummaries = (param: SummaryMethodProps) => {
 const handleAdd = () => {
   const row = {
     id: undefined,
-    warehouseId: defaultWarehouse.value?.id,
+    warehouseId: 11,
     productId: undefined,
     productUnitName: undefined, // 产品单位
     productBarCode: undefined, // 产品条码
@@ -266,6 +283,19 @@ const onChangeProduct = (productId, row) => {
   setStockCount(row)
 }
 
+/** 处理产品变更 */
+const onChangeProductCode = (productBarCode, row) => {
+  const product = productList.value.find((item) => item.barCode === productBarCode)
+  if (product) {
+    row.productUnitName = product.unitName
+    row.productBarCode = product.barCode
+    row.productPrice = product.minPrice
+    row.productId = product.id
+  }
+  // 加载库存
+  setStockCount(row)
+}
+
 /** 加载库存 */
 const setStockCount = async (row) => {
   if (!row.productId || !row.warehouseId) {