From 73e6245496724ea4b4567f17bf849e7697a7128d Mon Sep 17 00:00:00 2001
From: zxy <zhouxy1921@11.com>
Date: Tue, 13 Jan 2026 16:31:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96=EF=BC=9A?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=8D=95=E4=BA=BA=E5=91=98=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=EF=BC=8C=E4=BE=9B=E5=BA=94=E5=95=86=E9=80=89=E6=8B=A9=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E5=A6=82=E6=9E=9C=E5=A4=8D=E9=80=89=E6=A1=86=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E9=80=89=E6=8B=A9=EF=BC=8C=E8=87=AA=E5=8A=A8=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/heli/enums/ErrorCodeConstants.java |   1 +
 .../taskreport/TaskReportController.java      |  10 +
 .../admin/taskreport/vo/TaskReportRespVO.java |   4 +
 .../dataobject/taskreport/TaskReportDO.java   |   3 +
 .../StorageInventoryMapper.java               |   3 +-
 .../mysql/taskreport/TaskReportMapper.java    |   1 +
 .../service/taskreport/TaskReportService.java |   6 +
 .../taskreport/TaskReportServiceImpl.java     |  21 +-
 .../src/api/heli/taskreport/index.ts          |   5 +
 .../src/views/heli/fpuserdetail/edit.vue      | 290 +++++++++-----
 .../src/views/heli/orderys/index.vue          |   2 +-
 .../src/views/heli/partpurchase/index.vue     | 379 +++++++++---------
 .../views/heli/storagelog/StorageLogForm.vue  |  14 +-
 .../src/views/heli/taskreport/index.vue       |  31 +-
 .../src/views/heli/taskreport/reworkForm.vue  |  80 ++++
 15 files changed, 548 insertions(+), 302 deletions(-)
 create mode 100644 mes-ui/mes-ui-admin-vue3/src/views/heli/taskreport/reworkForm.vue

