diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/zjpgmaster/ZjPgMasterController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/zjpgmaster/ZjPgMasterController.java
index d2593b2..5b85d60 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/zjpgmaster/ZjPgMasterController.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/zjpgmaster/ZjPgMasterController.java
@@ -123,6 +123,14 @@ public class ZjPgMasterController {
         return success(pageResult);
     }
 
+    @GetMapping("/task-dispatch-detail/pages")
+    @Operation(summary = "获得质量派工单过程检验行分页")
+    @PreAuthorize("@ss.hasPermission('heli:pg-master-line:query')")
+    public CommonResult<PageResult<ZjPgMasterLineDO>> getPgMasterLinePages(@Valid ZjPgMasterLinePageReqVO pageReqVO) {
+        PageResult<ZjPgMasterLineDO> pageResult = zjPgMasterService.getZjPgMasterLinePages(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, ZjPgMasterLineDO.class));
+    }
+
     @GetMapping("/task-dispatch-detail/pageWx")
     @Operation(summary = "获得派工明细分页")
     @PreAuthorize("@ss.hasPermission('heli:task-dispatch:query')")
@@ -130,6 +138,9 @@ public class ZjPgMasterController {
         PageResult<ZjPgMasterLineDO> pageResult = zjPgMasterService.getTaskDispatchDetailPageWx(pageReqVO);
         return success(pageResult);
     }
+
+
+
     @GetMapping("/task-dispatch-detail/get")
     @Operation(summary = "获得派工明细分页")
     @PreAuthorize("@ss.hasPermission('heli:task-dispatch:query')")
@@ -138,6 +149,15 @@ public class ZjPgMasterController {
         return success(pageResult);
     }
 
