From 824f30d45f877021316719b18d808f598c0be6f0 Mon Sep 17 00:00:00 2001
From: lcj <2331845269@qq.com>
Date: Mon, 10 Mar 2025 09:58:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A1=B9=E7=9B=AE=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E6=A0=A1=E9=AA=8C=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/BusMachineryController.java    |   4 +-
 .../BusMachineryDetailController.java         |   4 +-
 .../service/impl/BusMachineryServiceImpl.java |   4 +
 .../controller/BusCompanyController.java      |   4 +-
 .../controller/BusMaterialsController.java    |   4 +-
 .../BusMaterialsInventoryController.java      |   4 +-
 .../BusConstructionUserController.java        |   4 +-
 .../controller/BusContractorController.java   |   4 +-
 .../controller/BusProjectController.java      |   4 +-
 .../controller/BusProjectTeamController.java  |   4 +-
 .../BusProjectTeamMemberController.java       |   4 +-
 .../BusUserProjectRelevancyController.java    |   6 +-
 .../project/service/IBusProjectService.java   |   8 +
 .../service/impl/BusProjectServiceImpl.java   |  16 ++
 .../impl/BusProjectTeamServiceImpl.java       |   8 +-
 plus-ui/.env.development                      |   2 +-
 plus-ui/src/api/project/project/types.ts      |  18 +--
 plus-ui/src/views/index.vue                   |   4 +-
 plus-ui/src/views/materials/company/index.vue | 122 +++++++--------
 .../src/views/materials/materials/index.vue   | 112 ++++++-------
 .../materials/materialsInventory/index.vue    | 148 ++++++++++--------
 .../project/project/index.vue                 |  15 +-
 22 files changed, 273 insertions(+), 230 deletions(-)

diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/controller/BusMachineryController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/controller/BusMachineryController.java
index 7211fc96..15da011f 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/controller/BusMachineryController.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/controller/BusMachineryController.java
@@ -43,8 +43,8 @@ public class BusMachineryController extends BaseController {
      */
     @SaCheckPermission("machinery:machinery:list")
     @GetMapping("/list")
-    public Page<BusMachineryVo> list(MachineryQueryReq req) {
-        return busMachineryService.queryPageList(req);
+    public R<Page<BusMachineryVo>> list(MachineryQueryReq req) {
+        return R.ok(busMachineryService.queryPageList(req));
     }
 
     /**
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/controller/BusMachineryDetailController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/controller/BusMachineryDetailController.java
index f04bc1b3..4aab205d 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/controller/BusMachineryDetailController.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/controller/BusMachineryDetailController.java
@@ -43,8 +43,8 @@ public class BusMachineryDetailController extends BaseController {
      */
     @SaCheckPermission("machinery:machineryDetail:list")
     @GetMapping("/list")
-    public Page<BusMachineryDetailVo> list(MachineryDetailQueryReq req) {
-        return busMachineryDetailService.queryPageList(req);
+    public R<Page<BusMachineryDetailVo>> list(MachineryDetailQueryReq req) {
+        return R.ok(busMachineryDetailService.queryPageList(req));
     }
 
     /**
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/impl/BusMachineryServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/impl/BusMachineryServiceImpl.java
index 78f7933d..babdf552 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/impl/BusMachineryServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/service/impl/BusMachineryServiceImpl.java
@@ -12,6 +12,7 @@ import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.ObjectUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.core.utils.sql.SqlUtil;
+import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.machinery.domain.BusMachinery;
 import org.dromara.machinery.domain.req.machinery.MachineryCreateReq;
 import org.dromara.machinery.domain.req.machinery.MachineryQueryReq;
@@ -142,6 +143,9 @@ public class BusMachineryServiceImpl extends ServiceImpl<BusMachineryMapper, Bus
         if (StrUtil.isBlank(machineryName)) {
             throw new ServiceException("机械名称不能为空", HttpStatus.BAD_REQUEST);
         }
+        // 判断用户是否对项目下的内容有操作权限
+        Long userId = LoginHelper.getUserId();
+        projectService.validAuth(projectId, userId);
     }
 
     /**
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/BusCompanyController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/BusCompanyController.java
index cec21c25..2f5602ea 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/BusCompanyController.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/BusCompanyController.java
@@ -45,8 +45,8 @@ public class BusCompanyController extends BaseController {
      */
     @SaCheckPermission("materials:company:list")
     @GetMapping("/list")
-    public Page<BusCompanyVo> list(CompanyQueryReq req) {
-        return busCompanyService.queryPageList(req);
+    public R<Page<BusCompanyVo>> list(CompanyQueryReq req) {
+        return R.ok(busCompanyService.queryPageList(req));
     }
 
     /**
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/BusMaterialsController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/BusMaterialsController.java
index e16e417a..645f3d8a 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/BusMaterialsController.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/BusMaterialsController.java
@@ -43,8 +43,8 @@ public class BusMaterialsController extends BaseController {
      */
     @SaCheckPermission("materials:materials:list")
     @GetMapping("/list")
-    public Page<BusMaterialsVo> list(MaterialsQueryReq req) {
-        return busMaterialsService.queryPageList(req);
+    public R<Page<BusMaterialsVo>> list(MaterialsQueryReq req) {
+        return R.ok(busMaterialsService.queryPageList(req));
     }
 
     /**
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/BusMaterialsInventoryController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/BusMaterialsInventoryController.java
index 035bdb26..62ca3367 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/BusMaterialsInventoryController.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/BusMaterialsInventoryController.java
@@ -43,8 +43,8 @@ public class BusMaterialsInventoryController extends BaseController {
      */
     @SaCheckPermission("materials:materialsInventory:list")
     @GetMapping("/list")
-    public Page<BusMaterialsInventoryVo> list(MaterialsInventoryQueryReq req) {
-        return busMaterialsInventoryService.queryPageList(req);
+    public R<Page<BusMaterialsInventoryVo>> list(MaterialsInventoryQueryReq req) {
+        return R.ok(busMaterialsInventoryService.queryPageList(req));
     }
 
     /**
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusConstructionUserController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusConstructionUserController.java
index 86d1f11e..a41268cb 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusConstructionUserController.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusConstructionUserController.java
@@ -43,8 +43,8 @@ public class BusConstructionUserController extends BaseController {
      */
     @SaCheckPermission("project:constructionUser:list")
     @GetMapping("/list")
-    public Page<BusConstructionUserVo> list(ConstructionUserQueryReq req) {
-        return busConstructionUserService.queryPageList(req);
+    public R<Page<BusConstructionUserVo>> list(ConstructionUserQueryReq req) {
+        return R.ok(busConstructionUserService.queryPageList(req));
     }
 
     /**
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusContractorController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusContractorController.java
index ffab2b8f..96abf89b 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusContractorController.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusContractorController.java
@@ -43,8 +43,8 @@ public class BusContractorController extends BaseController {
      */
     @SaCheckPermission("project:contractor:list")
     @GetMapping("/list")
-    public Page<BusContractorVo> list(ContractorQueryReq req) {
-        return busContractorService.queryPageList(req);
+    public R<Page<BusContractorVo>> list(ContractorQueryReq req) {
+        return R.ok(busContractorService.queryPageList(req));
     }
 
     /**
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectController.java
index bac9f22b..041e4343 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectController.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectController.java
@@ -45,8 +45,8 @@ public class BusProjectController extends BaseController {
      */
     @SaCheckPermission("project:project:list")
     @GetMapping("/list")
-    public Page<BusProjectVo> list(ProjectQueryReq req) {
-        return projectService.queryPageList(req);
+    public R<Page<BusProjectVo>> list(ProjectQueryReq req) {
+        return R.ok(projectService.queryPageList(req));
     }
 
     /**
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectTeamController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectTeamController.java
index b3e65dcf..6a2da4ff 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectTeamController.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectTeamController.java
@@ -43,8 +43,8 @@ public class BusProjectTeamController extends BaseController {
      */
     @SaCheckPermission("project:projectTeam:list")
     @GetMapping("/list")
-    public Page<BusProjectTeamVo> list(ProjectTeamQueryReq req) {
-        return busProjectTeamService.queryPageList(req);
+    public R<Page<BusProjectTeamVo>> list(ProjectTeamQueryReq req) {
+        return R.ok(busProjectTeamService.queryPageList(req));
     }
 
     /**
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectTeamMemberController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectTeamMemberController.java
index 280f297f..c596ea01 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectTeamMemberController.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectTeamMemberController.java
@@ -43,8 +43,8 @@ public class BusProjectTeamMemberController extends BaseController {
      */
     @SaCheckPermission("project:projectTeamMember:list")
     @GetMapping("/list")
-    public Page<BusProjectTeamMemberVo> list(ProjectTeamMemberQueryReq req) {
-        return busProjectTeamMemberService.queryPageList(req);
+    public R<Page<BusProjectTeamMemberVo>> list(ProjectTeamMemberQueryReq req) {
+        return R.ok(busProjectTeamMemberService.queryPageList(req));
     }
 
     /**
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusUserProjectRelevancyController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusUserProjectRelevancyController.java
index db39e3e8..f1377c1c 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusUserProjectRelevancyController.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusUserProjectRelevancyController.java
@@ -50,8 +50,8 @@ public class BusUserProjectRelevancyController extends BaseController {
     @Tag(name = "查询用户与项目关联列表")
     @SaCheckPermission("project:projectRelevancy:list")
     @GetMapping("/list")
-    public Page<BusUserProjectRelevancyVo> list(UserProjectRelevancyQueryReq req) {
-        return userProjectRelevancyService.queryPageList(req);
+    public R<Page<BusUserProjectRelevancyVo>> list(UserProjectRelevancyQueryReq req) {
+        return R.ok(userProjectRelevancyService.queryPageList(req));
     }
 
     /**
@@ -97,7 +97,7 @@ public class BusUserProjectRelevancyController extends BaseController {
     @SaCheckPermission("project:projectRelevancy:query")
     @GetMapping("/{id}")
     public R<BusUserProjectRelevancyVo> getInfo(@NotNull(message = "主键不能为空")
-                                             @PathVariable Long id) {
+                                                @PathVariable Long id) {
         return R.ok(userProjectRelevancyService.queryById(id));
     }
 
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectService.java
index 1a2ff2ff..9de60cc7 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectService.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/IBusProjectService.java
@@ -93,4 +93,12 @@ public interface IBusProjectService extends IService<BusProject> {
      */
     Page<BusProjectVo> getVoPage(Page<BusProject> projectPage);
 
+    /**
+     * 校验用户是否拥有操作项目的权限
+     *
+     * @param projectId 项目id
+     * @param userId    需要鉴权的用户id
+     */
+    void validAuth(Long projectId, Long userId);
+
 }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectServiceImpl.java
index 1f845dcb..07cd7ba5 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectServiceImpl.java
@@ -273,4 +273,20 @@ public class BusProjectServiceImpl extends ServiceImpl<BusProjectMapper, BusProj
         return projectVoPage;
     }
 
+    /**
+     * 校验用户是否拥有操作项目的权限
+     *
+     * @param projectId 项目对象
+     * @param userId    需要鉴权的用户id
+     */
+    @Override
+    public void validAuth(Long projectId, Long userId) {
+        QueryWrapper<BusUserProjectRelevancy> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("project_id", projectId);
+        queryWrapper.eq("user_id", userId);
+        if (userProjectRelevancyService.count(queryWrapper) <= 0) {
+            throw new ServiceException("当前用户无权限操作", HttpStatus.UNAUTHORIZED);
+        }
+    }
+
 }
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamServiceImpl.java
index 317b0d25..617e16a9 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectTeamServiceImpl.java
@@ -13,14 +13,15 @@ import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.ObjectUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.core.utils.sql.SqlUtil;
+import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.project.domain.BusProjectTeam;
 import org.dromara.project.domain.req.projectteam.ProjectTeamCreateReq;
 import org.dromara.project.domain.req.projectteam.ProjectTeamQueryReq;
 import org.dromara.project.domain.req.projectteam.ProjectTeamUpdateReq;
 import org.dromara.project.domain.vo.BusProjectTeamVo;
 import org.dromara.project.mapper.BusProjectTeamMapper;
-import org.dromara.project.service.IBusProjectTeamService;
 import org.dromara.project.service.IBusProjectService;
+import org.dromara.project.service.IBusProjectTeamService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -100,7 +101,7 @@ public class BusProjectTeamServiceImpl extends ServiceImpl<BusProjectTeamMapper,
         // 操作数据库
         boolean save = this.save(projectTeam);
         if (!save) {
-            throw new ServiceException("新增施工人员失败，数据库异常", HttpStatus.ERROR);
+            throw new ServiceException("新增项目班组失败，数据库异常", HttpStatus.ERROR);
         }
         return projectTeam.getId();
     }
@@ -148,6 +149,9 @@ public class BusProjectTeamServiceImpl extends ServiceImpl<BusProjectTeamMapper,
         if (projectService.getById(projectId) == null) {
             throw new ServiceException("对应项目不存在", HttpStatus.NOT_FOUND);
         }
+        // 判断用户是否对项目下的内容有操作权限
+        Long userId = LoginHelper.getUserId();
+        projectService.validAuth(projectId, userId);
     }
 
     /**
diff --git a/plus-ui/.env.development b/plus-ui/.env.development
index 2dde2963..94f3f5ac 100644
--- a/plus-ui/.env.development
+++ b/plus-ui/.env.development
@@ -5,7 +5,7 @@ VITE_APP_TITLE = RuoYi-Vue-Plus多租户管理系统
 VITE_APP_ENV = 'development'
 
 # 开发环境
-VITE_APP_BASE_API = 'http://192.168.110.5:8899'
+VITE_APP_BASE_API = 'http://192.168.110.2:8899'
 
 # 应用访问路径 例如使用前缀 /admin/
 VITE_APP_CONTEXT_PATH = '/'
diff --git a/plus-ui/src/api/project/project/types.ts b/plus-ui/src/api/project/project/types.ts
index 0d249b30..53c8a8af 100644
--- a/plus-ui/src/api/project/project/types.ts
+++ b/plus-ui/src/api/project/project/types.ts
@@ -1,6 +1,6 @@
 export interface ProjectVO {
   /**
-   * 
+   * id
    */
   id: string | number;
 
@@ -108,12 +108,11 @@ export interface ProjectVO {
    * 是否删除（0正常 1删除）
    */
   isDelete: number;
-
 }
 
 export interface ProjectForm extends BaseEntity {
   /**
-   * 
+   *
    */
   id?: string | number;
 
@@ -221,11 +220,9 @@ export interface ProjectForm extends BaseEntity {
    * 是否删除（0正常 1删除）
    */
   isDelete?: number;
-
 }
 
 export interface ProjectQuery extends PageQuery {
-
   /**
    * 项目名称
    */
@@ -326,11 +323,8 @@ export interface ProjectQuery extends PageQuery {
    */
   isDelete?: number;
 
-    /**
-     * 日期范围参数
-     */
-    params?: any;
+  /**
+   * 日期范围参数
+   */
+  params?: any;
 }
-
-
-
diff --git a/plus-ui/src/views/index.vue b/plus-ui/src/views/index.vue
index f1ca77a5..ed0e91c5 100644
--- a/plus-ui/src/views/index.vue
+++ b/plus-ui/src/views/index.vue
@@ -20,8 +20,8 @@
 </template>
 
 <script setup name="Index" lang="ts">
-import { ref } from "vue";
-import { useRouter } from "vue-router";
+import { ref } from 'vue';
+import { useRouter } from 'vue-router';
 
 const router = useRouter();
 
diff --git a/plus-ui/src/views/materials/company/index.vue b/plus-ui/src/views/materials/company/index.vue
index 977705aa..7bccf8c0 100644
--- a/plus-ui/src/views/materials/company/index.vue
+++ b/plus-ui/src/views/materials/company/index.vue
@@ -1,7 +1,6 @@
 <template>
   <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
-      :leave-active-class="proxy?.animate.searchAnimate.leave">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true">
@@ -12,8 +11,7 @@
               <el-input v-model="queryParams.projectId" placeholder="请输入项目id" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item label="资质情况" prop="qualification">
-              <el-input v-model="queryParams.qualification" placeholder="请输入资质情况" clearable
-                @keyup.enter="handleQuery" />
+              <el-input v-model="queryParams.qualification" placeholder="请输入资质情况" clearable @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -28,20 +26,20 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd"
-              v-hasPermi="['materials:company:add']">新增</el-button>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['materials:company:add']">新增 </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()"
-              v-hasPermi="['materials:company:edit']">修改</el-button>
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['materials:company:edit']"
+              >修改
+            </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
-              v-hasPermi="['materials:company:remove']">删除</el-button>
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['materials:company:remove']"
+              >删除
+            </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport"
-              v-hasPermi="['materials:company:export']">导出</el-button>
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['materials:company:export']">导出 </el-button>
           </el-col>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
@@ -59,13 +57,15 @@
         <el-table-column label="公司名称" align="center" prop="companyName" />
         <el-table-column label="公司状态" align="center" prop="status">
           <template #default="{ row }">
-            <span :style="{
-              color: row.status === 0 ? 'green' : 'red',
-              backgroundColor: row.status === 0 ? '#E6F9E6' : '#FDE2E2',
-              padding: '5px 10px',
-              borderRadius: '5px',
-              display: 'inline-block'
-            }">
+            <span
+              :style="{
+                color: row.status === 0 ? 'green' : 'red',
+                backgroundColor: row.status === 0 ? '#E6F9E6' : '#FDE2E2',
+                padding: '5px 10px',
+                borderRadius: '5px',
+                display: 'inline-block'
+              }"
+            >
               {{ row.status === 0 ? '正常' : '不正常' }}
             </span>
           </template>
@@ -76,22 +76,19 @@
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
-                v-hasPermi="['materials:company:edit']"></el-button>
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['materials:company:edit']"></el-button>
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
-                v-hasPermi="['materials:company:remove']"></el-button>
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['materials:company:remove']"></el-button>
             </el-tooltip>
           </template>
         </el-table-column>
       </el-table>
 
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-        v-model:limit="queryParams.pageSize" @pagination="getList" />
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
     <!-- 添加或修改公司对话框 -->
-     
+
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="companyFormRef" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="公司名称" prop="companyName">
@@ -114,7 +111,6 @@
         </div>
       </template>
     </el-dialog>
-
   </div>
 </template>
 
@@ -147,8 +143,8 @@ const initFormData: CompanyForm = {
   projectId: undefined,
   status: undefined,
   remark: undefined,
-  qualification: undefined,
-}
+  qualification: undefined
+};
 const data = reactive<PageData<CompanyForm, CompanyQuery>>({
   form: { ...initFormData },
   queryParams: {
@@ -158,13 +154,10 @@ const data = reactive<PageData<CompanyForm, CompanyQuery>>({
     projectId: undefined,
     status: undefined,
     qualification: undefined,
-    params: {
-    }
+    params: {}
   },
   rules: {
-    id: [
-      { required: true, message: "主键id不能为空", trigger: "blur" }
-    ],
+    id: [{ required: true, message: '主键id不能为空', trigger: 'blur' }]
   }
 });
 
@@ -174,58 +167,58 @@ const { queryParams, form, rules } = toRefs(data);
 const getList = async () => {
   loading.value = true;
   const res = await listCompany(queryParams.value);
-  companyList.value = res.records;
+  companyList.value = res.data.records;
   total.value = res.total;
   loading.value = false;
-}
+};
 
 /** 取消按钮 */
 const cancel = () => {
   reset();
   dialog.visible = false;
-}
+};
 
 /** 表单重置 */
 const reset = () => {
   form.value = { ...initFormData };
   companyFormRef.value?.resetFields();
-}
+};
 
 /** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.value.pageNum = 1;
   getList();
-}
+};
 
 /** 重置按钮操作 */
 const resetQuery = () => {
   queryFormRef.value?.resetFields();
   handleQuery();
-}
+};
 
 /** 多选框选中数据 */
 const handleSelectionChange = (selection: CompanyVO[]) => {
-  ids.value = selection.map(item => item.id);
+  ids.value = selection.map((item) => item.id);
   single.value = selection.length != 1;
   multiple.value = !selection.length;
-}
+};
 
 /** 新增按钮操作 */
 const handleAdd = () => {
   reset();
   dialog.visible = true;
-  dialog.title = "添加公司";
-}
+  dialog.title = '添加公司';
+};
 
 /** 修改按钮操作 */
 const handleUpdate = async (row?: CompanyVO) => {
   reset();
-  const _id = row?.id || ids.value[0]
+  const _id = row?.id || ids.value[0];
   const res = await getCompany(_id);
   Object.assign(form.value, res.data);
   dialog.visible = true;
-  dialog.title = "修改公司";
-}
+  dialog.title = '修改公司';
+};
 
 /** 提交按钮 */
 const submitForm = () => {
@@ -233,38 +226,41 @@ const submitForm = () => {
     if (valid) {
       buttonLoading.value = true;
       if (form.value.id) {
-        await updateCompany(form.value).finally(() => buttonLoading.value = false);
+        await updateCompany(form.value).finally(() => (buttonLoading.value = false));
       } else {
-        await addCompany(form.value).finally(() => buttonLoading.value = false);
+        await addCompany(form.value).finally(() => (buttonLoading.value = false));
       }
-      proxy?.$modal.msgSuccess("操作成功");
+      proxy?.$modal.msgSuccess('操作成功');
       dialog.visible = false;
       await getList();
     }
   });
