diff --git a/src/api/mes/producereport/index.ts b/src/api/mes/producereport/index.ts
index 71d85397..4d5a9b7b 100644
--- a/src/api/mes/producereport/index.ts
+++ b/src/api/mes/producereport/index.ts
@@ -130,4 +130,8 @@ export const ProduceReportDetailApi = {
   exportProduceReportDetail: async (params) => {
     return await request.download({ url: `/mes/produce-report-detail/export-excel`, params })
   },
+  // 更改报工单状态
+  updateStatus: async (id: number, status:number) => {
+    return await request.get({ url: `/mes/produce-report-detail/updateStatus?id=` + id +'&status='+status})
+  },
 }
diff --git a/src/api/mes/workreportplan/index.ts b/src/api/mes/workreportplan/index.ts
new file mode 100644
index 00000000..4597d982
--- /dev/null
+++ b/src/api/mes/workreportplan/index.ts
@@ -0,0 +1,46 @@
+import request from '@/config/axios'
+
+// 报工分配计划 VO
+export interface WorkReportPlanVO {
+  id: number // id
+  reportId: number // 报工单id
+  planId: number // 计划id
+  productId: number // 产品ID
+  qualityNumberPlan: number // 成品数量
+  wasteNumberPlan: number // 废品数量
+  reportTimePlan: string // 计件时间
+  totalTimePlan: number // 总时长
+}
+
+// 报工分配计划 API
+export const WorkReportPlanApi = {
+  // 查询报工分配计划分页
+  getWorkReportPlanPage: async (params: any) => {
+    return await request.get({ url: `/mes/work-report-plan/page`, params })
+  },
+
+  // 查询报工分配计划详情
+  getWorkReportPlan: async (id: number) => {
+    return await request.get({ url: `/mes/work-report-plan/get?id=` + id })
+  },
+
+  // 新增报工分配计划
+  createWorkReportPlan: async (data: WorkReportPlanVO) => {
+    return await request.post({ url: `/mes/work-report-plan/create`, data })
+  },
+
+  // 修改报工分配计划
+  updateWorkReportPlan: async (data: WorkReportPlanVO) => {
+    return await request.put({ url: `/mes/work-report-plan/update`, data })
+  },
+
+  // 删除报工分配计划
+  deleteWorkReportPlan: async (id: number) => {
+    return await request.delete({ url: `/mes/work-report-plan/delete?id=` + id })
+  },
+
+  // 导出报工分配计划 Excel
+  exportWorkReportPlan: async (params) => {
+    return await request.download({ url: `/mes/work-report-plan/export-excel`, params })
+  }
+}
\ No newline at end of file
diff --git a/src/views/mes/producereport/ProduceReportDetailIndex.vue b/src/views/mes/producereport/ProduceReportDetailIndex.vue
index d9d4409d..a5f2975b 100644
--- a/src/views/mes/producereport/ProduceReportDetailIndex.vue
+++ b/src/views/mes/producereport/ProduceReportDetailIndex.vue
@@ -96,46 +96,73 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-tabs v-model="activeName" @tab-click="handleTabClick">
-      <el-tab-pane label="所有" name="100" />
+      <el-tab-pane label="所有" name="" />
       <el-tab-pane label="通过" name="2" />
     </el-tabs>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
 
       <el-table-column label="报工单" align="center" prop="reportId" />
-      <el-table-column label="产品" align="center" prop="productId" />
-      <el-table-column label="工人" align="center" prop="userId" />
-      <el-table-column label="工位" align="center" prop="orgId" />
-      <el-table-column label="成品数量" align="center" prop="qualityNumber" />
-      <el-table-column label="废品数量" align="center" prop="wasteNumber" />
-      <el-table-column label="总数量" align="center" prop="totalNumber" />
-      <el-table-column label="成品率%" align="center" prop="qualityRate" />
-      <el-table-column label="打包数量" align="center" prop="packageNumber" />
       <el-table-column
         label="报工日期"
         align="center"
         prop="reportDate"
         :formatter="dateFormatter2"
