From efd2d003da2b79831a7e6f4ed00e8f9ad8af090b Mon Sep 17 00:00:00 2001
From: risingLee <871066422@qq.com>
Date: Mon, 5 Jan 2026 19:34:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86"=E6=A0=B7=E5=93=81?=
 =?UTF-8?q?=E5=9E=8B=E5=8F=B7"=E8=BE=93=E5=85=A5=E6=A1=86=EF=BC=8C?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=87=AA=E5=8A=A8=E5=AE=8C=E6=88=90=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86"=E7=A1=AC=E4=BB=B6=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=8F=B7"=E8=BE=93=E5=85=A5=E6=A1=86=EF=BC=8C?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=87=AA=E5=8A=A8=E5=AE=8C=E6=88=90=20?=
 =?UTF-8?q?=E8=BF=99=E4=B8=A4=E4=B8=AA=E5=AD=97=E6=AE=B5=E4=BC=9A=E5=BA=94?=
 =?UTF-8?q?=E7=94=A8=E5=88=B0=E6=89=80=E6=9C=89=E6=89=B9=E9=87=8F=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=9A=84=E6=A0=B7=E5=93=81=E4=B8=8A=20=E6=AF=8F?=
 =?UTF-8?q?=E4=B8=AA=E5=AD=97=E6=AE=B5=E9=83=BD=E6=9C=89=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/warehouse/receipt/index.vue     | 34 +++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/ruoyi-fastapi-frontend/src/views/warehouse/receipt/index.vue b/ruoyi-fastapi-frontend/src/views/warehouse/receipt/index.vue
index cd431b3..31c7ef2 100644
--- a/ruoyi-fastapi-frontend/src/views/warehouse/receipt/index.vue
+++ b/ruoyi-fastapi-frontend/src/views/warehouse/receipt/index.vue
@@ -316,6 +316,30 @@
     <!-- 批量添加样品对话框 -->
     <el-dialog title="批量添加样品" :visible.sync="batchSampleOpen" width="600px" append-to-body :close-on-click-modal="false">
       <el-form label-width="120px">
+        <el-form-item label="样品型号">
+          <el-autocomplete
+            v-model="batchSampleModel"
+            :fetch-suggestions="querySampleModelForReceipt"
+            placeholder="请输入样品型号"
+            style="width: 100%"
+            :trigger-on-focus="false"
+          />
+          <div style="margin-top: 5px; color: #909399; font-size: 12px">
+            <i class="el-icon-info"></i> 提示：该型号将应用于所有批量添加的样品
+          </div>
+        </el-form-item>
+        <el-form-item label="硬件版本号">
+          <el-autocomplete
+            v-model="batchHardwareVersion"
+            :fetch-suggestions="queryHardwareVersionForReceipt"
+            placeholder="请输入硬件版本号"
+            style="width: 100%"
+            :trigger-on-focus="false"
+          />
+          <div style="margin-top: 5px; color: #909399; font-size: 12px">
+            <i class="el-icon-info"></i> 提示：该版本号将应用于所有批量添加的样品
+          </div>
+        </el-form-item>
         <el-form-item label="样品SN号">
           <el-input
             v-model="batchSampleText"
@@ -365,6 +389,10 @@ export default {
       batchSampleOpen: false,
       // 批量添加样品文本
       batchSampleText: "",
+      // 批量添加样品型号
+      batchSampleModel: "",
+      // 批量添加硬件版本号
+      batchHardwareVersion: "",
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -522,6 +550,8 @@ export default {
     /** 批量添加样品 */
     handleBatchAddSample() {
       this.batchSampleText = "";
+      this.batchSampleModel = "";
+      this.batchHardwareVersion = "";
       this.batchSampleOpen = true;
     },
     /** 提交批量添加样品 */
@@ -544,9 +574,9 @@ export default {
           const exists = this.form.samples.some(sample => sample.sampleSn === sn);
           if (!exists) {
             this.form.samples.push({
-              sampleModel: null,
+              sampleModel: this.batchSampleModel || null,
               sampleSn: sn,
-              hardwareVersion: null,
+              hardwareVersion: this.batchHardwareVersion || null,
               externalStatus: null,
               testDeadline: null,
               testItems: null,