-}
+};
 
 /** 删除按钮操作 */
 const handleDelete = async (row?: CompanyVO) => {
   const _ids = row?.id || ids.value;
-  await proxy?.$modal.confirm('是否确认删除公司编号为"' + _ids + '"的数据项？').finally(() => loading.value = false);
+  await proxy?.$modal.confirm('是否确认删除公司编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
   await delCompany(_ids);
-  proxy?.$modal.msgSuccess("删除成功");
+  proxy?.$modal.msgSuccess('删除成功');
   await getList();
-}
+};
 
 /** 导出按钮操作 */
 const handleExport = () => {
-  proxy?.download('materials/company/export', {
-    ...queryParams.value
-  }, `company_${new Date().getTime()}.xlsx`)
-}
+  proxy?.download(
+    'materials/company/export',
+    {
+      ...queryParams.value
+    },
+    `company_${new Date().getTime()}.xlsx`
+  );
+};
 
 onMounted(() => {
   getList();
 });
 
-
 import { useUserStoreHook } from '@/store/modules/user';
 // 获取用户 store
 const userStore = useUserStoreHook();
@@ -275,18 +271,14 @@ const currentProject = computed(() => userStore.selectedProject);
 const materialsInventoryList = computed(() => {
   // 如果有选中的项目，则只显示该项目的数据
   if (currentProject.value && currentProject.value.id) {
-    return companyList.value.filter(item =>
-      item.projectId === currentProject.value.id
-    );
+    return companyList.value.filter((item) => item.projectId === currentProject.value.id);
   }
   // 没有选中项目则显示所有数据
   return companyList.value;
 });
 // 根据 projectId 获取对应的 projectName
 const getProjectName = (projectId) => {
-  const project = projectList.value.find(p => p.id === projectId);
+  const project = projectList.value.find((p) => p.id === projectId);
   return project ? project.name : projectId; // 如果找不到对应的项目名，则显示 ID
 };
