diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/WarehouseKeeperMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/WarehouseKeeperMapper.xml
index 5eeff3f2..d2f7ab9a 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/WarehouseKeeperMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/WarehouseKeeperMapper.xml
@@ -40,6 +40,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="typeName != null and typeName != ''">
             AND mt2.type_name like concat('%', #{typeName}, '%')
         </if>
+        <if test="modelName != null and modelName != ''">
+            AND mt.type_name like concat('%', #{modelName}, '%')
+        </if>
         GROUP BY mt.type_id
         ORDER BY mt.type_id DESC
     </select>
diff --git a/sgzb-ui/src/views/warehouseManage/machinery/keeper/index.vue b/sgzb-ui/src/views/warehouseManage/machinery/keeper/index.vue
index 0b1285ab..8902b9ca 100644
--- a/sgzb-ui/src/views/warehouseManage/machinery/keeper/index.vue
+++ b/sgzb-ui/src/views/warehouseManage/machinery/keeper/index.vue
@@ -54,6 +54,16 @@
                             @keyup.enter.native="handleQuery"
                         />
                     </el-form-item>
+                    <el-form-item label="规格型号" prop="typeName">
+                      <el-input
+                        v-model="queryParams.modelName"
+                        placeholder="请输入规格型号"
+                        clearable
+                        maxlength="50"
+                        style="width: 240px"
+                        @keyup.enter.native="handleQuery"
+                      />
+                    </el-form-item>
                     <el-form-item>
                         <el-button
                             type="primary"