+    @GetMapping("/task-dispatch-detail/getLine")
+    @Operation(summary = "获得派工明细分页")
+    @PreAuthorize("@ss.hasPermission('heli:task-dispatch:query')")
+    public CommonResult<ZjPgMasterLineDO> getLine(@RequestParam("id") Integer id) {
+
+        ZjPgMasterLineDO pageResult = zjPgMasterService.getLine(id);
+        return success(pageResult);
+    }
+
     // ==================== 子表（质量派工单终检行） ====================
 
     @GetMapping("/zj-pg-master-line/list-by-zl-pg-id")
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/zjpgmaster/vo/ZjPgMasterLinePageReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/zjpgmaster/vo/ZjPgMasterLinePageReqVO.java
index 2d63e04..8eee79c 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/zjpgmaster/vo/ZjPgMasterLinePageReqVO.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/zjpgmaster/vo/ZjPgMasterLinePageReqVO.java
@@ -70,6 +70,14 @@ public class ZjPgMasterLinePageReqVO extends PageParam {
     @Schema(description = "模具名称", example = "芋艿")
     private String mouldName;
 
+    @Schema(description = "生产计划单号")
+    private String taskNo;
+
+    @Schema(description = "项目名称")
+    private String projectName;
+
+    @Schema(description = "派工单号")
+    private String pgNumber;
 
     @Schema(description = "派工状态", example = "1-2-3")
     private Integer dispatchStatus;
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/zjpgmaster/ZjPgMasterLineDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/zjpgmaster/ZjPgMasterLineDO.java
index 97f158d..0d293d5 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/zjpgmaster/ZjPgMasterLineDO.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/zjpgmaster/ZjPgMasterLineDO.java
@@ -128,5 +128,9 @@ public class ZjPgMasterLineDO extends BaseDO {
     @TableField(exist = false)
     private  BigDecimal workTime;
 
+    @TableField(exist = false)
+    private  String nickName;
+
+
 
 }
\ No newline at end of file
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/pgmaster/PgMasterLineMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/pgmaster/PgMasterLineMapper.java
index c92afbc..9ec81e7 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/pgmaster/PgMasterLineMapper.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/pgmaster/PgMasterLineMapper.java
@@ -105,37 +105,13 @@ public interface PgMasterLineMapper extends BaseMapperX<PgMasterLineDO> {
                 .orderByAsc(PgMasterLineDO::getTaskNo,PgMasterLineDO::getPgNumber)
                 ;
 
-        query.eq(reqVO.getCreateTime()!= null, PgMasterLineDO::getCreateTime, reqVO.getCreateTime())
-                .eq(reqVO.getBomId()!= null, PgMasterLineDO::getBomId, reqVO.getBomId())
-                .eq(reqVO.getBomNumber()!= null, PgMasterLineDO::getBomNumber, reqVO.getBomNumber())
-                .like(reqVO.getBomName()!= null, PgMasterLineDO::getBomName, reqVO.getBomName())
-                .eq(reqVO.getBomNo()!= null, PgMasterLineDO::getBomNo, reqVO.getBomNo())
-                .eq(reqVO.getProjectSubId()!= null, PgMasterLineDO::getProjectSubId, reqVO.getProjectSubId())
-                .like(reqVO.getProjectSubName()!= null, PgMasterLineDO::getProjectSubName, reqVO.getProjectSubName())
-                .eq(reqVO.getProjectSubNumber()!= null, PgMasterLineDO::getProjectSubNumber, reqVO.getProjectSubNumber())
-                .eq(reqVO.getType()!= null, PgMasterLineDO::getType, reqVO.getType())
-                .eq(reqVO.getMaterialId()!= null, PgMasterLineDO::getMaterialId, reqVO.getMaterialId())
-                .eq(reqVO.getMaterialCode()!= null, PgMasterLineDO::getMaterialCode, reqVO.getMaterialCode())
-                .like(reqVO.getMaterialName()!= null, PgMasterLineDO::getMaterialName, reqVO.getMaterialName())
-                .eq(reqVO.getCompositionId()!= null, PgMasterLineDO::getCompositionId, reqVO.getCompositionId())
-                .eq(reqVO.getSpec()!= null, PgMasterLineDO::getSpec, reqVO.getSpec())
-                .eq(reqVO.getUnit()!= null, PgMasterLineDO::getUnit, reqVO.getUnit())
-                .eq(reqVO.getBlueprintNo()!= null, PgMasterLineDO::getBlueprintNo, reqVO.getBlueprintNo())
-                .eq(reqVO.getAmount()!= null, PgMasterLineDO::getAmount, reqVO.getAmount())
-                .eq(reqVO.getDetilUser()!= null, PgMasterLineDO::getDetilUser, reqVO.getDetilUser())
-                .eq(reqVO.getGongShi()!= null, PgMasterLineDO::getGongShi, reqVO.getGongShi())
-                .eq(reqVO.getZlPgId()!= null, PgMasterLineDO::getZlPgId, reqVO.getZlPgId())
-                .eq(reqVO.getPgType()!= null, PgMasterLineDO::getPgType, reqVO.getPgType())
-                .eq(reqVO.getStartTime()!= null, PgMasterLineDO::getStartTime, reqVO.getStartTime())
-                .eq(reqVO.getEntTime()!= null, PgMasterLineDO::getEntTime, reqVO.getEntTime())
-                .eq(reqVO.getDispatchStatus()!= null, PgMasterLineDO::getDispatchStatus, reqVO.getDispatchStatus())
-                .eq(reqVO.getTaskNo()!= null, PgMasterLineDO::getTaskNo, reqVO.getTaskNo())
-                .eq(reqVO.getTaskId()!= null, PgMasterLineDO::getTaskId, reqVO.getTaskId())
-                .eq(reqVO.getProjectId()!= null, PgMasterLineDO::getProjectId, reqVO.getProjectId())
+        query.like(reqVO.getTaskNo()!= null, PgMasterLineDO::getTaskNo, reqVO.getTaskNo())
                 .like(reqVO.getProjectName()!= null, PgMasterLineDO::getProjectName, reqVO.getProjectName())
-                .eq(reqVO.getPgNumber()!= null, PgMasterLineDO::getPgNumber, reqVO.getPgNumber())
-                .eq(reqVO.getActive()!= null, PgMasterLineDO::getActive, reqVO.getActive())
-                .orderByDesc(PgMasterLineDO::getId)
+                .like(reqVO.getProjectSubName()!= null, PgMasterLineDO::getProjectSubName, reqVO.getProjectSubName())
+                .like(reqVO.getPgNumber()!= null, PgMasterLineDO::getPgNumber, reqVO.getPgNumber())
+                .like(reqVO.getDetilUser()!= null, PgMasterLineDO::getDetilUser, reqVO.getDetilUser())
+                .like(reqVO.getPgType()!= null, PgMasterLineDO::getPgType, reqVO.getPgType())
+
 
 
         ;
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/zjpgmaster/ZjPgMasterLineMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/zjpgmaster/ZjPgMasterLineMapper.java
index 4e9f28c..bb8aa77 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/zjpgmaster/ZjPgMasterLineMapper.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/zjpgmaster/ZjPgMasterLineMapper.java
@@ -48,8 +48,37 @@ public interface ZjPgMasterLineMapper extends BaseMapperX<ZjPgMasterLineDO> {
     }
 
 
+    default PageResult<ZjPgMasterLineDO> selectPages(ZjPgMasterLinePageReqVO reqVO) {
+        MPJLambdaWrapper<ZjPgMasterLineDO> query = new MPJLambdaWrapper<>();
+        query.select("t.id," +
+                "t.task_no AS taskNo," +
+                "t.project_name AS projectName," +
+                "t.project_sub_name AS projectSubName," +
+                "t.amount," +
+                "t.unit," +
+                "t.detil_user AS detilUser," +
+                "t.pg_number AS pgNumber," +
+                "t.start_time AS startTime," +
+                "t.ent_time AS entTime," +
+                "t.dispatch_status AS dispatchStatus," +
+                "t.pg_type AS pgType,t.composition_name as compositionName")
+                .select("u2.nickname as nickName")
+                .leftJoin("system_users u2 on u2.id = t.detil_user")
+
+                .orderByAsc(ZjPgMasterLineDO::getTaskNo, ZjPgMasterLineDO::getPgNumber)
+        ;
+
+        query.like(reqVO.getTaskNo() != null, ZjPgMasterLineDO::getTaskNo, reqVO.getTaskNo())
+                .like(reqVO.getProjectName() != null, ZjPgMasterLineDO::getProjectName, reqVO.getProjectName())
+                .like(reqVO.getProjectSubName() != null, ZjPgMasterLineDO::getProjectSubName, reqVO.getProjectSubName())
+                .like(reqVO.getPgNumber() != null, ZjPgMasterLineDO::getPgNumber, reqVO.getPgNumber())
+                .like(reqVO.getDetilUser() != null, ZjPgMasterLineDO::getDetilUser, reqVO.getDetilUser())
+                .like(reqVO.getPgType() != null, ZjPgMasterLineDO::getPgType, reqVO.getPgType())
 
 
+        ;
+        return selectPage(reqVO, query);
+    }
     default PageResult<ZjPgMasterLineDO> selectPage(ZjPgMasterLinePageReqVO reqVO) {
         MPJLambdaWrapper<ZjPgMasterLineDO> query = new MPJLambdaWrapper<>();
         query.selectAll(ZjPgMasterLineDO.class)
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/zjpgmaster/ZjPgMasterService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/zjpgmaster/ZjPgMasterService.java
index 76dd092..0b36744 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/zjpgmaster/ZjPgMasterService.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/zjpgmaster/ZjPgMasterService.java
@@ -80,8 +80,12 @@ public interface ZjPgMasterService {
 
     List<ZjPgMasterLineDO> searchZXMMx(Long task_id,Long project_id);
 
+    PageResult<ZjPgMasterLineDO> getZjPgMasterLinePages(ZjPgMasterLinePageReqVO pageReqVO);
+
     PageResult<ZjPgMasterLineDO> getTaskDispatchDetailPage(ZjPgMasterLinePageReqVO pageReqVO);
     PageResult<ZjPgMasterLineDO> getTaskDispatchDetailPageWx(ZjPgMasterLinePageReqVO pageReqVO);
+    ZjPgMasterLineDO getLine(Integer id);
+
     ZjPgMasterLineDO getTaskDispatchDetail(ZjPgMasterLinePageReqVO pageReqVO);
 
 }
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/zjpgmaster/ZjPgMasterServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/zjpgmaster/ZjPgMasterServiceImpl.java
index 7ee5ba8..ef3e249 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/zjpgmaster/ZjPgMasterServiceImpl.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/zjpgmaster/ZjPgMasterServiceImpl.java
@@ -58,11 +58,22 @@ public class ZjPgMasterServiceImpl implements ZjPgMasterService {
     @Resource
     private MouldTypeMapper mouldTypeMapper;
 
+
+    @Override
+    public ZjPgMasterLineDO getLine(Integer id) {
+        return zjPgMasterLineMapper.selectById(id);
+    }
     @Override
     public ZjPgMasterLineDO getTaskDispatchDetail(ZjPgMasterLinePageReqVO pageReqVO){
         return zjPgMasterLineMapper.selectMx(pageReqVO);
     }
 
+
+    @Override
+    public PageResult<ZjPgMasterLineDO> getZjPgMasterLinePages(ZjPgMasterLinePageReqVO pageReqVO) {
+        return zjPgMasterLineMapper.selectPages(pageReqVO);
+    }
+
     @Override
     public PageResult<ZjPgMasterLineDO> getTaskDispatchDetailPage(ZjPgMasterLinePageReqVO pageReqVO) {
         return zjPgMasterLineMapper.selectPage(pageReqVO);
diff --git a/mes-ui/mes-ui-admin-vue3/src/api/heli/zjpgmaster/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/heli/zjpgmaster/index.ts
index c9c4ae2..6233622 100644
--- a/mes-ui/mes-ui-admin-vue3/src/api/heli/zjpgmaster/index.ts
+++ b/mes-ui/mes-ui-admin-vue3/src/api/heli/zjpgmaster/index.ts
@@ -16,6 +16,11 @@ export const getSearchZXMMx = async (task_id: number,project_id: number) => {
   return await request.get({ url: `/heli/zj-pg-master/getZXMMx?task_id=` + task_id+`&project_id=`+project_id})
 }
 
+// 查询质量派工单过程检验行分页
+export const getZjPgMasterLinePage = async (params) => {
+  return await request.get({ url: `/heli/zj-pg-master/task-dispatch-detail/pages`, params })
+}
+
 // 查询质量终检派工单主分页
 export const getZjPgMasterPage = async (params) => {
   return await request.get({ url: `/heli/zj-pg-master/page`, params })
@@ -51,4 +56,11 @@ export const exportZjPgMaster = async (params) => {
 // 获得质量派工单终检行列表
 export const getZjPgMasterLineListByZlPgId = async (zlPgId) => {
   return await request.get({ url: `/heli/zj-pg-master/zj-pg-master-line/list-by-zl-pg-id?zlPgId=` + zlPgId })
-}
\ No newline at end of file
+}
// 获得质量派工单过程检验行列表
+export const getZjPgMasterLineListByZlPgIdLine = async (zlPgId) => {
+  return await request.get({ url: `/heli/zj-pg-master/task-dispatch-detail/getLine?id=` + zlPgId })
+}
+
+export const zfZjPgMaster = async (id) => {
+  return await request.post({ url: `/heli/zj-pg-master/zfZjPgMaster?id=` + id })
+}
\ No newline at end of file
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/pgmasterline/PgMasterLineForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/pgmasterline/PgMasterLineForm.vue
index f5f4499..d49a9c0 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/pgmasterline/PgMasterLineForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/pgmasterline/PgMasterLineForm.vue
@@ -80,7 +80,7 @@
 				</el-col>
 				<el-col :span="6">
 					<el-form-item label="单位" prop="unit">
-						<el-input v-model="formData.unit" placeholder="请输入单位" />
+						 <el-input v-model="formData.unit" placeholder="请输入单位" /> 
 					</el-form-item>
 				</el-col>
 			</el-row>
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/pgmasterline/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/pgmasterline/index.vue
index c42c990..bbd82c5 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/pgmasterline/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/pgmasterline/index.vue
@@ -165,29 +165,33 @@
         :formatter="dateFormatter"
         width="180px"
       />
-	  <el-table-column label="生产计划单号" align="center" prop="taskNo" />
+	  <el-table-column label="生产计划单号" align="center" prop="taskNo" width="200" />
 	  <el-table-column label="项目名称" align="center" prop="projectName" />
 	  <el-table-column label="子项目名称" align="center" prop="projectSubName" />
 	  <el-table-column label="物料名称" align="center" prop="materialName" /> 
 	  <el-table-column label="图号" align="center" prop="blueprintNo" />
 	  <el-table-column label="数量" align="center" prop="amount" />
 	  <el-table-column label="规格" align="center" prop="spec" />
-	  <el-table-column label="单位" align="center" prop="unit" />
+	  <el-table-column label="单位" align="center" prop="unit" >
+		  <template #default="scope">
+		    <dict-tag :type="DICT_TYPE.HELI_MATERIAL_UNIT" :value="scope.row.unit" />
+		  </template>
+	  </el-table-column>
 	  <el-table-column label="检验人" align="center" prop="nickName" />
-	  <el-table-column label="派工单号" align="center" prop="pgNumber" />
+	  <el-table-column label="派工单号" align="center" prop="pgNumber"  width="220"/>
 	  <el-table-column
 	    label="开始日期"
 	    align="center"
 	    prop="startTime"
 	    :formatter="dateFormatter"
-	    width="200px"
+	    width="240"
 	  />
 	  <el-table-column
 	    label="结束日期"
 	    align="center"
 	    prop="entTime"
 	    :formatter="dateFormatter"
-	    width="200px"
+	    width="240"
 		
 	  />
 	  <!-- <el-table-column label="派工状态" align="center" prop="dispatchStatus" /> -->
@@ -205,35 +209,8 @@
 	  </template>
 	  
 	   </el-table-column>
-      <!-- <el-table-column label="bomID" align="center" prop="bomId" />
-      <el-table-column label="bom编号" align="center" prop="bomNumber" />
-      <el-table-column label="bom名称" align="center" prop="bomName" />
-      <el-table-column label="bom版本号" align="center" prop="bomNo" />
-      <el-table-column label="子项目id" align="center" prop="projectSubId" />
-      
-      <el-table-column label="子项目编号" align="center" prop="projectSubNumber" />
-      <el-table-column label="是否标准件" align="center" prop="type" />
-      <el-table-column label="物料id" align="center" prop="materialId" />
-      <el-table-column label="物料编码" align="center" prop="materialCode" />
-      
-      <el-table-column label="材质id" align="center" prop="compositionId" />
-      
-      
-      
-      
-      
-      <el-table-column label="预计工时" align="center" prop="gongShi" />
-      <el-table-column label="质量派工id" align="center" prop="zlPgId" />
-      
-      
-      
-      
-      <el-table-column label="生产计划id" align="center" prop="taskId" />
-      <el-table-column label="项目id" align="center" prop="projectId" />
-      
-      
-      <el-table-column label="报工状态" align="center" prop="active" /> -->
-      <el-table-column label="操作" align="center">
+    
+      <el-table-column label="操作" align="center" width="140">
         <template #default="scope">
           <el-button
             link
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/zjpgmasterline/ZjPgMasterLineForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/zjpgmasterline/ZjPgMasterLineForm.vue
index 618d9ba..8da55bf 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/zjpgmasterline/ZjPgMasterLineForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/zjpgmasterline/ZjPgMasterLineForm.vue
@@ -1,170 +1,236 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
-    <el-form
-      ref="formRef"
-      :model="formData"
-      :rules="formRules"
-      label-width="100px"
-      v-loading="formLoading"
-    >
-      <el-form-item label="子项目id" prop="projectSubId">
-        <el-input v-model="formData.projectSubId" placeholder="请输入子项目id" />
-      </el-form-item>
-      <el-form-item label="子项目名称" prop="projectSubName">
-        <el-input v-model="formData.projectSubName" placeholder="请输入子项目名称" />
-      </el-form-item>
-      <el-form-item label="子项目编号" prop="projectSubNumber">
-        <el-input v-model="formData.projectSubNumber" placeholder="请输入子项目编号" />
-      </el-form-item>
-      <el-form-item label="材质id" prop="compositionId">
-        <el-input v-model="formData.compositionId" placeholder="请输入材质id" />
-      </el-form-item>
-      <el-form-item label="单位" prop="unit">
-        <el-input v-model="formData.unit" placeholder="请输入单位" />
-      </el-form-item>
-      <el-form-item label="数量" prop="amount">
-        <el-input v-model="formData.amount" placeholder="请输入数量" />
-      </el-form-item>
-      <el-form-item label="检验人" prop="detilUser">
-        <el-input v-model="formData.detilUser" placeholder="请输入检验人" />
-      </el-form-item>
-      <el-form-item label="开始日期" prop="startTime">
-        <el-date-picker
-          v-model="formData.startTime"
-          type="date"
-          value-format="x"
-          placeholder="选择开始日期"
-        />
-      </el-form-item>
-      <el-form-item label="结束日期" prop="entTime">
-        <el-date-picker
-          v-model="formData.entTime"
-          type="date"
-          value-format="x"
-          placeholder="选择结束日期"
-        />
-      </el-form-item>
-      <el-form-item label="预计工时" prop="gongShi">
-        <el-input v-model="formData.gongShi" placeholder="请输入预计工时" />
-      </el-form-item>
-      <el-form-item label="质量派工id" prop="zlPgId">
-        <el-input v-model="formData.zlPgId" placeholder="请输入质量派工id" />
-      </el-form-item>
-      <el-form-item label="是否完成 0未完成 1已完成" prop="pgType">
-        <el-select v-model="formData.pgType" placeholder="请选择是否完成 0未完成 1已完成">
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="材质名称" prop="compositionName">
-        <el-input v-model="formData.compositionName" placeholder="请输入材质名称" />
-      </el-form-item>
-      <el-form-item label="模具id" prop="mouldId">
-        <el-input v-model="formData.mouldId" placeholder="请输入模具id" />
-      </el-form-item>
-      <el-form-item label="模具名称" prop="mouldName">
-        <el-input v-model="formData.mouldName" placeholder="请输入模具名称" />
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
-      <el-button @click="dialogVisible = false">取 消</el-button>
-    </template>
-  </Dialog>
+	<Dialog :title="dialogTitle" v-model="dialogVisible" width="1700px">
+		<el-form ref="formRef" :model="formData" :rules="formRules" label-width="160px" v-loading="formLoading">
+			<el-row>
+				<el-col :span="6">
+					<el-form-item label="生产计划单号" prop="taskNo">
+						<el-input v-model="formData.taskNo" placeholder="" />
+					</el-form-item>
+
+				</el-col>
+				<el-col :span="6">
+					<el-form-item label="项目名称" prop="projectName">
+						<el-input v-model="formData.projectName" placeholder="" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="6">
+					<el-form-item label="子项目编号" prop="projectSubNumber">
+						<el-input v-model="formData.projectSubNumber" placeholder="" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="6">
+					<el-form-item label="子项目名称" prop="projectSubName">
+						<el-input v-model="formData.projectSubName" placeholder="" />
+					</el-form-item>
+				</el-col>
+
+			</el-row>
+			<el-row>
+				<el-col :span="6">
+					<el-form-item label="派工单号" prop="pgNumber">
+						<el-input v-model="formData.pgNumber" placeholder="" />
+					</el-form-item>
+
+				</el-col>
+				<el-col :span="6">
+					<el-form-item label="模具名称" prop="mouldName">
+						<el-input v-model="formData.mouldName" placeholder="" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="6">
+					<el-form-item label="材质名称" prop="compositionName">
+						<el-input v-model="formData.compositionName" placeholder="" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="6">
+					<el-form-item label="数量" prop="amount">
+						<el-input v-model="formData.amount" placeholder="" />
+					</el-form-item>
+				</el-col>
+
+			</el-row>
+			<el-row>
+				<el-col :span="6">
+					<el-form-item label="单位" prop="unit">
+						 <el-input v-model="formData.unit" placeholder="" /> 
+					</el-form-item> 
+
+				</el-col>
+				<el-col :span="6">
+					<el-form-item label="检验人" prop="detilUser">
+						<el-input v-model="formData.detilUser" placeholder="" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="6">
+					<el-form-item label="开始日期" prop="startTime">
+						<el-date-picker v-model="formData.startTime" type="date" value-format="x"
+							placeholder="选择开始日期" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="6">
+					<el-form-item label="结束日期" prop="entTime">
+						<el-date-picker v-model="formData.entTime" type="date" value-format="x" placeholder="选择结束日期" />
+					</el-form-item>
+				</el-col>
+
+			</el-row>
+
+
+			<el-row>
+				<el-col :span="6">
+					<el-form-item label="单据状态" prop="pgType">
+						<el-select v-model="formData.pgType" placeholder="">
+							<el-option
+							 v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PGTYPE)"
+							:key="dict.value"
+							:label="dict.label"
+							:value="dict.value" />
+							   
+						</el-select>
+					</el-form-item>
+
+				</el-col>
+				<el-col :span="6">
+					<el-form-item label="派工状态" prop="dispatchStatus">
+						<el-select v-model="formData.dispatchStatus" placeholder="">
+							<el-option
+							 v-for="dict in getIntDictOptions(DICT_TYPE.HELI_DISPATCH_STATUS)"
+							:key="dict.value"
+							:label="dict.label"
+							:value="dict.value" />
+							   
+						</el-select>
+					</el-form-item>
+				</el-col>
+
+
+			</el-row>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+		</el-form>
+		<template #footer>
+			<!-- <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button> -->
+			<el-button @click="dialogVisible = false">取 消</el-button>
+		</template>
+	</Dialog>
 </template>
 <script setup lang="ts">
+	import * as ZjPgMasterApi from '@/api/heli/zjpgmaster'
+	import { getIntDictOptions, getStrDictOptions, DICT_TYPE, getDictLabel } from '@/utils/dict'
+	const {
+		t
+	} = useI18n() // 国际化
+	const message = useMessage() // 消息弹窗
 
-import * as ZjPgMasterApi from '@/api/heli/zjpgmaster'
-const { t } = useI18n() // 国际化
-const message = useMessage() // 消息弹窗
+	const dialogVisible = ref(false) // 弹窗的是否展示
+	const dialogTitle = ref('') // 弹窗的标题
+	const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+	const formType = ref('') // 表单的类型：create - 新增；update - 修改
+	const formData = ref({
+		id: undefined,
+		projectSubId: undefined,
+		projectSubName: undefined,
+		projectSubNumber: undefined,
+		compositionId: undefined,
+		unit: undefined,
+		amount: undefined,
+		detilUser: undefined,
+		startTime: undefined,
+		entTime: undefined,
+		gongShi: undefined,
+		zlPgId: undefined,
+		pgType: undefined,
+		compositionName: undefined,
+		mouldId: undefined,
+		mouldName: undefined,
+		pgNumber: undefined,
+		taskNo: undefined,
+		taskId: undefined,
+		projectId: undefined,
+		projectName: undefined,
+		dispatchStatus: undefined,
+		active: undefined,
+	})
+	const formRules = reactive({})
+	const formRef = ref() // 表单 Ref
 
-const dialogVisible = ref(false) // 弹窗的是否展示
-const dialogTitle = ref('') // 弹窗的标题
-const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const formData = ref({
-  id: undefined,
-  projectSubId: undefined,
-  projectSubName: undefined,
-  projectSubNumber: undefined,
-  compositionId: undefined,
-  unit: undefined,
-  amount: undefined,
-  detilUser: undefined,
-  startTime: undefined,
-  entTime: undefined,
-  gongShi: undefined,
-  zlPgId: undefined,
-  pgType: undefined,
-  compositionName: undefined,
-  mouldId: undefined,
-  mouldName: undefined,
-})
-const formRules = reactive({
-})
-const formRef = ref() // 表单 Ref
+	/** 打开弹窗 */
+	const open = async (type: string, id ? : number) => {
+		dialogVisible.value = true
+		dialogTitle.value = t('action.' + type)
+		formType.value = type
+		resetForm()
+		// 修改时，设置数据
+		if (id) {
+			formLoading.value = true
+			try {
+				formData.value = await ZjPgMasterApi.getZjPgMasterLineListByZlPgIdLine(id)
+			} finally {
+				formLoading.value = false
+			}
+		}
+	}
+	defineExpose({
+		open
+	}) // 提供 open 方法，用于打开弹窗
 
-/** 打开弹窗 */
-const open = async (type: string, id?: number) => {
-  dialogVisible.value = true
-  dialogTitle.value = t('action.' + type)
-  formType.value = type
-  resetForm()
-  // 修改时，设置数据
-  if (id) {
-    formLoading.value = true
-    try {
-      formData.value = await ZjPgMasterApi.getZjPgMasterLine(id)
-    } finally {
-      formLoading.value = false
-    }
-  }
-}
-defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+	/** 提交表单 */
+	const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+	const submitForm = async () => {
+		// 校验表单
+		await formRef.value.validate()
+		// 提交请求
+		formLoading.value = true
+		try {
+			const data = formData.value as unknown as ZjPgMasterApi.ZjPgMasterLineVO
+			if (formType.value === 'create') {
+				await ZjPgMasterApi.createZjPgMasterLine(data)
+				message.success(t('common.createSuccess'))
+			} else {
+				await ZjPgMasterApi.updateZjPgMasterLine(data)
+				message.success(t('common.updateSuccess'))
+			}
+			dialogVisible.value = false
+			// 发送操作成功的事件
+			emit('success')
+		} finally {
+			formLoading.value = false
+		}
+	}
 
-/** 提交表单 */
-const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
-const submitForm = async () => {
-  // 校验表单
-  await formRef.value.validate()
-  // 提交请求
-  formLoading.value = true
-  try {
-    const data = formData.value as unknown as ZjPgMasterApi.ZjPgMasterLineVO
-    if (formType.value === 'create') {
-      await ZjPgMasterApi.createZjPgMasterLine(data)
-      message.success(t('common.createSuccess'))
-    } else {
-      await ZjPgMasterApi.updateZjPgMasterLine(data)
-      message.success(t('common.updateSuccess'))
-    }
-    dialogVisible.value = false
-    // 发送操作成功的事件
-    emit('success')
-  } finally {
-    formLoading.value = false
-  }
-}
-
-/** 重置表单 */
-const resetForm = () => {
-  formData.value = {
-    id: undefined,
-    projectSubId: undefined,
-    projectSubName: undefined,
-    projectSubNumber: undefined,
-    compositionId: undefined,
-    unit: undefined,
-    amount: undefined,
-    detilUser: undefined,
-    startTime: undefined,
-    entTime: undefined,
-    gongShi: undefined,
-    zlPgId: undefined,
-    pgType: undefined,
-    compositionName: undefined,
-    mouldId: undefined,
-    mouldName: undefined,
-  }
-  formRef.value?.resetFields()
-}
-</script>
\ No newline at end of file
+	/** 重置表单 */
+	const resetForm = () => {
+		formData.value = {
+			id: undefined,
+			projectSubId: undefined,
+			projectSubName: undefined,
+			projectSubNumber: undefined,
+			compositionId: undefined,
+			unit: undefined,
+			amount: undefined,
+			detilUser: undefined,
+			startTime: undefined,
+			entTime: undefined,
+			gongShi: undefined,
+			zlPgId: undefined,
+			pgType: undefined,
+			compositionName: undefined,
+			mouldId: undefined,
+			mouldName: undefined,
+		}
+		formRef.value?.resetFields()
+	}
+</script>
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/zjpgmasterline/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/zjpgmasterline/index.vue
index 76d42d8..cb645bc 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/zjpgmasterline/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/zjpgmasterline/index.vue
@@ -85,23 +85,7 @@
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          @click="openForm('create')"
-          v-hasPermi="['heli:zj-pg-master-line:create']"
-        >
-          <Icon icon="ep:plus" class="mr-5px" /> 新增
-        </el-button>
-        <el-button
-          type="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['heli:zj-pg-master-line:export']"
-        >
-          <Icon icon="ep:download" class="mr-5px" /> 导出
-        </el-button>
+
       </el-form-item>
     </el-form>
   </ContentWrap>
@@ -109,49 +93,61 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" class="hl-table" :show-overflow-tooltip="true">
-        <el-table-column label="主键" align="center" prop="id" />
-            <el-table-column
+        <el-table-column v-if = "false" label="主键" align="center" prop="id" />
+            <el-table-column v-if = "false"
               label="创建时间"
               align="center"
               prop="createTime"
               :formatter="dateFormatter"
               width="180px"
             />
-            <el-table-column label="子项目id" align="center" prop="projectSubId" />
-            <el-table-column label="子项目名称" align="center" prop="projectSubName" />
-            <el-table-column label="子项目编号" align="center" prop="projectSubNumber" />
-            <el-table-column label="材质id" align="center" prop="compositionId" />
-            <el-table-column label="单位" align="center" prop="unit" />
+            <el-table-column label="生产计划单号" align="center" prop="taskNo" width="200"/>
+			<el-table-column label="项目名称" align="center" prop="projectName" width="200"/>
+            <el-table-column label="子项目名称" align="center" prop="projectSubName" width="200"/>
+			<el-table-column label="模具名称" align="center" prop="mouldName" />
+            <el-table-column label="材质" align="center" prop="compositionName" />
+			
+            <el-table-column label="单位" align="center" prop="unit" >
+				<template #default="scope">
+				  <dict-tag :type="DICT_TYPE.HELI_MATERIAL_UNIT" :value="scope.row.unit" />
+				</template>
+			</el-table-column>
             <el-table-column label="数量" align="center" prop="amount" />
-            <el-table-column label="检验人" align="center" prop="detilUser" />
+            <el-table-column label="检验人" align="center" prop="nickName" />
+
+            
+            <el-table-column label="材质名称" align="center" prop="compositionName" />
+            
+            <el-table-column label="派工单号" align="center" prop="pgNumber" width="220"/>
+            
             <el-table-column
               label="开始日期"
               align="center"
               prop="startTime"
               :formatter="dateFormatter"
-              width="180px"
+              width="240"
             />
             <el-table-column
               label="结束日期"
               align="center"
               prop="entTime"
               :formatter="dateFormatter"
-              width="180px"
+              width="240"
             />
-            <el-table-column label="预计工时" align="center" prop="gongShi" />
-            <el-table-column label="质量派工id" align="center" prop="zlPgId" />
-            <el-table-column label="是否完成 0未完成 1已完成" align="center" prop="pgType" />
-            <el-table-column label="材质名称" align="center" prop="compositionName" />
-            <el-table-column label="模具id" align="center" prop="mouldId" />
-            <el-table-column label="模具名称" align="center" prop="mouldName" />
-            <el-table-column label="派工单号" align="center" prop="pgNumber" />
-            <el-table-column label="生产计划单号" align="center" prop="taskNo" />
-            <el-table-column label="生产计划id" align="center" prop="taskId" />
-            <el-table-column label="项目id" align="center" prop="projectId" />
-            <el-table-column label="项目名称" align="center" prop="projectName" />
-            <el-table-column label="派工状态 已保存|已提交|已终止 1|2|3" align="center" prop="dispatchStatus" />
-            <el-table-column label="当前报工状态" align="center" prop="active" />
-            <el-table-column label="操作" align="center">
+            <el-table-column label="派工状态" min-width="80">
+            <template #default="scope">
+              <dict-tag :type="DICT_TYPE.HELI_DISPATCH_STATUS" :value="scope.row.dispatchStatus" />
+            </template>
+            
+             </el-table-column>
+			<el-table-column label="单据状态" min-width="80">
+			<template #default="scope">
+			  <dict-tag :type="DICT_TYPE.HELI_PGTYPE" :value="scope.row.pgType" />
+			</template>
+			
+			 </el-table-column>
+        
+            <el-table-column label="操作" align="center" width="140">
               <template #default="scope">
                 <el-button
                   link
@@ -159,7 +155,7 @@
                   @click="openForm('update', scope.row.id)"
                   v-hasPermi="['heli:zj-pg-master-line:update']"
                 >
-                  编辑
+                  查看
                 </el-button>
                 <el-button
                   link
@@ -167,7 +163,7 @@
                   @click="handleDelete(scope.row.id)"
                   v-hasPermi="['heli:zj-pg-master-line:delete']"
                 >
-                  删除
+                  作废
                 </el-button>
               </template>
             </el-table-column>
@@ -238,7 +234,7 @@ const exportLoading = ref(false) // 导出的加载中
 const getList = async () => {
   loading.value = true
   try {
-    const data = await ZjPgMasterLineApi.getZjPgMasterLinePage(queryParams)
+    const data = await ZjPgMasterApi.getZjPgMasterLinePage(queryParams)
     list.value = data.list
     total.value = data.total
   } finally {
@@ -268,10 +264,10 @@ const openForm = (type: string, id?: number) => {
 const handleDelete = async (id: number) => {
   try {
     // 删除的二次确认
-    await message.delConfirm()
+    await message.confirm("是否要作废该派工单","")
     // 发起删除
-    await ZjPgMasterLineApi.deleteZjPgMasterLine(id)
-    message.success(t('common.delSuccess'))
+    await ZjPgMasterApi.zfZjPgMaster(id)
+    message.success("作废成功")
     // 刷新列表
     await getList()
   } catch {}
diff --git a/mes-ui/mini-app/src/pages/pgMaster/components/dataItem.vue b/mes-ui/mini-app/src/pages/pgMaster/components/dataItem.vue
index 8541175..79868d5 100644
--- a/mes-ui/mini-app/src/pages/pgMaster/components/dataItem.vue
+++ b/mes-ui/mini-app/src/pages/pgMaster/components/dataItem.vue
@@ -18,7 +18,7 @@ const props = defineProps<{
 }>()
 
 const statusText = computed(() => {
-  const text = props.orderState == '0,1' ? '处理' : '查看'
+  const text = props.orderState == '0' ? '检查' : '查看'
   return text
 })
 // 是否加载中标记，用于防止滚动触底触发多次请求
@@ -145,7 +145,8 @@ const onRefresherrefresh = async () => {
         <view class="md">
           <view class="product-item">项目名称：{{ item.projectName }}</view>
           <view class="product-item">子项目：{{ item.projectSubCode || '' }} {{' ' + item.projectSubName }}</view>
-		  <view class="product-item">模型名称：{{ item.mouldName }}</view>
+		  <view class="product-item">零件名称：{{ item.materialName }}</view>
+		  <view class="product-item">图号：{{ item.blueprintNo }}</view>
           <!-- <view class="product-row">
             <view class="row-item">
               <view class="label">模型名称: {{ item.mouldName }}</view>
diff --git a/mes-ui/mini-app/src/pages/zjPgMaster/components/dataItem.vue b/mes-ui/mini-app/src/pages/zjPgMaster/components/dataItem.vue
index 1aa8c4b..e153f21 100644
--- a/mes-ui/mini-app/src/pages/zjPgMaster/components/dataItem.vue
+++ b/mes-ui/mini-app/src/pages/zjPgMaster/components/dataItem.vue
@@ -18,7 +18,7 @@ const props = defineProps<{
 }>()
 
 const statusText = computed(() => {
-  const text = props.orderState == '0,1' ? '处理' : '查看'
+  const text = props.orderState == '0' ? '检查' : '查看'
   return text
 })
 // 是否加载中标记，用于防止滚动触底触发多次请求
@@ -151,7 +151,7 @@ const onRefresherrefresh = async () => {
         <view class="md">
           <view class="product-item">项目名称：{{ item.projectName }}</view>
           <view class="product-item">子项目：{{ item.projectSubCode || '' }} {{' ' + item.projectSubName }}</view>
-		  <view class="product-item">模型名称：{{ item.mouldName }}</view>
+		  <!-- <view class="product-item">模型名称：{{ item.mouldName }}</view> -->
           <!-- <view class="product-row">
             <view class="row-item">
               <view class="label">模型名称: {{ item.mouldName }}</view>