-
-
 </script>
diff --git a/plus-ui/src/views/materials/materials/index.vue b/plus-ui/src/views/materials/materials/index.vue
index 151387eb..00ba86f6 100644
--- a/plus-ui/src/views/materials/materials/index.vue
+++ b/plus-ui/src/views/materials/materials/index.vue
@@ -65,16 +65,20 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['materials:materials:add']">新增</el-button>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['materials:materials:add']"> 新增 </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['materials:materials:edit']">修改</el-button>
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['materials:materials:edit']"
+              >修改
+            </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['materials:materials:remove']">删除</el-button>
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['materials:materials:remove']"
+              >删除
+            </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['materials:materials:export']">导出</el-button>
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['materials:materials:export']">导出 </el-button>
           </el-col>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
@@ -88,10 +92,10 @@
         <!-- <el-table-column label="公司id" align="center" prop="companyId" /> -->
         <el-table-column label="公司名称" align="center" prop="companyVo.companyName" />
         <el-table-column label="项目名称" align="center" prop="">
-        <template #default="scope">
-          {{ getProjectName(scope.row.projectId) }}
-        </template>
-      </el-table-column>
+          <template #default="scope">
+            {{ getProjectName(scope.row.projectId) }}
+          </template>
+        </el-table-column>
         <el-table-column label="规格型号名称" align="center" prop="typeSpecificationName" />
         <el-table-column label="规格型号文件路径" align="center" prop="typeSpecificationUrl" />
         <el-table-column label="合格证编号名称" align="center" prop="certificateConformityName" />
