From 77aaad9d5970eb34c06fba84fc017a0fc794a4c5 Mon Sep 17 00:00:00 2001
From: zxy <zhouxy1921@11.com>
Date: Wed, 21 Jan 2026 15:06:44 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E9=87=8D=E9=87=8F=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=E5=85=AC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yunxi/mes/module/heli/dal/mysql/formal/FormalMapper.java   | 3 ++-
 mes-ui/mes-ui-admin-vue3/src/views/heli/formal/FormalForm.vue  | 2 +-
 mes-ui/mes-ui-admin-vue3/src/views/heli/formal/index.vue       | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/formal/FormalMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/formal/FormalMapper.java
index 9d63c5e5..e1a9396a 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/formal/FormalMapper.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/formal/FormalMapper.java
@@ -9,6 +9,7 @@ import com.chanko.yunxi.mes.module.heli.dal.dataobject.formal.FormalDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.taskreport.TaskReportDO;
 import com.chanko.yunxi.mes.module.system.dal.dataobject.user.AdminUserDO;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.ibatis.annotations.Mapper;
 import com.chanko.yunxi.mes.module.heli.controller.admin.formal.vo.*;
 
@@ -25,7 +26,7 @@ public interface FormalMapper extends BaseMapperX<FormalDO> {
         query.selectAll(FormalDO.class)
                 .select("u.nickname as creatorName")
                 .leftJoin(AdminUserDO.class, "u", AdminUserDO::getId, FormalDO::getCreator)
-                .eq(reqVO.getMatType() != null, FormalDO::getMatType, reqVO.getMatType())
+                .eq(ObjectUtils.isNotEmpty(reqVO.getMatType()), FormalDO::getMatType, reqVO.getMatType())
                 .eq(reqVO.getFormal() != null, FormalDO::getFormal, reqVO.getFormal())
                 .eq(reqVO.getStatus() != null, FormalDO::getStatus, reqVO.getStatus())
                 .disableSubLogicDel();
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/formal/FormalForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/formal/FormalForm.vue
index bd6e109a..28e63547 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/formal/FormalForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/formal/FormalForm.vue
@@ -8,7 +8,7 @@
       v-loading="formLoading"
     >
       <el-form-item label="物料类型" prop="matType">
-        <el-select v-model="formData.matType" placeholder="请选择物料类型" disabled>
+        <el-select v-model="formData.matType" placeholder="请选择物料类型" :disabled="formType === 'update'"  >
           <el-option
             v-for="dict in getIntDictOptions(DICT_TYPE.HELI_FOR_MAT_TYPE)"
             :key="dict.value"
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/formal/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/formal/index.vue
index 7929c91b..ebe32494 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/formal/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/formal/index.vue
@@ -84,7 +84,7 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+    <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" class="hl-table" height="500" border>
 <!--      <el-table-column label="自增字段，唯一" align="center" prop="id" />-->
       <el-table-column type="index" width="100" fixed label="序号" align="center" />
       <el-table-column label="物料类型" align="center" prop="matType" >