diff --git a/src/api/mes/plan/index.ts b/src/api/mes/plan/index.ts
index 7ddf759a..9225484f 100644
--- a/src/api/mes/plan/index.ts
+++ b/src/api/mes/plan/index.ts
@@ -80,4 +80,12 @@ export const PlanApi = {
   getStartPlanProduct: async (orgType) => {
     return await request.get({ url: `/mes/app/org-worker/getPlanProductList?orgType=`+orgType })
   },
+  // 更新质检状态生产计划
+  updatePlanZjStatus: async (data: PlanVO) => {
+    return await request.put({ url: `/mes/plan/updatePlanZjStatus`, data })
+  },
+  // 根据状态查询生产计划详情
+  getPlanByStatus: async (status: number) => {
+    return await request.get({ url: `/mes/plan/getByStatus?status=` + status })
+  },
 }
diff --git a/src/api/mes/zjproduct/index.ts b/src/api/mes/zjproduct/index.ts
index e928986a..bb4a2d51 100644
--- a/src/api/mes/zjproduct/index.ts
+++ b/src/api/mes/zjproduct/index.ts
@@ -1,45 +1,50 @@
-import request from '@/config/axios'
-
-// 质量管理-质检参数 VO
-export interface ZjProductVO {
-  id: number // ID
-  type: string // 工序
-  name: string // 名称
-  unit: string // 单位
-  upperVal: number // 上限值
-  lowerVal: number // 下限值
-  remark: string // 备注
-}
-
-// 质量管理-质检参数 API
-export const ZjProductApi = {
-  // 查询质量管理-质检参数分页
-  getZjProductPage: async (params: any) => {
-    return await request.get({ url: `/mes/zj-product/page`, params })
-  },
-
-  // 查询质量管理-质检参数详情
-  getZjProduct: async (id: number) => {
-    return await request.get({ url: `/mes/zj-product/get?id=` + id })
-  },
-
-  // 新增质量管理-质检参数
-  createZjProduct: async (data: ZjProductVO) => {
-    return await request.post({ url: `/mes/zj-product/create`, data })
-  },
-
-  // 修改质量管理-质检参数
-  updateZjProduct: async (data: ZjProductVO) => {
-    return await request.put({ url: `/mes/zj-product/update`, data })
-  },
-
-  // 删除质量管理-质检参数
-  deleteZjProduct: async (id: number) => {
-    return await request.delete({ url: `/mes/zj-product/delete?id=` + id })
-  },
-
-  // 导出质量管理-质检参数 Excel
-  exportZjProduct: async (params) => {
-    return await request.download({ url: `/mes/zj-product/export-excel`, params })
-  },
-}
\ No newline at end of file
+import request from '@/config/axios'
+
+// 质量管理-质检参数 VO
+export interface ZjProductVO {
+  id: number // ID
+  type: string // 工序
+  name: string // 名称
+  unit: string // 单位
+  upperVal: number // 上限值
+  lowerVal: number // 下限值
+  remark: string // 备注
+}
+
+// 质量管理-质检参数 API
+export const ZjProductApi = {
+  // 查询质量管理-质检参数分页
+  getZjProductPage: async (params: any) => {
+    return await request.get({ url: `/mes/zj-product/page`, params })
+  },
+
+  // 查询质量管理-质检参数详情
+  getZjProduct: async (id: number) => {
+    return await request.get({ url: `/mes/zj-product/get?id=` + id })
+  },
+
+  // 新增质量管理-质检参数
+  createZjProduct: async (data: ZjProductVO) => {
+    return await request.post({ url: `/mes/zj-product/create`, data })
+  },
+
+  // 修改质量管理-质检参数
+  updateZjProduct: async (data: ZjProductVO) => {
+    return await request.put({ url: `/mes/zj-product/update`, data })
+  },
+
+  // 删除质量管理-质检参数
+  deleteZjProduct: async (id: number) => {
+    return await request.delete({ url: `/mes/zj-product/delete?id=` + id })
+  },
+
+  // 导出质量管理-质检参数 Excel
+  exportZjProduct: async (params) => {
+    return await request.download({ url: `/mes/zj-product/export-excel`, params })
+  },
+
+      // 获得产品质检参数明细列表
+      getZjProductByProductId: async (productId) => {
+        return await request.get({ url: `/mes/zj-product/list-by-item-product-id?productId=` + productId })
+      }
+}
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 271cdf04..3bc473da 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -114,8 +114,8 @@ export default {
     small: '小'
   },
   login: {
-    welcome: '欢迎使用本系统',
-    message: '开箱即用的中后台管理系统',
+    welcome: '欢迎使用必硕生产运营管理系统',
+    message: '必硕智能“纸”为绿色生活',
     tenantname: '租户名称',
     username: '用户名',
     password: '密码',
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 124e0578..051535cc 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -255,6 +255,7 @@ export enum DICT_TYPE {
   MES_MANTAIN_LEVEL = "mes_mantain_level",
   MOLD_GET_STATUS = "mold_get_status",
   MES_PRE_PRODUCTION = "mes_pre_production",
+  MES_ZJ_PRODUCT = "mes_zj_product",
   //====iot
   IOT_SIEMENS_TYPE = "iot_siemens_type",
   IOT_MODBUS_TYPE = "iot_modbus_type",
diff --git a/src/views/mes/feedingrecord/FeedingRecordForm.vue b/src/views/mes/feedingrecord/FeedingRecordForm.vue
index bdab575f..64af09e4 100644
--- a/src/views/mes/feedingrecord/FeedingRecordForm.vue
+++ b/src/views/mes/feedingrecord/FeedingRecordForm.vue
@@ -10,7 +10,7 @@
       <el-form-item label="单号:" prop="feedingRecordCode">
         <el-input disabled v-model="formData.feedingRecordCode" placeholder="保存自动生成单号" />
       </el-form-item>
-      <el-form-item label="制浆线:" prop="feedingPipeline">
+      <!-- <el-form-item label="制浆线:" prop="feedingPipeline">
           <el-tree-select
                   v-model="formData.feedingPipeline"
                   :data="organizationTree"
@@ -19,7 +19,23 @@
                   default-expand-all
                   placeholder="请选择制浆线"
                 />
-      </el-form-item>
+      </el-form-item> -->
+      <el-form-item label="生产计划" prop="planId">
+            <el-select
+              v-model="formData.planId"
+              @change="handleQuery"
+              clearable
+              filterable
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in planList"
+                :key="item.id"
+                :label="item.code"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
       <el-form-item prop="feedingType">
         <template #label>
             <span>
@@ -91,6 +107,8 @@ import FeedingRecordDetailForm from './components/FeedingRecordDetailForm.vue'
 import {ProductApi, ProductVO} from "@/api/erp/product/product";
 import { OrganizationApi, OrganizationVO } from '@/api/mes/organization'
 import { defaultProps, handleTree } from '@/utils/tree'
+import {PlanApi, PlanVO} from "@/api/mes/plan";
+const planList = ref<PlanVO[]>([]) // 列表
 
 /** 投料记录 表单 */
 defineOptions({ name: 'FeedingRecordForm' })
@@ -148,6 +166,7 @@ const open = async (type: string, id?: number) => {
   productList.value = await ProductApi.getMesProductSimpleList()
   // 加载组织
   await getOrganizationTree()
+  planList.value = await PlanApi.getPlanByStatus(1)
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
diff --git a/src/views/mes/feedingrecord/components/FeedingRecordDetailForm.vue b/src/views/mes/feedingrecord/components/FeedingRecordDetailForm.vue
index 0a9db05a..f431e608 100644
--- a/src/views/mes/feedingrecord/components/FeedingRecordDetailForm.vue
+++ b/src/views/mes/feedingrecord/components/FeedingRecordDetailForm.vue
@@ -55,18 +55,18 @@
           </el-form-item>
         </template>
       </el-table-column>
-      <el-table-column align="center" fixed="right" label="操作" width="60">
+      <!-- <el-table-column align="center" fixed="right" label="操作" width="60">
         <template #default="{ $index }">
           <el-button @click="handleDelete($index)" link type="danger">
             <Icon icon="ep:delete" />
           </el-button>
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
   </el-form>
-  <el-row justify="center" class="mt-3">
+  <!-- <el-row justify="center" class="mt-3">
     <el-button @click="handleAdd" round>+ 添加投料明细</el-button>
-  </el-row>
+  </el-row> -->
 </template>
 <script setup lang="ts">
 import { FeedingRecordApi } from '@/api/mes/feedingrecord'
diff --git a/src/views/mes/itemrequisition/index.vue b/src/views/mes/itemrequisition/index.vue
index d593abdd..41fd4110 100644
--- a/src/views/mes/itemrequisition/index.vue
+++ b/src/views/mes/itemrequisition/index.vue
@@ -71,12 +71,12 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <el-tabs v-model="activeName" @tab-click="handleTabClick">
+    <!-- <el-tabs v-model="activeName" @tab-click="handleTabClick">
     <el-tab-pane label="所有" name="" />
     <el-tab-pane label="下达" name="2" />
     <el-tab-pane label="投料" name="3" />
     <el-tab-pane label="完成" name="4" />
-  </el-tabs>
+  </el-tabs> -->
 
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
       <!-- 子表的列表 -->
@@ -96,9 +96,9 @@
           <dict-tag :type="DICT_TYPE.MES_PRODUCE_ITEM_REQUISITION" :value="scope.row.status" />
         </template>
       </el-table-column>
-      <el-table-column label="制浆线" align="center" prop="feedingPipelineName"/>
+      <el-table-column label="生产线" align="center" prop="feedingPipelineName"/>
+      <el-table-column label="领料人" align="center" prop="workerName"/>
       <el-table-column label="备注" align="center" prop="remark" />
-
       <el-table-column
         label="计划下料"
         align="center"
@@ -123,7 +123,15 @@
         width="180px"
         sortable
       />
-
+<el-table-column label="操作" align="center" fixed="right" width="350">
+          <el-button
+            link
+            type="primary"
+            v-hasPermi="['mes:item-requisition:update']"
+          >
+            领料
+          </el-button>
+      </el-table-column>
     </el-table>
     <!-- 分页 -->
     <Pagination
diff --git a/src/views/mes/plan/components/Baogong.vue b/src/views/mes/plan/components/Baogong.vue
new file mode 100644
index 00000000..c95b7cb7
--- /dev/null
+++ b/src/views/mes/plan/components/Baogong.vue
@@ -0,0 +1,88 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+    <el-form-item v-show="false" label="计划" prop="planId">
+        <el-input v-model="formData.planId" placeholder="请输入计划ID" />
+      </el-form-item>
+      <el-form-item label="数量" prop="num">
+        <el-input-number v-model="formData.num" placeholder="请输入数量" class="!w-240px"/>
+      </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>
+</template>
+<script setup lang="ts">
+
+
+/** 生产领料 表单 */
+defineOptions({ name: 'Baogong' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formData = ref({
+  planId: undefined,
+  num: undefined
+})
+const formRules = reactive({
+  num: [{ required: true, message: '数量不能为空', trigger: 'blur' }],
+})
+const formRef = ref() // 表单 Ref
+
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+
+  // 提交请求
+  formLoading.value = true
+  try {
+    message.success("派工成功！")
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 打开弹窗 */
+const open = async (planCode: string, planId: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = "计划报工："+planCode
+  resetForm()
+  formLoading.value = true
+  try {
+    formData.value.planId = planId
+  } finally {
+    formLoading.value = false
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    num: undefined,
+    planId: undefined,
+  }
+  formRef.value?.resetFields()
+}
+
+</script>
diff --git a/src/views/mes/plan/index.vue b/src/views/mes/plan/index.vue
index d4965f6d..f26f2e30 100644
--- a/src/views/mes/plan/index.vue
+++ b/src/views/mes/plan/index.vue
@@ -117,53 +117,58 @@
       <el-tab-pane label="试产" name="6" />
       <el-tab-pane label="量产" name="2" />
       <el-tab-pane label="暂停" name="3" />
-      <el-tab-pane label="完工" name="4" />
-      <el-tab-pane label="待入库" name="7" />
+      <el-tab-pane label="待入库" name="4" />
       <el-tab-pane label="已入库" name="5" />
     </el-tabs>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
       <!-- 投料进度子表的列表 -->
       <el-table-column  type="expand">
         <template #default="scope">
-          <el-tabs  v-if="scope.row.status > 0" model-value="itemRequisitionDetail">
+          <el-tabs  v-if="scope.row.status > 0 && scope.row.status != 6" model-value="itemRequisitionDetail">
             <el-tab-pane label="投料明细" name="itemRequisitionDetail" >
               <ItemRequisitionDetailList :item-requisition-id="scope.row.requisitionId" />
-            </el-tab-pane>
-            <el-tab-pane label="派工记录" name="paigongRecord">
+            </el-tab-pane>       
+            <!-- <el-tab-pane label="派工记录" name="paigongRecord">
               <PaigongRecordList :plan-id="scope.row.id"/>
-            </el-tab-pane>
+            </el-tab-pane> -->
           </el-tabs>
-          <el-tabs  v-if="scope.row.status == 0" model-value="paigongRecord">
+          <!-- <el-tabs  v-if="scope.row.status == 0" model-value="paigongRecord">
             <el-tab-pane label="派工记录" name="paigongRecord">
               <PaigongRecordList :plan-id="scope.row.id"/>
             </el-tab-pane>
+          </el-tabs> -->
+          <el-tabs  v-if="scope.row.status == 6" model-value="zj">
+            <el-tab-pane label="检验明细" name="zj">
+              <ZjProductPreList :product-id="scope.row.productId"/>
+            </el-tab-pane>
           </el-tabs>
         </template>
       </el-table-column>
-      <el-table-column label="计划编码" align="center" prop="code" min-width="150px" />
-      <el-table-column label="产品" align="center" prop="productName"  min-width="200px" sortable/>
+      <el-table-column label="计划编码" align="center" prop="code" min-width="180px" />
+      <el-table-column label="产品" align="center" prop="productName" min-width="200px" sortable/>
 <!--      <el-table-column label="任务单" align="center" prop="taskCode" min-width="150px" />-->
-      <el-table-column label="班别" align="center" prop="groupType" sortable>
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.MES_GROUP_TYPE" :value="scope.row.groupType" />
-        </template>
-      </el-table-column>
-      <el-table-column label="成型数量" align="center" prop="planNumber" />
-      <el-table-column label="热压数量" align="center" prop="reyaNumber" />
+      <el-table-column label="生产线" align="center" prop="feedingPipelineName"/> 
+      <el-table-column label="数量" align="center" prop="planNumber" />
+      <!-- <el-table-column label="热压数量" align="center" prop="reyaNumber" /> -->
       <el-table-column label="状态" align="center" prop="status" sortable>
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.MES_PLAN_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column>
-      <el-table-column label="计划开始时间" align="center" sortable prop="planStartTime" :formatter="dateFormatter2" width="150px"/>
-      <el-table-column label="计划结束时间" align="center" sortable prop="planEndTime" :formatter="dateFormatter2" width="150px"/>
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="领料人" align="center" prop="productionManagerName" />
-      <el-table-column label="生产线" align="center" prop="feedingPipeline">
+      <el-table-column label="班别" align="center" prop="groupType" sortable>
         <template #default="scope">
-          <dict-tag :type="DICT_TYPE.MES_FEEDING_PIPELINE" :value="scope.row.feedingPipeline" />
+          <dict-tag :type="DICT_TYPE.MES_GROUP_TYPE" :value="scope.row.groupType" />
         </template>
       </el-table-column>
+      <el-table-column label="领料人" align="center" prop="productionManagerName" />  
+      <el-table-column label="计划开始时间" align="center" sortable prop="planStartTime" :formatter="dateFormatter2" width="150px"/>
+      <el-table-column label="计划结束时间" align="center" sortable prop="planEndTime" :formatter="dateFormatter2" width="150px"/>  
+      <el-table-column label="是否检验" align="center" prop="isZj" v-if="activeName === '6'">
+      <template #default="scope">
+          <dict-tag :type="DICT_TYPE.MES_ZJ_PRODUCT" :value="scope.row.isZj" />
+        </template>  
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />  
       <el-table-column label="操作" align="center" fixed="right" width="350">
         <template #default="scope">
           <el-button
@@ -204,16 +209,43 @@
           <el-button
             link
             type="primary"
-            @click="handleStatus(scope.row.code, scope.row.id, 'start',2,'开工')"
+            @click="handleStatus(scope.row.code, scope.row.id, 'pre',6,'试产', scope.row.isZj)"
+            v-hasPermi="['mes:plan:update']"
+            v-if="scope.row.status === 1 && scope.row.isPreProduction === 1"
+          >
+            试产
+          </el-button>
+          <el-button
+            link
+            type="primary"
+            v-hasPermi="['mes:plan:update']"
+            @click="handleZjStatus(scope.row.code, scope.row.id)"
+            v-if="scope.row.status === 6"
+          >
+            检验
+          </el-button>
+          <el-button
+            link
+            type="primary"
+            @click="handleStatus(scope.row.code, scope.row.id, 'start',2,'量产', scope.row.isZj)"
+            v-hasPermi="['mes:plan:update']"
+            v-if="(scope.row.status === 1 && scope.row.isPreProduction === 0) || scope.row.status === 6"
+          >
+            量产
+          </el-button>
+          <el-button
+            link
+            type="primary"
             v-hasPermi="['mes:plan:update']"
-            v-if="scope.row.status === 1 || scope.row.status ===3 || scope.row.status ===4"
+            @click="openBaogongForm(scope.row.code, scope.row.id)"
+            v-if="scope.row.status === 2"
           >
-            开工
+            报工
           </el-button>
           <el-button
             link
             type="primary"
-            @click="handleStatus(scope.row.code,scope.row.id, 'pause',3,'暂停')"
+            @click="handleStatus(scope.row.code,scope.row.id, 'pause',3,'暂停', scope.row.isZj)"
             v-hasPermi="['mes:plan:update']"
             v-if="scope.row.status === 2"
           >
@@ -222,18 +254,27 @@
           <el-button
             link
             type="primary"
-            @click="handleStatus(scope.row.code, scope.row.id, 'end',4,'完工')"
+            @click="handleStatus(scope.row.code, scope.row.id, 'end',4,'完工', scope.row.isZj)"
             v-hasPermi="['mes:plan:update']"
             v-if="scope.row.status === 2 || scope.row.status === 3"
           >
             完工
           </el-button>
+          <el-button
+            link
+            type="primary"
+            @click="handleStatus(scope.row.code, scope.row.id, 'store',5,'入库', scope.row.isZj)"
+            v-hasPermi="['mes:plan:update']"
+            v-if="scope.row.status === 4"
+          >
+            入库
+          </el-button>
           <el-button
             link
             type="danger"
             @click="handleDelete(scope.row.id)"
             v-hasPermi="['mes:plan:delete']"
-            v-if="scope.row.status === 0 || scope.row.status === 3"
+            v-if="scope.row.status === 0"
           >
             删除
           </el-button>
@@ -259,10 +300,13 @@
 
     <!-- 工序派工弹出 -->
   <TypePaigong ref="typePaiFormRef" @success="getList" />
+
+    <!-- 报工弹出 -->
+  <Baogong ref="baogongFormRef" @success="getList" />
 </template>
 
 <script setup lang="ts">
-import { getIntDictOptions, getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
+import {  DICT_TYPE } from '@/utils/dict'
 import {dateFormatter2} from '@/utils/formatTime'
 import download from '@/utils/download'
 import { PlanApi, PlanVO } from '@/api/mes/plan'
@@ -273,13 +317,14 @@ import ItemNeedIndex from "@/views/mes/bom/ItemNeedIndex.vue";
 import Paigong from "./components/Paigong.vue";
 import TypePaigong from "./components/TypePaigong.vue";
 import ItemRequisitionDetailList from "@/views/mes/itemrequisition/components/ItemRequisitionDetailList.vue";
-import PaigongRecordList from "@/views/mes/paigongrecord/components/PaigongRecordList.vue";
+import ZjProductPreList from "@/views/mes/zjproduct/components/ZjProductPreList.vue";
 
 
 const productList = ref<ProductVO[]>([]) // 产品列表
 const taskList = ref<TaskVO[]>([]) // 列表
 /** 生产计划 列表 */
 defineOptions({ name: 'Plan' })
+const activeName = ref('1') // 列表 tab
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
@@ -381,10 +426,9 @@ onMounted(async () => {
   productList.value = await ProductApi.getMesProductSimpleList()
   taskList.value = await TaskApi.getTaskList()
   if(!query.taskId || !query.productId) {
-     queryParams.status = '0'
+     queryParams.status = '1'
   }
   await getList()
-
 })
 /** 物料需求 */
 const itemFormRef = ref()
@@ -403,10 +447,21 @@ const openTypePaiForm = (planCode: string, planId: number) => {
   typePaiFormRef.value.open(planCode, planId)
 }
 
+/** 工序派工 */
+const baogongFormRef = ref()
+const openBaogongForm = (planCode: string, planId: number) => {
+  baogongFormRef.value.open(planCode, planId)
+}
+
 /** 开工 */
 const handleStatus = async (planCode:string, id: number,
-                           type:string, status:number, tip:string) => {
+                           type:string, status:number, tip:string, isZj: number) => {
   try {
+    // if((isZj === 0 || isZj === null) && tip === "量产") {
+    //   // message.alertError("请先完成检验")
+    //   // 二次确认
+    // await message.confirm("计划："+planCode+"确定"+tip+"吗?",planCode)
+    // }
     // 二次确认
     await message.confirm("计划："+planCode+"确定"+tip+"吗?",planCode)
     // 发起
@@ -422,8 +477,23 @@ const handleStatus = async (planCode:string, id: number,
   } catch {}
 }
 
+/** 更新质检 */
+const handleZjStatus = async (planCode:string, id: number) => {
+  try {
+    // 二次确认
+    await message.confirm("计划："+planCode+"确定质检吗?",planCode)
+    // 发起
+    const data ={
+      id: id
+    }
+    await PlanApi.updatePlanZjStatus(data)
+    message.success(t('common.success'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
 /** tab 切换 */
-let activeName = '1'
 const handleTabClick = (tab: TabsPaneContext) => {
   queryParams.status = tab.paneName
   handleQuery()
diff --git a/src/views/mes/zjproduct/components/ZjProductList.vue b/src/views/mes/zjproduct/components/ZjProductList.vue
index 7b935c63..f2cdb06b 100644
--- a/src/views/mes/zjproduct/components/ZjProductList.vue
+++ b/src/views/mes/zjproduct/components/ZjProductList.vue
@@ -79,7 +79,6 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="ID" align="center" prop="id" />
       <el-table-column label="工序" align="center" prop="type">
       <template #default="scope">
           <dict-tag :type="DICT_TYPE.MES_ORG_TYPE" :value="scope.row.type" />
diff --git a/src/views/mes/zjproduct/components/ZjProductPreList.vue b/src/views/mes/zjproduct/components/ZjProductPreList.vue
new file mode 100644
index 00000000..7adca076
--- /dev/null
+++ b/src/views/mes/zjproduct/components/ZjProductPreList.vue
@@ -0,0 +1,79 @@
+<template>
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="工序" align="center" prop="type">
+      <template #default="scope">
+          <dict-tag :type="DICT_TYPE.MES_ORG_TYPE" :value="scope.row.type" />
+        </template>
+      </el-table-column>  
+      <el-table-column label="名称" align="center" prop="name" />
+      <el-table-column label="单位" align="center" prop="unit" />
+      <el-table-column label="上限值" align="center" prop="upperVal" />
+      <el-table-column label="下限值" align="center" prop="lowerVal" />
+      <el-table-column label="备注" align="center" prop="remark" />
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <ZjProductForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { dateFormatter } from '@/utils/formatTime'
+import { ZjProductApi, ZjProductVO } from '@/api/mes/zjproduct'
+import ZjProductForm from './ZjProductForm.vue'
+import {DICT_TYPE} from '@/utils/dict'
+
+/** 质量管理-质检参数 列表 */
+defineOptions({ name: 'ZjProductPreList' })
+
+const props = defineProps<{
+  productId?: number // 产品id（主表的关联字段）
+}>()
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+
+const loading = ref(false) // 列表的加载中
+const list = ref<ZjProductVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  type: undefined,
+  name: undefined,
+  unit: undefined,
+  upperVal: undefined,
+  lowerVal: undefined,
+  remark: undefined,
+  createTime: [],
+  productId: undefined
+})
+
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    list.value = await ZjProductApi.getZjProductByProductId(props.productId)
+  } finally {
+    loading.value = false
+  }
+}
+
+
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
\ No newline at end of file