-        width="180px"
-      />
-      <el-table-column
-        label="创建时间"
-        align="center"
-        prop="createTime"
-        :formatter="dateFormatter"
         width="120px"
       />
+      <el-table-column label="产品" align="center" width="120px" prop="productName" />
+      <el-table-column label="工人" align="center" width="80px" prop="userName" />
+      <el-table-column label="工位" align="center" width="80px" prop="orgName" />
+      <el-table-column label="成品数量" align="center" prop="qualityNumber" />
+      <el-table-column label="废品数量" align="center" prop="wasteNumber" />
+      <el-table-column label="总数量" align="center" prop="totalNumber" />
+      <el-table-column label="成品率%" align="center" prop="qualityRate" />
+      <el-table-column label="打包数量" align="center" prop="packageNumber" />
 
       <el-table-column label="总时长" align="center" prop="totalTime" />
       <el-table-column label="计件时长" align="center" prop="reportTime" />
-      <el-table-column label="状态" align="center" prop="reportStatus">
+      <el-table-column label="废品原因" align="center" prop="wasteReason" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="状态" align="center" fixed="right" prop="reportStatus">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.MES_RECORD_STATUS" :value="scope.row.reportStatus" />
         </template>
       </el-table-column>
-      <el-table-column label="废品原因" align="center" prop="wasteReason" />
-      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="120px"
+      />
       <el-table-column label="操作" align="center" fixed="right" width="150">
         <template #default="scope">
+          <el-button
+            link
+            v-if="scope.row.reportStatus === 0"
+            type="success"
+            @click="updateStatus(scope.row.id,1,'提交')"
+            v-hasPermi="['mes:produce-report-detail:update']"
+          >
+            提交
+          </el-button>
+          <el-button
+            link
+            v-if="scope.row.reportStatus === 1"
+            type="success"
+            @click="updateStatus(scope.row.id,2,'通过')"
+            v-hasPermi="['mes:produce-report-detail:replace']"
+          >
+            通过
+          </el-button>
+          <el-button
+            link
+            v-if="scope.row.reportStatus === 1"
+            type="warning"
+            @click="updateStatus(scope.row.id,3,'驳回')"
+            v-hasPermi="['mes:produce-report-detail:update']"
+          >
+            驳回
+          </el-button>
           <el-button
             link
             type="primary"
@@ -291,8 +318,24 @@ onMounted(async () => {
   productList.value = await ProductApi.getMesProductSimpleList()
 })
 /** tab 切换 */
+let activeName = ''
 const handleTabClick = (tab: TabsPaneContext) => {
   queryParams.reportStatus = tab.paneName
   handleQuery()
 }