@@ -106,15 +110,17 @@
         <el-table-column label="计量单位" align="center" prop="weightId" />
         <el-table-column label="备注" align="center" prop="remark" />
         <el-table-column label="预计材料数量" align="center" prop="quantityCount" />
-        <el-table-column label="状态" align="center" prop="status" >
+        <el-table-column label="状态" align="center" prop="status">
           <template #default="{ row }">
-            <span :style="{
-              color: row.status === 0 ? 'green' : 'red',
-              backgroundColor: row.status === 0 ? '#E6F9E6' : '#FDE2E2',
-              padding: '5px 10px',
-              borderRadius: '5px',
-              display: 'inline-block'
-            }">
+            <span
+              :style="{
+                color: row.status === 0 ? 'green' : 'red',
+                backgroundColor: row.status === 0 ? '#E6F9E6' : '#FDE2E2',
+                padding: '5px 10px',
+                borderRadius: '5px',
+                display: 'inline-block'
+              }"
+            >
               {{ row.status === 0 ? '正常' : '异常' }}
             </span>
           </template>
@@ -241,10 +247,10 @@ const initFormData: MaterialsForm = {
   weightId: undefined,
   remark: undefined,
   quantityCount: undefined,
-  status: undefined,
-}
+  status: undefined
+};
 const data = reactive<PageData<MaterialsForm, MaterialsQuery>>({
-  form: {...initFormData},
+  form: { ...initFormData },
   queryParams: {
     pageNum: 1,
     pageSize: 10,
@@ -266,13 +272,10 @@ const data = reactive<PageData<MaterialsForm, MaterialsQuery>>({
     weightId: undefined,
     quantityCount: undefined,
     status: undefined,
-    params: {
-    }
+    params: {}
   },
   rules: {
-    id: [
-      { required: true, message: "主键id不能为空", trigger: "blur" }
-    ],
+    id: [{ required: true, message: '主键id不能为空', trigger: 'blur' }]
   }
 });
 
@@ -282,58 +285,58 @@ const { queryParams, form, rules } = toRefs(data);
 const getList = async () => {
   loading.value = true;
   const res = await listMaterials(queryParams.value);
-  materialsList.value = res.records;
+  materialsList.value = res.data.records;
   total.value = res.total;
   loading.value = false;
-}
+};
 
 /** 取消按钮 */
 const cancel = () => {
   reset();
   dialog.visible = false;
-}
+};
 
 /** 表单重置 */
 const reset = () => {
-  form.value = {...initFormData};
+  form.value = { ...initFormData };
   materialsFormRef.value?.resetFields();
-}
+};
 
 /** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.value.pageNum = 1;
   getList();
-}
+};
 
 /** 重置按钮操作 */
 const resetQuery = () => {
   queryFormRef.value?.resetFields();
   handleQuery();
-}
+};
 
 /** 多选框选中数据 */
 const handleSelectionChange = (selection: MaterialsVO[]) => {
-  ids.value = selection.map(item => item.id);
+  ids.value = selection.map((item) => item.id);
   single.value = selection.length != 1;
   multiple.value = !selection.length;
-}
+};
 
 /** 新增按钮操作 */
 const handleAdd = () => {
   reset();
   dialog.visible = true;
-  dialog.title = "添加材料名称";
-}
+  dialog.title = '添加材料名称';
+};
 
 /** 修改按钮操作 */
 const handleUpdate = async (row?: MaterialsVO) => {
   reset();
-  const _id = row?.id || ids.value[0]
+  const _id = row?.id || ids.value[0];
   const res = await getMaterials(_id);
   Object.assign(form.value, res.data);
   dialog.visible = true;
-  dialog.title = "修改材料名称";
-}
+  dialog.title = '修改材料名称';
+};
 
 /** 提交按钮 */
 const submitForm = () => {
@@ -341,33 +344,36 @@ const submitForm = () => {
     if (valid) {
       buttonLoading.value = true;
       if (form.value.id) {
-        await updateMaterials(form.value).finally(() =>  buttonLoading.value = false);
+        await updateMaterials(form.value).finally(() => (buttonLoading.value = false));
       } else {
-        await addMaterials(form.value).finally(() =>  buttonLoading.value = false);
+        await addMaterials(form.value).finally(() => (buttonLoading.value = false));
       }
-      proxy?.$modal.msgSuccess("操作成功");
+      proxy?.$modal.msgSuccess('操作成功');
       dialog.visible = false;
       await getList();
     }
   });