diff --git a/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/ErrorCodeConstants.java b/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/ErrorCodeConstants.java
index d0c79bad..9658ac59 100644
--- a/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/ErrorCodeConstants.java
+++ b/mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/ErrorCodeConstants.java
@@ -128,6 +128,7 @@ public interface ErrorCodeConstants {
     ErrorCode TASK_DISPATCH_TASK_IS_OVER = new ErrorCode(1_009_007, "报工数量已完成");
     ErrorCode TASK_DISPATCH_TASK_REPORT_AMOUNT_EXCESS = new ErrorCode(1_009_006, "无法超额报工");
     ErrorCode TASK_REPORT_OTHER_PERSON_NO_SUBMIT = new ErrorCode(1_009_020, "其他人员尚未报工，无法结束生产");
+    ErrorCode THE_REPORT_APPLICATION_NOT_ENDED = new ErrorCode(1_009_021, "该报工没有结束，请刷新界面");
   //1_009_021已被使用
     /*************质量管理***********/
     ErrorCode UNQUALIFIED_NOTIFICATION_NOT_EXISTS = new ErrorCode(1_010_001, "品质异常通知单审核不存在");
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/taskreport/TaskReportController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/taskreport/TaskReportController.java
index 33ea9fa5..93f07e41 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/taskreport/TaskReportController.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/taskreport/TaskReportController.java
@@ -6,6 +6,7 @@ import com.chanko.yunxi.mes.framework.common.pojo.PageResult;
 import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils;
 import com.chanko.yunxi.mes.framework.excel.core.util.ExcelUtils;
 import com.chanko.yunxi.mes.framework.operatelog.core.annotations.OperateLog;
+import com.chanko.yunxi.mes.module.heli.controller.admin.taskinreport.vo.TaskReworkReqVO;
 import com.chanko.yunxi.mes.module.heli.controller.admin.taskreport.vo.TaskReportPageReqVO;
 import com.chanko.yunxi.mes.module.heli.controller.admin.taskreport.vo.TaskReportRespVO;
 import com.chanko.yunxi.mes.module.heli.controller.admin.taskreport.vo.TaskReportSaveReqVO;
@@ -52,6 +53,15 @@ public class TaskReportController {
         return taskReportService.updateTaskReport(updateReqVO);
     }
 
+    @PostMapping("/rework")
+    @Operation(summary = "返工")
+    @PreAuthorize("@ss.hasPermission('heli:task-in-report:update')")
+    public CommonResult<Boolean> rework(@Valid @RequestBody TaskReworkReqVO reworkReqVO) {
+        taskReportService.rework(reworkReqVO.getId(), reworkReqVO.getRemark());
+        return success(true);
+    }
+
+
     @DeleteMapping("/delete")
     @Operation(summary = "删除任务报工")
     @Parameter(name = "id", description = "编号", required = true)
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/taskreport/vo/TaskReportRespVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/taskreport/vo/TaskReportRespVO.java
index 7c5789c9..e1ddfc40 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/taskreport/vo/TaskReportRespVO.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/taskreport/vo/TaskReportRespVO.java
@@ -106,4 +106,8 @@ public class TaskReportRespVO {
     @Schema(description = "单位")
     private String unit;
 
+    @Schema(description = "报工状态")
+    private String reportProcess;
+
+
 }
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/taskreport/TaskReportDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/taskreport/TaskReportDO.java
index d586aeae..474574ed 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/taskreport/TaskReportDO.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/taskreport/TaskReportDO.java
@@ -103,4 +103,7 @@ public class TaskReportDO extends BaseDO {
 
     @TableField(exist = false)
     private String unit;
+
+    @TableField(exist = false)
+    private String reportProcess;
 }
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storageinventory/StorageInventoryMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storageinventory/StorageInventoryMapper.java
index 040887fe..8257540b 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storageinventory/StorageInventoryMapper.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/storageinventory/StorageInventoryMapper.java
@@ -241,7 +241,8 @@ public interface StorageInventoryMapper extends BaseMapperX<StorageInventoryDO>
        query.like(!com.alibaba.druid.util.StringUtils.isEmpty(pageReqVO.getMatSpec()),MaterialDO::getSpec, pageReqVO.getMatSpec())
                .like(!com.alibaba.druid.util.StringUtils.isEmpty(pageReqVO.getMatName()), MaterialDO::getName, pageReqVO.getMatName())
                .like(!com.alibaba.druid.util.StringUtils.isEmpty(pageReqVO.getMatCode()), MaterialDO::getCode, pageReqVO.getMatCode())
-               .like(!com.alibaba.druid.util.StringUtils.isEmpty(pageReqVO.getShortName()), MaterialDO::getShortName, pageReqVO.getShortName())
+               .like(!com.alibaba.druid.util.StringUtils.isEmpty(pageReqVO.getShortName()), StorageInventoryDO::getShortName, pageReqVO.getShortName())
+               .like(!com.alibaba.druid.util.StringUtils.isEmpty(pageReqVO.getBoomSpec()), StorageInventoryDO::getBoomSpec, pageReqVO.getBoomSpec())
                .eq(ObjectUtil.isNotEmpty(pageReqVO.getMatType()),MaterialDO::getMaterialType, pageReqVO.getMatType())
                .eq(ObjectUtil.isNotEmpty(pageReqVO.getLotNo()),StorageInventoryDO::getLotNo, pageReqVO.getLotNo())
                .eq(true,MaterialDO::getVirtualPart, YesOrNoEnum.N.name())
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskreport/TaskReportMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskreport/TaskReportMapper.java
index bcba0cfe..64b7ea30 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskreport/TaskReportMapper.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/taskreport/TaskReportMapper.java
@@ -38,6 +38,7 @@ public interface TaskReportMapper extends BaseMapperX<TaskReportDO> {
         query.selectAll(TaskReportDO.class)
                 .select("d.code as projectCode", "d.project_name as projectName", "c.name as projectSubName")
                 .select("z.code as dispatchCode")
+                .select("x.report_process as reportProcess")
                 .select("f.material_name as materialName", "f.spec", "f.unit")
                 .select("y.name as procedureName")
                 .select("u1.nickname as ownerName", "u2.nickname as updaterName")
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskreport/TaskReportService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskreport/TaskReportService.java
index 84fc08d3..1ab20c0f 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskreport/TaskReportService.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskreport/TaskReportService.java
@@ -54,4 +54,10 @@ public interface TaskReportService {
      */
     PageResult<TaskReportDO> getTaskReportPage(TaskReportPageReqVO pageReqVO);
 
+    /**
+     * 返工
+     * @param id
+     * @param remark
+     */
+    void rework(Long id, String remark);
 }
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskreport/TaskReportServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskreport/TaskReportServiceImpl.java
index cafaf467..15797a25 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskreport/TaskReportServiceImpl.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/taskreport/TaskReportServiceImpl.java
@@ -15,6 +15,8 @@ import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils;
 
 import com.chanko.yunxi.mes.module.heli.dal.mysql.taskreport.TaskReportMapper;
 
+import java.util.List;
+
 import static com.chanko.yunxi.mes.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.chanko.yunxi.mes.module.heli.enums.ErrorCodeConstants.*;
 
@@ -86,6 +88,21 @@ public class TaskReportServiceImpl implements TaskReportService {
         return taskReportMapper.selectPage(pageReqVO);
     }
 
-
-
+    @Override
+    public void rework(Long id, String remark) {
+        TaskReportDO taskReportDO = taskReportMapper.selectById(id);
+        if (taskReportDO == null) {
+            throw exception(TASK_REPORT_NOT_EXISTS);
+        }
+        TaskDispatchDetailDO taskDispatchDetailDO = taskDispatchDetailMapper.selectById(taskReportDO.getDispatchDetailId());
+        if (taskDispatchDetailDO != null) {
+            if (taskDispatchDetailDO.getReportProcess() != 2) {
+                throw exception(THE_REPORT_APPLICATION_NOT_ENDED);
+            } else {
+                taskDispatchDetailDO.setReportProcess(1);
+                taskDispatchDetailDO.setReturnRemark(remark);
+                taskDispatchDetailMapper.updateById(taskDispatchDetailDO);
+            }
+        }
+    }
 }
diff --git a/mes-ui/mes-ui-admin-vue3/src/api/heli/taskreport/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/heli/taskreport/index.ts
index 8ba9340a..8c35872d 100644
--- a/mes-ui/mes-ui-admin-vue3/src/api/heli/taskreport/index.ts
+++ b/mes-ui/mes-ui-admin-vue3/src/api/heli/taskreport/index.ts
@@ -33,6 +33,11 @@ export const updateTaskReport = async (data: TaskReportVO) => {
   return await request.put({ url: `/heli/task-report/update`, data })
 }
 
+// 返工
+export const rework = async (data: TaskReportVO) => {
+  return await request.post({url: `/heli/task-report/rework`, data})
+}
+
 // 删除任务报工
 export const deleteTaskReport = async (id: number) => {
   return await request.delete({ url: `/heli/task-report/delete?id=` + id })
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/fpuserdetail/edit.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/fpuserdetail/edit.vue
index 9c8c133b..06976508 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/fpuserdetail/edit.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/fpuserdetail/edit.vue
@@ -1,118 +1,139 @@
 <template>
-<!--  <Dialog :title="dialogTitle" v-model="dialogVisible">-->
+  <!--  <Dialog :title="dialogTitle" v-model="dialogVisible">-->
 
-      <el-card class="hl-card" style="position: relative">
+  <el-card class="hl-card" style="position: relative">
+    <template #header>
+      <span>编辑页</span>
+    </template>
+    <el-form ref="formRef" :model="formData" :rules="formRules" label-width="160px" v-loading="formLoading">
+      <!--  基础信息   -->
+      <el-card class="hl-card-info">
         <template #header>
-          <span>编辑页</span>
+          <div class="hl-card-info-icona"></div><span class="hl-card-info-text">任务单类型</span>
         </template>
-        <el-form ref="formRef" :model="formData" :rules="formRules" label-width="160px" v-loading="formLoading">
-          <!--  基础信息   -->
-          <el-card class="hl-card-info">
-            <template #header>
-              <div class="hl-card-info-icona"></div><span class="hl-card-info-text">任务单类型</span>
-            </template>
-          </el-card>
+      </el-card>
+      <el-row>
+        <el-col :span="24">
           <el-row>
-            <el-col :span="24">
+            <el-col :span="8">
               <el-row>
-                <el-col :span="8">
-                  <el-row>
-                    <el-col :span="24">
-                      <el-form-item label="业务类型" prop="type">
-                        <el-select v-model="formData.type" placeholder="请选择业务类型" :disabled="true">
-                          <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id" />
-                        </el-select>
-                      </el-form-item>
-                    </el-col>
-                  </el-row>
-                </el-col>
-                <el-col :span="8">
-                  <el-row>
-                    <el-col :span="24">
-                      <el-form-item label="岗位" prop="postId">
-                        <el-select v-model="formData.postId" placeholder="请选择岗位">
-                          <el-option v-for="dict in getStrDictOptions(DICT_TYPE.HELI_POST)" :key="dict.value" :label="dict.label" :value="dict.value" />
-                        </el-select>
-                      </el-form-item>
-                    </el-col>
-                  </el-row>
-                </el-col>
-                <el-col :span="8">
-                  <el-row>
-                    <el-col :span="24">
-                      <el-form-item label="备注" prop="remark">
-                        <el-input v-model="formData.remark" placeholder="请输入备注" />
-                      </el-form-item>
-                    </el-col>
-                  </el-row>
+                <el-col :span="24">
+                  <el-form-item label="业务类型" prop="type">
+                    <el-select v-model="formData.type" placeholder="请选择业务类型" :disabled="true">
+                      <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id" />
+                    </el-select>
+                  </el-form-item>
                 </el-col>
               </el-row>
             </el-col>
-                <el-card class="hl-card-info">
-                  <template #header>
-                    <div class="hl-card-info-icona"></div><span class="hl-card-info-text">人员信息</span>
-                  </template>
-                  <el-row>
-                    <el-col>
-                      <el-card class="hl-incard">
-                        <el-col>
-                          <el-button  type="primary" size="large" @click="userAddItem">新增</el-button>
-                        </el-col>
-                        <el-form ref="subFormRef" :model="formData.userList"   label-width="0">
-                          <el-table :data="formData.userList" class="hl-table">
-                            <el-table-column type="index" label="序号" align="center" min-width="60" fixed />
-                            <el-table-column prop="description" min-width="200" label="业务人员" align="center">
-                              <template #default="scope">
-                                <el-select   v-model="scope.row.busyId"  filterable element-loading-background="rgb(255, 255, 255)" placeholder="请选择" >
-                                  <el-option v-for="item in userSelectList" :key="item.id" :label="item.username + ' ' + item.nickname" :value="item.id" />
-                                </el-select>
-                              </template>
-                            </el-table-column>
-                            <el-table-column prop="postId" min-width="120" label="岗位" align="center">
-                              <template #default="scope">
-                                <el-select   v-model="scope.row.postId"   element-loading-background="rgb(255, 255, 255)" placeholder="请选择" >
-                                  <el-option v-for="dict in getStrDictOptions(DICT_TYPE.HELI_POST)" :key="dict.value" :label="dict.label" :value="dict.value" />
-                                </el-select>
-                              </template>
-                            </el-table-column>
-                            <el-table-column prop="procedureId" min-width="600" label="工序" align="center" >
-                              <template #default="scope">
-                                <el-select v-model="scope.row.procCd" multiple clearable element-loading-background="rgb(255, 255, 255)" filterable placeholder="请选择"   style="width: 100%;">
-                                  <el-option
-                                    v-for="dict in procedureList" :key="dict.id"
-                                    :label="dict.name" :value="dict.id" />
-                                </el-select>
-                              </template>
-                            </el-table-column>
-                            <el-table-column prop="description" min-width="200" label="是否是负责人" align="center">
-                              <template #default="scope">
-                                <el-select   v-model="scope.row.isRes"  element-loading-background="rgb(255, 255, 255)" placeholder="请选择" >
-                                  <el-option v-for="item in isResList" :key="item.id" :label="item.name" :value="item.id" />
-                                </el-select>
-                              </template>
-                            </el-table-column>
-                            <el-table-column label="操作" align="center" width="120" fixed="right">
-                              <template #default="scope">
-                                <el-button link type="danger" size="small" @click.prevent="handleDeleteUser(scope.$index)">
-                                  删除
-                                </el-button>
-                              </template>
-                            </el-table-column>
-                          </el-table>
-                        </el-form>
-                      </el-card>
-                    </el-col>
-                  </el-row>
-                </el-card>
+            <el-col :span="8">
+              <el-row>
+                <el-col :span="24">
+                  <el-form-item label="岗位" prop="postId">
+                    <el-select v-model="formData.postId" placeholder="请选择岗位">
+                      <el-option v-for="dict in getStrDictOptions(DICT_TYPE.HELI_POST)" :key="dict.value" :label="dict.label" :value="dict.value" />
+                    </el-select>
+                  </el-form-item>
+                </el-col>
               </el-row>
-          <div class="hl-footer text-center">
-            <el-button @click="submitForm" type="primary" size="large">保
-              存</el-button>
-            <el-button @click="closeForm" size="large">取 消</el-button>
-          </div>
-        </el-form>
-     </el-card>
-<!--  </Dialog>-->
+            </el-col>
+            <el-col :span="8">
+              <el-row>
+                <el-col :span="24">
+                  <el-form-item label="备注" prop="remark">
+                    <el-input v-model="formData.remark" placeholder="请输入备注" />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+            </el-col>
+          </el-row>
+        </el-col>
+        <el-card class="hl-card-info">
+          <template #header>
+            <div class="hl-card-info-icona"></div><span class="hl-card-info-text">人员信息</span>
+          </template>
+          <el-row>
+            <el-col>
+              <el-card class="hl-incard">
+                <el-col>
+                  <el-button  type="primary" size="large" @click="userAddItem">新增</el-button>
+                </el-col>
+                <el-form ref="subFormRef" :model="formData.userList" label-width="0">
+                  <el-table :data="formData.userList" class="hl-table">
+                    <el-table-column type="index" label="序号" align="center" min-width="60" fixed />
+                    <el-table-column prop="description" min-width="200" label="业务人员" align="center">
+                      <template #default="scope">
+                        <el-select
+                          v-model="scope.row.busyId"
+                          filterable
+                          element-loading-background="rgb(255, 255, 255)"
+                          placeholder="请选择"
+                          @change="(val) => handleUserSelection(val, scope.row, scope.$index)">
+                          <el-option
+                            v-for="item in userSelectList"
+                            :key="item.id"
+                            :label="item.username + ' ' + item.nickname"
+                            :value="item.id"
+                            :disabled="isUserSelected(item.id)"
+                          />
+                        </el-select>
+                      </template>
+                    </el-table-column>
+                    <el-table-column prop="postId" min-width="120" label="岗位" align="center">
+                      <template #default="scope">
+                        <el-select
+                          v-model="scope.row.postId"
+                          element-loading-background="rgb(255, 255, 255)"
+                          placeholder="请选择"
+                          @change="(val) => handlePostSelection(val, scope.row, scope.$index)">
+                          <el-option
+                            v-for="dict in getStrDictOptions(DICT_TYPE.HELI_POST)"
+                            :key="dict.value"
+                            :label="dict.label"
+                            :value="dict.value"
+                          />
+                        </el-select>
+                      </template>
+                    </el-table-column>
+
+                    <el-table-column prop="procedureId" min-width="600" label="工序" align="center" >
+                      <template #default="scope">
+                        <el-select v-model="scope.row.procCd" multiple clearable element-loading-background="rgb(255, 255, 255)" filterable placeholder="请选择"   style="width: 100%;">
+                          <el-option
+                            v-for="dict in procedureList" :key="dict.id"
+                            :label="dict.name" :value="dict.id" />
+                        </el-select>
+                      </template>
+                    </el-table-column>
+                    <el-table-column prop="description" min-width="200" label="是否是负责人" align="center">
+                      <template #default="scope">
+                        <el-select   v-model="scope.row.isRes"  element-loading-background="rgb(255, 255, 255)" placeholder="请选择" >
+                          <el-option v-for="item in isResList" :key="item.id" :label="item.name" :value="item.id" />
+                        </el-select>
+                      </template>
+                    </el-table-column>
+                    <el-table-column label="操作" align="center" width="120" fixed="right">
+                      <template #default="scope">
+                        <el-button link type="danger" size="small" @click.prevent="handleDeleteUser(scope.$index)">
+                          删除
+                        </el-button>
+                      </template>
+                    </el-table-column>
+                  </el-table>
+                </el-form>
+              </el-card>
+            </el-col>
+          </el-row>
+        </el-card>
+      </el-row>
+      <div class="hl-footer text-center">
+        <el-button @click="submitForm" type="primary" size="large">保
+          存</el-button>
+        <el-button @click="closeForm" size="large">取 消</el-button>
+      </div>
+    </el-form>
+  </el-card>
+  <!--  </Dialog>-->
 </template>
 <script setup lang="ts">
 import * as FpUserDetailApi from '@/api/heli/fpuserdetail'
@@ -143,8 +164,6 @@ const formData = ref({
   remark: undefined,
   userList: [],
 })
-const formRules = reactive({
-})
 const queryParams = {
   pageNo: 1,
   pageSize: 99,
@@ -210,6 +229,59 @@ const closeForm = async () => {
   router.push({ path: '/base/fpuserdetail' })
   tagsViewStore.delVisitedView(router.currentRoute.value)
 }
+
+// 处理用户选择变更
+const handleUserSelection = (userId: number, currentRow: any, currentIndex: number) => {
+  if (!userId) return // 如果清空选择，则无需验证
+
+  // 检查同一用户是否已在相同岗位被选择
+  const duplicateIndex = formData.value.userList.findIndex(
+    (user, index) =>
+      user.busyId === userId &&
+      user.postId === currentRow.postId &&
+      index !== currentIndex
+  )
+
+  if (duplicateIndex !== -1) {
+    message.error("该用户已在相同岗位被选择，请选择其他用户或岗位")
+    currentRow.busyId = '' // 恢复选择
+    return
+  }
+}
+
+
+// 处理岗位选择变更
+const handlePostSelection = (postId: number, currentRow: any, currentIndex: number) => {
+  if (!postId || !currentRow.busyId) return // 如果没有选择岗位或用户，则无需验证
+
+  // 检查同一用户是否已在相同岗位被选择
+  const duplicateIndex = formData.value.userList.findIndex(
+    (user, index) =>
+      user.busyId === currentRow.busyId &&
+      user.postId === postId &&
+      index !== currentIndex
+  )
+
+  if (duplicateIndex !== -1) {
+    message.error("该用户已在相同岗位被选择，请选择其他岗位或用户")
+    currentRow.postId = '' // 恢复选择
+    return
+  }
+}
+
+
+
+// 检查用户是否已在其他岗位被选择
+// 检查用户在特定岗位是否已被选择
+const isUserSelected = (userId: number, currentPostId: number | null = null) => {
+  // 检查当前用户是否在相同岗位下已被选择
+  return formData.value.userList.some(
+    user => user.busyId === userId && user.postId === currentPostId
+  )
+}
+
+
+
 /** 提交表单 */
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 const submitForm = async () => {
@@ -229,8 +301,8 @@ const submitForm = async () => {
   try {
     // const data =  FpUserDetailApi.createFpUserDetail(formData.value)
     // if (formType.value === 'create') {
-      await FpUserDetailApi.createFpUserDetail(formData.value)
-      message.success(t('common.createSuccess'))
+    await FpUserDetailApi.createFpUserDetail(formData.value)
+    message.success(t('common.createSuccess'))
     // } else {
     //   await FpUserDetailApi.updateFpUserDetail(data)
     //   message.success(t('common.updateSuccess'))
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/orderys/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/orderys/index.vue
index 99d27eea..736c4c92 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/orderys/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/orderys/index.vue
@@ -281,7 +281,7 @@ const handleDelete = async (id: number) => {
   } catch {}
 }
 const getSummaries = (param: SummaryMethodProps) => {
-  const summaryField = ["cgYishou","remainingYishou","amount","remainingAmount"];
+  const summaryField = ["cgYs","cgYishou","remainingYishou","amount","remainingAmount"];
   const { columns, data } = param;
   const sums = [];
   columns.forEach((column, index) => {
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchase/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchase/index.vue
index 6984573c..71844391 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchase/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchase/index.vue
@@ -82,168 +82,168 @@
       <el-row>
         <el-col>
           <el-card class="hl-incard">
-            <el-form  ref="multipleTable" :model="list"  v-loading="formLoading" label-width="0" >
-              <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true"  class="hl-table" @selection-change="handleSelectionChange" show-summary :summary-method="getSummaries" :row-class-name="tableRowClassName">
-                <el-table-column type="selection" width="70" />
-                <el-table-column fixed label="序号" align="center" type="index" width="60" />
+            <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true"
+                      ref="multipleTable"  class="hl-table" @selection-change="handleSelectionChange"
+                      show-summary :summary-method="getSummaries" :row-class-name="tableRowClassName">
+              <el-table-column type="selection" width="70" />
+              <el-table-column fixed label="序号" align="center" type="index" width="60" />
 
-<!--                <el-table-column label="客户简称" align="center" prop="brief" min-width="180" fixed />-->
-                <el-table-column label="项目名称" align="center" prop="projectName" min-width="180" fixed />
-                <el-table-column label="子项目名称" align="center" prop="projectSubName" min-width="180" />
-                <el-table-column label="图号" align="center" prop="blueprintNo" min-width="120" />
-                <!--                <el-table-column label="泡沫" align="center"  prop="isFoams">-->
-<!--                  <template #default="{ row }">-->
-<!--                    <el-checkbox v-model="row.isFoams" @change="handleOutsourcingChange(row)"  disabled/>-->
-<!--                  </template>-->
-<!--                </el-table-column>-->
-<!--                <el-table-column min-width="200px" align="center" >-->
-<!--                  <template #header><span class="hl-table_header">*</span>泡沫费用</template>-->
-<!--                  <template #default="{ row, $index }">-->
-<!--                    <el-form-item :prop="`${$index}.foamPrice`" class="mb-0px!" v-if="row.isFoams == 'Y'||row.isFoams==true">-->
-<!--                      <el-input-number v-model="row.foamPrice" type="number" :precision="0" />-->
-<!--                    </el-form-item>-->
-<!--                  </template>-->
-<!--                </el-table-column>-->
-                <el-table-column label="零件名称" align="center" prop="matName" min-width="180" />
-                <el-table-column label="工序" align="center" prop="procedureName" min-width="100" >
-                  <template #default="scope">
-                    <el-button text type="primary">
-                      {{ scope.row.procedureName }}
-                    </el-button>
-                  </template>
-                </el-table-column>
-                <el-table-column label="材质" align="center" prop="compositionName" min-width="120" />
-                <el-table-column min-width="200px" align="center" >
-                  <template #header>规格</template>
-                  <template #default="{ row, $index }">
-                    <el-form-item :prop="`${$index}.boomSpec`" class="mb-0px!" >
-                      <el-input class="!w-265px" v-model="row.boomSpec" placeholder="规格"  />
-                    </el-form-item>
-                  </template>
-                </el-table-column>
-                <el-table-column label="需求数量" align="center" prop="boomAmount" min-width="120" />
-                <el-table-column label="单位" align="center" prop="unit" min-width="120">
-                  <template #default="scope">
-                    <dict-tag :type="DICT_TYPE.HELI_MATERIAL_UNIT" :value="scope.row.unit" />
-                  </template>
-                </el-table-column>
-                <el-table-column min-width="200px" align="center" prop="purchaseAmounts">
-                  <template #header><span class="hl-table_header">*</span>采购数量</template>
-                  <template #default="{ row, $index }">
-                    <el-form-item :prop="`${$index}.purchaseAmounts`" class="mb-0px!" >
-                      <el-input-number v-model="row.purchaseAmounts" type="number" :precision="0" />
-                    </el-form-item>
-                  </template>
-                </el-table-column>
-                <el-table-column  align="center" prop="supplierIds" min-width="180" >
-                  <template #header><span class="hl-table_header">*</span>供应商</template>
-                  <template #default="scope">
-                    <el-select
-                      v-model="scope.row.supplierIds"
-                      size="large"
-                      clearable
-                      filterable
-                      @change="change(scope.row)"
-                      style="width: 165px"
-                    >
+              <!--                <el-table-column label="客户简称" align="center" prop="brief" min-width="180" fixed />-->
+              <el-table-column label="项目名称" align="center" prop="projectName" min-width="180" fixed />
+              <el-table-column label="子项目名称" align="center" prop="projectSubName" min-width="180" />
+              <el-table-column label="图号" align="center" prop="blueprintNo" min-width="120" />
+              <!--                <el-table-column label="泡沫" align="center"  prop="isFoams">-->
+              <!--                  <template #default="{ row }">-->
+              <!--                    <el-checkbox v-model="row.isFoams" @change="handleOutsourcingChange(row)"  disabled/>-->
+              <!--                  </template>-->
+              <!--                </el-table-column>-->
+              <!--                <el-table-column min-width="200px" align="center" >-->
+              <!--                  <template #header><span class="hl-table_header">*</span>泡沫费用</template>-->
+              <!--                  <template #default="{ row, $index }">-->
+              <!--                    <el-form-item :prop="`${$index}.foamPrice`" class="mb-0px!" v-if="row.isFoams == 'Y'||row.isFoams==true">-->
+              <!--                      <el-input-number v-model="row.foamPrice" type="number" :precision="0" />-->
+              <!--                    </el-form-item>-->
+              <!--                  </template>-->
+              <!--                </el-table-column>-->
+              <el-table-column label="零件名称" align="center" prop="matName" min-width="180" />
+              <el-table-column label="工序" align="center" prop="procedureName" min-width="100" >
+                <template #default="scope">
+                  <el-button text type="primary">
+                    {{ scope.row.procedureName }}
+                  </el-button>
+                </template>
+              </el-table-column>
+              <el-table-column label="材质" align="center" prop="compositionName" min-width="120" />
+              <el-table-column min-width="200px" align="center" >
+                <template #header>规格</template>
+                <template #default="{ row, $index }">
+                  <el-form-item :prop="`${$index}.boomSpec`" class="mb-0px!" >
+                    <el-input class="!w-265px" v-model="row.boomSpec" placeholder="规格"  />
+                  </el-form-item>
+                </template>
+              </el-table-column>
+              <el-table-column label="需求数量" align="center" prop="boomAmount" min-width="120" />
+              <el-table-column label="单位" align="center" prop="unit" min-width="120">
+                <template #default="scope">
+                  <dict-tag :type="DICT_TYPE.HELI_MATERIAL_UNIT" :value="scope.row.unit" />
+                </template>
+              </el-table-column>
+              <el-table-column min-width="200px" align="center" prop="purchaseAmounts">
+                <template #header><span class="hl-table_header">*</span>采购数量</template>
+                <template #default="{ row, $index }">
+                  <el-form-item :prop="`${$index}.purchaseAmounts`" class="mb-0px!" >
+                    <el-input-number v-model="row.purchaseAmounts" type="number" :precision="0" />
+                  </el-form-item>
+                </template>
+              </el-table-column>
+              <el-table-column  align="center" prop="supplierIds" min-width="180" >
+                <template #header><span class="hl-table_header">*</span>供应商</template>
+                <template #default="scope">
+                  <el-select
+                    v-model="scope.row.supplierIds"
+                    size="large"
+                    clearable
+                    filterable
+                    @change="onSupplierChange(scope.row)"
+                    style="width: 165px"
+                  >
+                    <el-option
+                      v-for="item in supplierList"
+                      :key="item.id"
+                      :label="item.brief"
+                      :value="item.id"
+                    />
+                  </el-select>
+                </template>
+              </el-table-column>
+              <el-table-column min-width="200px" align="center" prop="unitPrice">
+                <template #header><span class="hl-table_header">*</span>预估单价</template>
+                <template #default="{ row, $index }">
+                  <el-form-item :prop="`${$index}.unitPrice`" class="mb-0px!" >
+                    <el-input
+                      v-model="row.unitPrice"
+                      type="number"
+                      placeholder="两位小数"
+                      @change="changeUnitPrice(row)"
+
+                    />
+                  </el-form-item>
+                </template>
+              </el-table-column>
+              <el-table-column min-width="200px" align="center" prop="estimatedPrices">
+                <template #header><span class="hl-table_header">*</span>预估总价</template>
+                <template #default="{ row, $index }">
+                  <el-form-item :prop="`${$index}.estimatedPrices`" class="mb-0px!" >
+                    <el-input
+                      v-model="row.estimatedPrices"
+                      type="number"
+                      @change="changeEstimatedPrices(row)"
+                      placeholder="两位小数"
+                    />
+                  </el-form-item>
+                </template>
+              </el-table-column>
+              <el-table-column min-width="200px" align="center" >
+                <template #header><span class="hl-table_header">*</span>预计到货日期</template>
+                <template #default="{ row, $index }">
+                  <el-form-item :prop="`${$index}.arriveTimes`" class="mb-0px!" >
+                    <el-date-picker  class="!w-265px" v-model="row.arriveTimes" type="date"  value-format="x" placeholder="预计到货日期"  @change="change1(row)"/>
+                  </el-form-item>
+                </template>
+              </el-table-column>
+              <el-table-column min-width="200px" align="center" >
+                <template #header>技术要求</template>
+                <template #default="{ row, $index }">
+                  <el-form-item :prop="`${$index}.descriptions`" class="mb-0px!" >
+                    <el-input class="!w-265px" v-model="row.descriptions" placeholder="技术要求"  />
+                  </el-form-item>
+                </template>
+              </el-table-column>
+              <el-table-column min-width="200px" align="center">
+                <template #header>理论重量(吨)</template>
+                <template #default="{ row, $index }">
+                  <el-form-item :prop="`${$index}.theWeight`" class="mb-0px!" >
+                    <el-input-number v-model="row.theWeight" type="number" :precision="3"  />
+                  </el-form-item>
+                </template>
+              </el-table-column>
+              <!--                <el-table-column label="责任人" align="center" prop="duEmpName" min-width="120" />-->
+              <el-table-column min-width="200px" align="center" >
+                <template #header><span class="hl-table_header">*</span>责任人</template>
+                <template #default="{ row, $index }">
+                  <el-form-item :prop="`${$index}.duEmpId`" class="mb-0px!" >
+                    <!--              <UserSelect  v-model="row.duEmpId"  class="!w-265px" clearable @update:newValue="handleSelectedUser($index, $event)"/>-->
+                    <el-select class="!w-265px" v-model="row.duEmpId" clearable @update:new-value="handleSelectedUsers($index,$event)"  @change="change2(row)"  filterable>
                       <el-option
-                        v-for="item in supplierList"
-                        :key="item.id"
-                        :label="item.brief"
-                        :value="item.id"
-                      />
+                        v-for="dict in userInit" :key="dict.id"
+                        :label="dict.username+' '+dict.nickname" :value="dict.id" />
                     </el-select>
-                  </template>
-                </el-table-column>
-                <el-table-column min-width="200px" align="center" prop="unitPrice">
-                  <template #header><span class="hl-table_header">*</span>预估单价</template>
-                  <template #default="{ row, $index }">
-                    <el-form-item :prop="`${$index}.unitPrice`" class="mb-0px!" >
-                      <el-input
-                        v-model="row.unitPrice"
-                        type="number"
-                        placeholder="两位小数"
-                        @change="changeUnitPrice(row)"
-
-                      />
-                    </el-form-item>
-                  </template>
-                </el-table-column>
-                <el-table-column min-width="200px" align="center" prop="estimatedPrices">
-                  <template #header><span class="hl-table_header">*</span>预估总价</template>
-                  <template #default="{ row, $index }">
-                    <el-form-item :prop="`${$index}.estimatedPrices`" class="mb-0px!" >
-                      <el-input
-                        v-model="row.estimatedPrices"
-                        type="number"
-                        @change="changeEstimatedPrices(row)"
-                        placeholder="两位小数"
-                      />
-                    </el-form-item>
-                  </template>
-                </el-table-column>
-                <el-table-column min-width="200px" align="center" >
-                  <template #header><span class="hl-table_header">*</span>预计到货日期</template>
-                  <template #default="{ row, $index }">
-                    <el-form-item :prop="`${$index}.arriveTimes`" class="mb-0px!" >
-                      <el-date-picker  class="!w-265px" v-model="row.arriveTimes" type="date"  value-format="x" placeholder="预计到货日期"  @change="change1(row)"/>
-                    </el-form-item>
-                  </template>
-                </el-table-column>
-                <el-table-column min-width="200px" align="center" >
-                  <template #header>技术要求</template>
-                  <template #default="{ row, $index }">
-                    <el-form-item :prop="`${$index}.descriptions`" class="mb-0px!" >
-                      <el-input class="!w-265px" v-model="row.descriptions" placeholder="技术要求"  />
-                    </el-form-item>
-                  </template>
-                </el-table-column>
-                <el-table-column min-width="200px" align="center">
-                  <template #header>理论重量(吨)</template>
-                  <template #default="{ row, $index }">
-                    <el-form-item :prop="`${$index}.theWeight`" class="mb-0px!" >
-                      <el-input-number v-model="row.theWeight" type="number" :precision="3"  />
-                    </el-form-item>
-                  </template>
-                </el-table-column>
-<!--                <el-table-column label="责任人" align="center" prop="duEmpName" min-width="120" />-->
-                <el-table-column min-width="200px" align="center" >
-                  <template #header><span class="hl-table_header">*</span>责任人</template>
-                  <template #default="{ row, $index }">
-                    <el-form-item :prop="`${$index}.duEmpId`" class="mb-0px!" >
-                      <!--              <UserSelect  v-model="row.duEmpId"  class="!w-265px" clearable @update:newValue="handleSelectedUser($index, $event)"/>-->
-                      <el-select class="!w-265px" v-model="row.duEmpId" clearable @update:new-value="handleSelectedUsers($index,$event)"  @change="change2(row)"  filterable>
-                        <el-option
-                          v-for="dict in userInit" :key="dict.id"
-                          :label="dict.username+' '+dict.nickname" :value="dict.id" />
-                      </el-select>
-                    </el-form-item>
-                  </template>
-                </el-table-column>
-                <el-table-column label="状态" align="center" prop="mplanStatus" min-width="120" >
-                  <template #default="scope">
-                    {{
-                      getIntDictOptions(DICT_TYPE.MATERIAL_PLAN_BOOM_MPLAN_STATUS).find(
-                        (dict) => dict.value === scope.row.mplanStatus
-                      )?.label || '未知状态'
-                    }}
-                  </template>
-                </el-table-column>
-                <el-table-column label="打回原因" align="center" prop="rejRemark" min-width="120" />
-                <el-table-column label="采购单号" align="center" prop="purchaseNo" min-width="180" />
-                <el-table-column fixed="right" label="操作" align="center" min-width="100" >
-                  <template #default="scope">
-                    <el-button
-                      v-if="scope.row.mplanStatus==1" link type="danger"
-                      size="small" @click="handleDelete(scope.row.projectPurchaseOrderMakeDetailId)">
-                      删除
-                    </el-button>
-                  </template>
-                </el-table-column>
-              </el-table>
-              <!-- 分页 -->
-              <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize" @pagination="getList" />
-            </el-form>
+                  </el-form-item>
+                </template>
+              </el-table-column>
+              <el-table-column label="状态" align="center" prop="mplanStatus" min-width="120" >
+                <template #default="scope">
+                  {{
+                    getIntDictOptions(DICT_TYPE.MATERIAL_PLAN_BOOM_MPLAN_STATUS).find(
+                      (dict) => dict.value === scope.row.mplanStatus
+                    )?.label || '未知状态'
+                  }}
+                </template>
+              </el-table-column>
+              <el-table-column label="打回原因" align="center" prop="rejRemark" min-width="120" />
+              <el-table-column label="采购单号" align="center" prop="purchaseNo" min-width="180" />
+              <el-table-column fixed="right" label="操作" align="center" min-width="100" >
+                <template #default="scope">
+                  <el-button
+                    v-if="scope.row.mplanStatus==1" link type="danger"
+                    size="small" @click="handleDelete(scope.row.projectPurchaseOrderMakeDetailId)">
+                    删除
+                  </el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+            <!-- 分页 -->
+            <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize" @pagination="getList" />
           </el-card>
         </el-col>
       </el-row>
@@ -535,7 +535,7 @@ const floatMul = (a, b) => {
   return Number(d.replace(".", "")) * Number(e.replace(".", "")) / Math.pow(10, c);
 }
 const changeUnitPrice =(row:any)=>{
-row.estimatedPrices=parseFloat((row.unitPrice* row.purchaseAmounts).toFixed(1))
+  row.estimatedPrices=parseFloat((row.unitPrice* row.purchaseAmounts).toFixed(1))
 
 }
 const changeEstimatedPrices =(row:any)=>{
@@ -555,48 +555,55 @@ const change1 =(row:any)=>{
     }
   }
 }
+
 const tableRowClassName = ({ row }) => {
   return row.isSelected ? 'selected-row' : '';
 }
 const handleSelectionChange = (val) => {
-  // multipleTable.value.clearSelection()
-  // 第一步：重置所有行的 isSelected 为 false
+  // 重置所有行的 isSelected 和 chkboxEnable 状态
   list.value.forEach(row => {
     row.isSelected = false;
+    row.chkboxEnable = false;
   });
 
-  // 第二步：将当前选中行的 isSelected 设为 true
+  // 设置选中行的状态
   val.forEach(selectedRow => {
-    // 找到对应行并更新状态（通过唯一标识符匹配更准确）
     const targetRow = list.value.find(row => row.id === selectedRow.id);
     if (targetRow) {
       targetRow.isSelected = true;
+      targetRow.chkboxEnable = true;
     }
   });
-  multipleTable.value=val
-  multipleTable.value=val
-  var bomDetails = list.value;
-  if (val.length==0) {
-    for (let i = 0; i < bomDetails.length; i++) {
-      bomDetails[i].chkboxEnable=false
-    }
-  }else if (val.length== bomDetails.length) {
-    for (let i = 0; i < bomDetails.length; i++) {
-      bomDetails[i].chkboxEnable=true
-    }
-  }else {
-    for (let i = 0; i < bomDetails.length; i++) {
-      for (let j = 0; j < val.length; j++) {
-        if (val[j].id==bomDetails[i].id){
-          bomDetails[i].chkboxEnable=true
-          break
-        }else {
-          bomDetails[i].chkboxEnable=false
-        }
-      }
+
+  // 不需要再次设置表格选中状态，因为这是 selection-change 事件触发的
+  updateCheckboxEnableState(val);
+};
+// 提取勾选状态更新逻辑
+const updateCheckboxEnableState = (selectedRows) => {
+  const allSelected = selectedRows.length === list.value.length;
+  const noneSelected = selectedRows.length === 0;
+
+  list.value.forEach(row => {
+    row.chkboxEnable = noneSelected ? false :
+      allSelected ? true :
+        selectedRows.some(selected => selected.id === row.id);
+  });
+};
+
+// 供应商选择时自动勾选当前行
+// 供应商选择时自动勾选当前行
+const onSupplierChange = (row) => {
+  // 如果当前行未被选中，则自动选中它
+  if (!row.chkboxEnable) {
+    // 获取表格实例并确保其存在后再执行选择操作
+    if (multipleTable.value) {
+      multipleTable.value.toggleRowSelection(row, true);
     }
   }
-}
+  // 触发原有的 change 逻辑
+  change(row);
+};
+
 /** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.pageNo = 1
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/StorageLogForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/StorageLogForm.vue
index abcf0cf6..bb9369d8 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/StorageLogForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storagelog/StorageLogForm.vue
@@ -16,6 +16,16 @@ v-model="queryParams.matCode" placeholder="物料编码" clearable @keyup.enter=
 v-model="queryParams.matName" placeholder="物料名称" clearable @keyup.enter="handleQuery"
           class="!w-240px" />
       </el-form-item>
+      <el-form-item label="物料简称" prop="shortName">
+        <el-input
+          v-model="queryParams.shortName" placeholder="物料简称" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
+      </el-form-item>
+      <el-form-item label="规格型号" prop="boomSpec">
+        <el-input
+          v-model="queryParams.boomSpec" placeholder="规格型号" clearable @keyup.enter="handleQuery"
+          class="!w-240px" />
+      </el-form-item>
       <el-form-item label="物料类型" prop="matType">
         <el-select v-model="queryParams.matType" placeholder="下拉选择" clearable class="!w-240px">
           <el-option
@@ -80,7 +90,7 @@ v-for="dict in pnCurrentList" :key="dict.id" :label="dict.pn_name"
       <el-table-column label="物料名称" align="center" prop="matName" fixed min-width="120"/>
       <el-table-column label="物料类型" align="center" prop="matType" min-width="120"/>
       <el-table-column label="物料简称" align="center" prop="shortName" min-width="120"/>
-      <el-table-column label="规格/型号" align="center" prop="matSpec" min-width="120"/>
+      <el-table-column label="规格/型号" align="center" prop="boomSpec" min-width="120"/>
       <el-table-column label="品牌" align="center" prop="matBrand" min-width="120"/>
       <el-table-column label="仓库" align="center" prop="whName" min-width="120"/>
       <el-table-column label="库区" align="center" prop="rgName" min-width="120"/>
@@ -151,6 +161,8 @@ const queryParams = reactive({
   rgId:undefined,
   pnId: undefined,
   headerNo: undefined,
+  shortName: undefined,
+  boomSpec: undefined,
 })
 const queryFormRef = ref() // 搜索的表单
 /** 添加/修改操作 */
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/taskreport/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/taskreport/index.vue
index 227f530f..5ce56972 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/taskreport/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/taskreport/index.vue
@@ -108,7 +108,15 @@
       <el-table-column label="报工工序" align="center" prop="procedureName" width="160" />
       <el-table-column label="报工工时" align="center" prop="workTime" width="160" />
       <el-table-column label="报工数量" align="center" prop="amount" width="120" />
-<!--      <el-table-column-->
+
+      <el-table-column label="报工进度" align="center" prop="reportProcess" width="160">
+        <template #default="scope">
+          <el-tag v-if="scope.row.reportProcess === '1'" type="warning">已报工</el-tag>
+          <el-tag v-else-if="scope.row.reportProcess === '2'" type="success">报工完成</el-tag>
+          <el-tag v-else>{{ scope.row.reportProcess }}</el-tag>
+        </template>
+      </el-table-column>
+      <!--      <el-table-column-->
 <!--        label="生产起止时间"-->
 <!--        align="center"-->
 <!--        prop="startTime"-->
@@ -142,7 +150,7 @@
 <!--          </el-tooltip>-->
 <!--        </template>-->
 <!--      </el-table-column>-->
-      <el-table-column fixed="right" label="操作" align="center" width="140">
+      <el-table-column fixed="right" label="操作" align="center" width="180">
         <template #default="scope">
           <el-button
             link
@@ -152,6 +160,14 @@
           >
             编辑
           </el-button>
+          <el-button
+            v-if="scope.row.reportProcess == 2"
+            link
+            type="primary"
+            @click="rework('update', scope.row.id)"
+          >
+            返工
+          </el-button>
           <el-button
             link
             type="danger"
@@ -159,6 +175,7 @@
           >
             删除
           </el-button>
+
         </template>
       </el-table-column>
     </el-table>
@@ -174,6 +191,8 @@
 </el-card>
   <!-- 表单弹窗：添加/修改 -->
   <TaskReportForm ref="formRef" @success="getList" />
+  <reworkForm ref="reworkRef" @success="getList"/>
+
 </template>
 
 <script setup lang="ts">
@@ -182,6 +201,8 @@ import {dateFormatter, formatDate} from '@/utils/formatTime'
 import download from '@/utils/download'
 import * as TaskReportApi from '@/api/heli/taskreport'
 import TaskReportForm from './TaskReportForm.vue'
+import reworkForm from './reworkForm.vue'
+
 import dayjs from "dayjs";
 import {Setting} from "@element-plus/icons-vue";
 import ElTooltip from "element-plus/es/components/tooltip";
@@ -288,6 +309,12 @@ onMounted(() => {
   setDefaultDate()
   getList()
 })
+
+const reworkRef = ref()
+const  rework = (type: string, id?: number) => {
+  reworkRef.value.open(type, id)
+}
+
 </script>
 <style scoped>
 /* 固定搜索栏样式 */
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/taskreport/reworkForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/taskreport/reworkForm.vue
new file mode 100644
index 00000000..1a0f0c76
--- /dev/null
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/taskreport/reworkForm.vue
@@ -0,0 +1,80 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="600px" @close="emits">
+    <el-form
+        ref="reworkRef"
+        :model="formData"
+        label-width="100px"
+        v-loading="formLoading"
+
+    >
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="返工原因" prop="remark">
+            <el-input type="textarea" :rows="3" placeholder="请输入返工原因"
+                      v-model="formData.remark"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="emits">取 消</el-button>
+    </template>
+  </Dialog>
+
+
+</template>
+<script setup lang="ts">
+import * as TaskReportApi from '@/api/heli/taskreport'
+
+const {t} = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+import {formatAmount} from '@/utils/formatter'
+import {ifError} from "assert";
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  remark: undefined,
+})
+
+const emits = async () => {
+  dialogVisible.value = false
+  emit('success')
+}
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+
+const reworkRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+    // 修改时，设置数据
+    if (id) {
+        formData.value.id=  id
+    }
+}
+defineExpose({open}) // 提供 open 方法，用于打开弹窗
+
+
+const submitForm = async () => {
+  try {
+    // 构建更新数据
+    const data = formData.value as unknown as TaskReportApi.TaskReportVO
+
+    // 执行更新
+    await TaskReportApi.rework(data);
+    message.success(t('common.updateSuccess'))
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } catch (error) {
+    dialogVisible.value = false
+  }
+};
+
+</script>