From 386b848d6619b4ae2707a4e7cd5efbc26f3cbe20 Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Fri, 22 Nov 2024 10:00:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E7=AE=A1=E5=91=98=E7=BB=91=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E8=A7=84=E6=A0=BC=E5=9E=8B=E5=8F=B7=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/base/WarehouseKeeperMapper.xml    |  3 +++
 .../views/warehouseManage/machinery/keeper/index.vue   | 10 ++++++++++
 2 files changed, 13 insertions(+)

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"