-}
+};
 
 /** 删除按钮操作 */
 const handleDelete = async (row?: MaterialsVO) => {
   const _ids = row?.id || ids.value;
-  await proxy?.$modal.confirm('是否确认删除材料名称编号为"' + _ids + '"的数据项？').finally(() => loading.value = false);
+  await proxy?.$modal.confirm('是否确认删除材料名称编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
   await delMaterials(_ids);
-  proxy?.$modal.msgSuccess("删除成功");
+  proxy?.$modal.msgSuccess('删除成功');
   await getList();
-}
+};
 
 /** 导出按钮操作 */
 const handleExport = () => {
-  proxy?.download('materials/materials/export', {
-    ...queryParams.value
-  }, `materials_${new Date().getTime()}.xlsx`)
-}
-
+  proxy?.download(
+    'materials/materials/export',
+    {
+      ...queryParams.value
+    },
+    `materials_${new Date().getTime()}.xlsx`
+  );
+};
 
 import { useUserStoreHook } from '@/store/modules/user';
 // 获取用户 store
@@ -379,16 +385,14 @@ const currentProject = computed(() => userStore.selectedProject);
 const materialsInventoryList = computed(() => {
   // 如果有选中的项目，则只显示该项目的数据
   if (currentProject.value && currentProject.value.id) {
-    return materialsList.value.filter(item => 
-      item.projectId === currentProject.value.id
-    );
+    return materialsList.value.filter((item) => item.projectId === currentProject.value.id);
   }
   // 没有选中项目则显示所有数据
   return materialsList.value;
 });
 // 根据 projectId 获取对应的 projectName
 const getProjectName = (projectId) => {
-  const project = projectList.value.find(p => p.id === projectId);
+  const project = projectList.value.find((p) => p.id === projectId);
   return project ? project.name : projectId; // 如果找不到对应的项目名，则显示 ID
 };
 
