From 8ff796775e02e4a3e1d29e2be54b23d18cf2c434 Mon Sep 17 00:00:00 2001
From: bb_pan <max_163email@163.com>
Date: Fri, 19 Dec 2025 10:43:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equipmentInput/index.vue                  | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/views/EquipmentEntryApproval/equipmentInput/index.vue b/src/views/EquipmentEntryApproval/equipmentInput/index.vue
index 6785d6a4..9433eb14 100644
--- a/src/views/EquipmentEntryApproval/equipmentInput/index.vue
+++ b/src/views/EquipmentEntryApproval/equipmentInput/index.vue
@@ -80,14 +80,10 @@
             v-model.trim="queryParams.originalCode"
           />
         </el-form-item>
-
-        <el-form-item prop="manufacturer" label="生产厂家">
-          <el-input
-            clearable
-            style="width: 240px"
-            placeholder="请输入内容"
-            v-model.trim="queryParams.manufacturer"
-          />
+        <el-form-item prop="manufacturerId" label="生产厂家">
+          <el-select v-model="queryParams.manufacturerId" placeholder="请选择生产厂家" clearable filterable style="width: 240px">
+            <el-option v-for="item in manufacturerList" :key="item.id" :label="item.label" :value="item.id"/>
+          </el-select>
         </el-form-item>
 
         <el-form-item prop="productionDate" label="出厂日期">
@@ -307,6 +303,7 @@ import {
   equipmentDelApiNew,
   equipmentPassAndRejectApiNew
 } from '@/api/EquipmentEntryApply/index'
+import { getManufacturerSelectApi } from '@/api/EquipmentLedger/index.js'
 
 export default {
   name: 'EquipmentDetailList',
@@ -327,7 +324,7 @@ export default {
         specificationModel: '',
         originalCode: '',
         manufacturer: '',
-
+        manufacturerId: '',
         minBuyPrice: '',
         maxBuyPrice: '',
         orderId: '',
@@ -335,6 +332,7 @@ export default {
         pageNum: 1,
         pageSize: 10
       },
+      manufacturerList: [],
       tableData: [],
       columns2: [],
       columns: [
@@ -370,12 +368,22 @@ export default {
       this.orderStatus = status || orderStatus
     }
     this.getEquipmentApplyList()
+    this.getManufacturerSelectList()
   },
   methods: {
     goBack() {
       // this.$router.go(-1)
       this.$router.push({ path: '/equipment/equipment-entry-approval' })
     },
+    // 获取厂家
+    getManufacturerSelectList() {
+      getManufacturerSelectApi().then((res) => {
+        console.log('🚀 ~ getManufacturerSelectList ~ res:', res)
+        if (res.code === 200) {
+          this.manufacturerList = res.data
+        }
+      })
+    },
     /**
      * 获取装备申请列表
      */