+
+const updateStatus = async (id:number, status:number, type:string) => {
+  try {
+    // 二次确认
+    await message.confirm('确定'+type+"该报工单吗？")
+    // 发起导出
+    const data = await ProduceReportDetailApi.updateStatus(id,status)
+    message.success(type+"报工单成功！")
+    // 刷新列表
+    await getList()
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
 </script>
diff --git a/src/views/mes/workreportplan/WorkReportPlanForm.vue b/src/views/mes/workreportplan/WorkReportPlanForm.vue
new file mode 100644
index 00000000..4da3a3e4
--- /dev/null
+++ b/src/views/mes/workreportplan/WorkReportPlanForm.vue
@@ -0,0 +1,121 @@
+<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="reportId">
+        <el-input v-model="formData.reportId" placeholder="请输入报工单id" />
+      </el-form-item>
+      <el-form-item label="计划id" prop="planId">
+        <el-input v-model="formData.planId" placeholder="请输入计划id" />
+      </el-form-item>
+      <el-form-item label="产品ID" prop="productId">
+        <el-input v-model="formData.productId" placeholder="请输入产品ID" />
+      </el-form-item>
+      <el-form-item label="成品数量" prop="qualityNumberPlan">
+        <el-input v-model="formData.qualityNumberPlan" placeholder="请输入成品数量" />
+      </el-form-item>
+      <el-form-item label="废品数量" prop="wasteNumberPlan">
+        <el-input v-model="formData.wasteNumberPlan" placeholder="请输入废品数量" />
+      </el-form-item>
+      <el-form-item label="计件时间" prop="reportTimePlan">
+        <el-input v-model="formData.reportTimePlan" placeholder="请输入计件时间" />
+      </el-form-item>
+      <el-form-item label="总时长" prop="totalTimePlan">
+        <el-input v-model="formData.totalTimePlan" 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>
+</template>
+<script setup lang="ts">
+import { WorkReportPlanApi, WorkReportPlanVO } from '@/api/mes/workreportplan'
+
+/** 报工分配计划 表单 */
+defineOptions({ name: 'WorkReportPlanForm' })
+
+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,
+  reportId: undefined,
+  planId: undefined,
+  productId: undefined,
+  qualityNumberPlan: undefined,
+  wasteNumberPlan: undefined,
+  reportTimePlan: undefined,
+  totalTimePlan: 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 WorkReportPlanApi.getWorkReportPlan(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 WorkReportPlanVO
+    if (formType.value === 'create') {
+      await WorkReportPlanApi.createWorkReportPlan(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await WorkReportPlanApi.updateWorkReportPlan(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    reportId: undefined,
+    planId: undefined,
+    productId: undefined,
+    qualityNumberPlan: undefined,
+    wasteNumberPlan: undefined,
+    reportTimePlan: undefined,
+    totalTimePlan: undefined
+  }
+  formRef.value?.resetFields()
+}
+</script>
\ No newline at end of file
diff --git a/src/views/mes/workreportplan/index.vue b/src/views/mes/workreportplan/index.vue
new file mode 100644
index 00000000..47298fcd
--- /dev/null
+++ b/src/views/mes/workreportplan/index.vue
@@ -0,0 +1,218 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="报工单id" prop="reportId">
+        <el-input
+          v-model="queryParams.reportId"
+          placeholder="请输入报工单id"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="计划id" prop="planId">
+        <el-input
+          v-model="queryParams.planId"
+          placeholder="请输入计划id"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="产品ID" prop="productId">
+        <el-input
+          v-model="queryParams.productId"
+          placeholder="请输入产品ID"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <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="['mes:work-report-plan:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['mes:work-report-plan:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <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="报工单id" align="center" prop="reportId" />
+      <el-table-column label="计划id" align="center" prop="planId" />
+      <el-table-column label="产品ID" align="center" prop="productId" />
+      <el-table-column label="成品数量" align="center" prop="qualityNumberPlan" />
+      <el-table-column label="废品数量" align="center" prop="wasteNumberPlan" />
+      <el-table-column label="计件时间" align="center" prop="reportTimePlan" />
+      <el-table-column label="总时长" align="center" prop="totalTimePlan" />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="操作" align="center">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['mes:work-report-plan:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['mes:work-report-plan:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <WorkReportPlanForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import { WorkReportPlanApi, WorkReportPlanVO } from '@/api/mes/workreportplan'
+import WorkReportPlanForm from './WorkReportPlanForm.vue'
+
+/** 报工分配计划 列表 */
+defineOptions({ name: 'WorkReportPlan' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref<WorkReportPlanVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  reportId: undefined,
+  planId: undefined,
+  productId: undefined,
+  qualityNumberPlan: undefined,
+  wasteNumberPlan: undefined,
+  reportTimePlan: undefined,
+  totalTimePlan: undefined,
+  createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await WorkReportPlanApi.getWorkReportPlanPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await WorkReportPlanApi.deleteWorkReportPlan(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await WorkReportPlanApi.exportWorkReportPlan(queryParams)
+    download.excel(data, '报工分配计划.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>