diff --git a/plus-ui/src/views/materials/materialsInventory/index.vue b/plus-ui/src/views/materials/materialsInventory/index.vue
index a0c69f60..0c1b73f8 100644
--- a/plus-ui/src/views/materials/materialsInventory/index.vue
+++ b/plus-ui/src/views/materials/materialsInventory/index.vue
@@ -55,16 +55,28 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['materials:materialsInventory:add']">新增</el-button>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['materials:materialsInventory:add']">新增 </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['materials:materialsInventory:edit']">修改</el-button>
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['materials:materialsInventory:edit']"
+              >修改
+            </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['materials:materialsInventory:remove']">删除</el-button>
+            <el-button
+              type="danger"
+              plain
+              icon="Delete"
+              :disabled="multiple"
+              @click="handleDelete()"
+              v-hasPermi="['materials:materialsInventory:remove']"
+              >删除
+            </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['materials:materialsInventory:export']">导出</el-button>
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['materials:materialsInventory:export']"
+              >导出
+            </el-button>
           </el-col>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
@@ -77,10 +89,10 @@
         <!-- <el-table-column label="材料id" align="center" prop="materialsId" /> -->
         <el-table-column label="材料名称" align="center" prop="materialsVo.materialsName" />
         <el-table-column label="项目名称" align="center">
-        <template #default="scope">
-          {{ getProjectName(scope.row.projectId) }}
-        </template>
-      </el-table-column>
+          <template #default="scope">
+            {{ getProjectName(scope.row.projectId) }}
+          </template>
+        </el-table-column>
         <el-table-column label="出入库状态" align="center" prop="outPut" />
         <el-table-column label="出/入库的数量" align="center" prop="number" />
         <el-table-column label="出/入库操作时间" align="center" prop="outPutTime" width="180">
@@ -98,10 +110,22 @@
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['materials:materialsInventory:edit']"></el-button>
+              <el-button
+                link
+                type="primary"
+                icon="Edit"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['materials:materialsInventory:edit']"
+              ></el-button>
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['materials:materialsInventory:remove']"></el-button>
+              <el-button
+                link
+                type="primary"
+                icon="Delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['materials:materialsInventory:remove']"
+              ></el-button>
             </el-tooltip>
           </template>
         </el-table-column>
@@ -125,11 +149,7 @@
           <el-input v-model="form.number" placeholder="请输入出/入库的数量" />
         </el-form-item>
         <el-form-item label="出/入库操作时间" prop="outPutTime">
-          <el-date-picker clearable
-            v-model="form.outPutTime"
-            type="datetime"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="请选择出/入库操作时间">
+          <el-date-picker clearable v-model="form.outPutTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择出/入库操作时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="剩余库存数量" prop="residue">
@@ -139,7 +159,7 @@
           <el-input v-model="form.operator" placeholder="请输入操作人" />
         </el-form-item>
         <el-form-item label="材料出入证明" prop="path">
-            <el-input v-model="form.path" type="textarea" placeholder="请输入内容" />
+          <el-input v-model="form.path" type="textarea" placeholder="请输入内容" />
         </el-form-item>
         <el-form-item label="处理方式" prop="disposition">
           <el-input v-model="form.disposition" placeholder="请输入处理方式" />
@@ -165,7 +185,13 @@
 </template>
 
 <script setup name="MaterialsInventory" lang="ts">
-import { listMaterialsInventory, getMaterialsInventory, delMaterialsInventory, addMaterialsInventory, updateMaterialsInventory } from '@/api/materials/materialsInventory';
+import {
+  listMaterialsInventory,
+  getMaterialsInventory,
+  delMaterialsInventory,
+  addMaterialsInventory,
+  updateMaterialsInventory
+} from '@/api/materials/materialsInventory';
 import { MaterialsInventoryVO, MaterialsInventoryQuery, MaterialsInventoryForm } from '@/api/materials/materialsInventory/types';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -204,11 +230,11 @@ const initFormData: MaterialsInventoryForm = {
   materialsVo: {
     id: undefined,
     materialsName: undefined,
-    materialsCode: undefined, 
+    materialsCode: undefined
   }
-}
+};
 const data = reactive<PageData<MaterialsInventoryForm, MaterialsInventoryQuery>>({
-  form: {...initFormData},
+  form: { ...initFormData },
   queryParams: {
     pageNum: 1,
     pageSize: 10,
@@ -223,21 +249,16 @@ const data = reactive<PageData<MaterialsInventoryForm, MaterialsInventoryQuery>>
     disposition: undefined,
     recipient: undefined,
     shipper: undefined,
-    params: {
-    },
+    params: {},
     materialsVo: {
-    id: undefined,
-    materialsName: undefined,
-    materialsCode: undefined, 
-  }
+      id: undefined,
+      materialsName: undefined,
+      materialsCode: undefined
+    }
   },
   rules: {
-    id: [
-      { required: true, message: "主键id不能为空", trigger: "blur" }
-    ],
-    materialsId: [
-      { required: true, message: "材料id不能为空", trigger: "blur" }
-    ],
+    id: [{ required: true, message: '主键id不能为空', trigger: 'blur' }],
+    materialsId: [{ required: true, message: '材料id不能为空', trigger: 'blur' }]
   }
 });
 
@@ -247,58 +268,58 @@ const { queryParams, form, rules } = toRefs(data);
 const getList = async () => {
   loading.value = true;
   const res = await listMaterialsInventory(queryParams.value);
-  materialsInventoryList.value = res.records;
-  total.value = res.total;  
+  materialsInventoryList.value = res.data.records;
+  total.value = res.total;
   loading.value = false;
-}
+};
 
 /** 取消按钮 */
 const cancel = () => {
   reset();
   dialog.visible = false;
-}
+};
 
 /** 表单重置 */
 const reset = () => {
-  form.value = {...initFormData};
+  form.value = { ...initFormData };
   materialsInventoryFormRef.value?.resetFields();
-}
+};
 
 /** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.value.pageNum = 1;
   getList();
-}
+};
 
 /** 重置按钮操作 */
 const resetQuery = () => {
   queryFormRef.value?.resetFields();
   handleQuery();
-}
+};
 
 /** 多选框选中数据 */
 const handleSelectionChange = (selection: MaterialsInventoryVO[]) => {
-  ids.value = selection.map(item => item.id);
+  ids.value = selection.map((item) => item.id);
   single.value = selection.length != 1;
   multiple.value = !selection.length;
-}
+};
 
 /** 新增按钮操作 */
 const handleAdd = () => {
   reset();
   dialog.visible = true;
-  dialog.title = "添加材料出/入库";
-}
+  dialog.title = '添加材料出/入库';
+};
 
 /** 修改按钮操作 */
 const handleUpdate = async (row?: MaterialsInventoryVO) => {
   reset();
-  const _id = row?.id || ids.value[0]
+  const _id = row?.id || ids.value[0];
   const res = await getMaterialsInventory(_id);
   Object.assign(form.value, res.data);
   dialog.visible = true;
-  dialog.title = "修改材料出/入库";
-}
+  dialog.title = '修改材料出/入库';
+};
 
 /** 提交按钮 */
 const submitForm = () => {
@@ -306,33 +327,36 @@ const submitForm = () => {
     if (valid) {
       buttonLoading.value = true;
       if (form.value.id) {
-        await updateMaterialsInventory(form.value).finally(() =>  buttonLoading.value = false);
+        await updateMaterialsInventory(form.value).finally(() => (buttonLoading.value = false));
       } else {
-        await addMaterialsInventory(form.value).finally(() =>  buttonLoading.value = false);
+        await addMaterialsInventory(form.value).finally(() => (buttonLoading.value = false));
       }
-      proxy?.$modal.msgSuccess("操作成功");
+      proxy?.$modal.msgSuccess('操作成功');
       dialog.visible = false;
       await getList();
     }
   });
-}
+};
 
 /** 删除按钮操作 */
 const handleDelete = async (row?: MaterialsInventoryVO) => {
   const _ids = row?.id || ids.value;
-  await proxy?.$modal.confirm('是否确认删除材料出/入库编号为"' + _ids + '"的数据项？').finally(() => loading.value = false);
+  await proxy?.$modal.confirm('是否确认删除材料出/入库编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
   await delMaterialsInventory(_ids);
-  proxy?.$modal.msgSuccess("删除成功");
+  proxy?.$modal.msgSuccess('删除成功');
   await getList();
-}
+};
 
 /** 导出按钮操作 */
 const handleExport = () => {
-  proxy?.download('materials/materialsInventory/export', {
-    ...queryParams.value
-  }, `materialsInventory_${new Date().getTime()}.xlsx`)
-}
-
+  proxy?.download(
+    'materials/materialsInventory/export',
+    {
+      ...queryParams.value
+    },
+    `materialsInventory_${new Date().getTime()}.xlsx`
+  );
+};
 
 import { useUserStoreHook } from '@/store/modules/user';
 // 获取用户 store
@@ -344,16 +368,14 @@ const currentProject = computed(() => userStore.selectedProject);
 const materialsInventoryListNew = computed(() => {
   // 如果有选中的项目，则只显示该项目的数据
   if (currentProject.value && currentProject.value.id) {
-    return materialsInventoryList.value.filter(item => 
-      item.projectId === currentProject.value.id
-    );
+    return materialsInventoryList.value.filter((item) => item.projectId === currentProject.value.id);
   }
   // 没有选中项目则显示所有数据
   return materialsInventoryList.value;
 });
 // 根据 projectId 获取对应的 projectName
 const getProjectName = (projectId) => {
-  const project = projectList.value.find(p => p.id === projectId);
+  const project = projectList.value.find((p) => p.id === projectId);
   return project ? project.name : projectId; // 如果找不到对应的项目名，则显示 ID
 };
 onMounted(() => {
diff --git a/plus-ui/src/views/personnelManagement/project/project/index.vue b/plus-ui/src/views/personnelManagement/project/project/index.vue
index aa1704e7..d948471f 100644
--- a/plus-ui/src/views/personnelManagement/project/project/index.vue
+++ b/plus-ui/src/views/personnelManagement/project/project/index.vue
@@ -68,20 +68,20 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['project:project:add']">新增</el-button>
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['project:project:add']">新增 </el-button>
           </el-col>
           <el-col :span="1.5">
             <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['project:project:edit']"
-              >修改</el-button
-            >
+              >修改
+            </el-button>
           </el-col>
           <el-col :span="1.5">
             <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['project:project:remove']"
-              >删除</el-button
-            >
+              >删除
+            </el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['project:project:export']">导出</el-button>
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['project:project:export']">导出 </el-button>
           </el-col>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
@@ -288,7 +288,7 @@ const { queryParams, form, rules } = toRefs(data);
 const getList = async () => {
   loading.value = true;
   const res = await listProject(queryParams.value);
-  projectList.value = res.records;
+  projectList.value = res.data.records;
   total.value = res.total;
   loading.value = false;
 };
@@ -327,7 +327,6 @@ const handleAdd = () => {
   reset();
   dialog.visible = true;
   dialog.title = '添加项目';
-
 };
 
 /** 修改按钮操作 */