diff --git a/src/api/mes/task/index.ts b/src/api/mes/task/index.ts
index 5f9050d5..0965db3f 100644
--- a/src/api/mes/task/index.ts
+++ b/src/api/mes/task/index.ts
@@ -18,7 +18,10 @@ export const TaskApi = {
   getTaskPage: async (params: any) => {
     return await request.get({ url: `/mes/task/page`, params })
   },
-
+  // 查询生产任务单分页
+  getPlanTaskPage: async (params: any) => {
+    return await request.get({ url: `/mes/task/pagePlanTask`, params })
+  },
   // 查询生产任务单详情
   getTask: async (id: number) => {
     return await request.get({ url: `/mes/task/get?id=` + id })
@@ -76,5 +79,17 @@ export const TaskApi = {
   getTaskDetailListByTaskId: async (taskId) => {
     return await request.get({ url: `/mes/task/task-detail/list-by-task-id?taskId=` + taskId })
   },
+// 获得生产任务单明细汇总列表
+  getTaskDetailSummaryListByTaskId: async (taskId) => {
+    return await request.get({ url: `/mes/task/task-detail/summary?taskId=` + taskId })
+  },
 
+  // 获得可查询计划的生产任务单列表
+  getTaskList: async () => {
+    return await request.get({ url: `/mes/task/getTaskList`})
+  },
+  // 获得生产任务单明细
+  getPlanTaskList: async (i) => {
+    return await request.get({ url: `/mes/task/getPlanTaskList`})
+  },
 }
diff --git a/src/views/mes/bom/components/BomDetailForm.vue b/src/views/mes/bom/components/BomDetailForm.vue
index 93ffffd9..19eae9b8 100644
--- a/src/views/mes/bom/components/BomDetailForm.vue
+++ b/src/views/mes/bom/components/BomDetailForm.vue
@@ -71,9 +71,9 @@
         </template>
       </el-table-column>
       <el-table-column align="center" fixed="right" label="操作" width="60">
-        <template #default="{ $index }">
-          <el-button @click="handleDelete($index)" link>—</el-button>
-        </template>
+        <el-button type="danger" @click="handleDelete($index)" link>
+          <Icon icon="ep:delete" />
+        </el-button>
       </el-table-column>
     </el-table>
   </el-form>
diff --git a/src/views/mes/itemrequisition/components/ItemRequisitionDetailForm.vue b/src/views/mes/itemrequisition/components/ItemRequisitionDetailForm.vue
index 5372022d..19d75873 100644
--- a/src/views/mes/itemrequisition/components/ItemRequisitionDetailForm.vue
+++ b/src/views/mes/itemrequisition/components/ItemRequisitionDetailForm.vue
@@ -39,7 +39,9 @@
       </el-table-column>
       <el-table-column align="center" fixed="right" label="操作" width="60">
         <template #default="{ $index }">
-          <el-button @click="handleDelete($index)" link>—</el-button>
+          <el-button type="danger" @click="handleDelete($index)" link>
+            <Icon icon="ep:delete" />
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -113,4 +115,4 @@ const getData = () => {
 }
 
 defineExpose({ validate, getData })
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/mes/plan/PlanForm.vue b/src/views/mes/plan/PlanForm.vue
index 99064bea..66ad0e76 100644
--- a/src/views/mes/plan/PlanForm.vue
+++ b/src/views/mes/plan/PlanForm.vue
@@ -7,36 +7,45 @@
       label-width="100px"
       v-loading="formLoading"
     >
-      <el-form-item label="任务单明细" prop="taskDetailId">
-        <el-input v-model="formData.taskDetailId" placeholder="请输入任务单明细ID" />
-      </el-form-item>
-      <el-form-item label="任务单" prop="taskId">
-        <el-input v-model="formData.taskId" placeholder="请输入任务单ID" />
-      </el-form-item>
-
       <el-form-item label="计划编码" prop="code">
         <el-input v-model="formData.code" placeholder="请输入计划编码" />
       </el-form-item>
-      <el-form-item label="产品ID" prop="productId">
-        <el-input v-model="formData.productId" placeholder="请输入产品ID" />
+      <el-form-item label="任务单" prop="taskId">
+        <el-select
+          v-model="formData.taskId"
+          clearable
+          filterable
+          placeholder="请选择产品"
+          class="!w-1/1"
+        >
+          <el-option
+            v-for="item in taskList"
+            :key="item.id"
+            :label="item.code"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="产品" prop="productId">
+        <el-select
+          v-model="formData.productId"
+          clearable
+          filterable
+          placeholder="请选择产品"
+          class="!w-1/1"
+        >
+          <el-option
+            v-for="item in productList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="计划数量" prop="planNumber">
         <el-input v-model="formData.planNumber" placeholder="请输入数量" />
       </el-form-item>
-      <el-form-item label="成品数量" prop="finishNumber">
-        <el-input v-model="formData.finishNumber" placeholder="请输入成品数量" />
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-radio-group v-model="formData.status">
-          <el-radio
-            v-for="dict in getIntDictOptions(DICT_TYPE.MES_PLAN_STATUS)"
-            :key="dict.value"
-            :label="dict.value"
-          >
-            {{ dict.label }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
+
       <el-form-item label="计划开始" prop="planStartTime">
         <el-date-picker
           v-model="formData.planStartTime"
@@ -82,13 +91,18 @@
   </Dialog>
 </template>
 <script setup lang="ts">
-import { getIntDictOptions, getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
+
 import { PlanApi, PlanVO } from '@/api/mes/plan'
 import * as UserApi from "@/api/system/user";
+import {TaskApi, TaskVO} from "@/api/mes/task";
+import {ProductApi, ProductVO} from "@/api/erp/product/product";
 
 /** 生产计划 表单 */
 defineOptions({ name: 'PlanForm' })
 const userList = ref<UserApi.UserVO[]>([]) // 用户列表
+const productList = ref<ProductVO[]>([]) // 用户列表
+const taskList = ref<TaskVO[]>([]) // 用户列表
+
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
@@ -115,21 +129,24 @@ const formData = ref({
 })
 const formRules = reactive({
   productId: [{ required: true, message: '产品不能为空', trigger: 'blur' }],
-  taskDetailId: [{ required: true, message: '任务单明细不能为空', trigger: 'blur' }],
   taskId: [{ required: true, message: '任务单不能为空', trigger: 'blur' }],
   planNumber: [{ required: true, message: '计划数量不能为空', trigger: 'blur' }],
-  status: [{ required: true, message: '状态不能为空', trigger: 'blur' }],
   planStartTime: [{ required: true, message: '计划开始时间不能为空', trigger: 'blur' }],
   planEndTime: [{ required: true, message: '计划结束时间不能为空', trigger: 'blur' }],
 })
 const formRef = ref() // 表单 Ref
 
 /** 打开弹窗 */
-const open = async (type: string, id?: number) => {
+const open = async (type: string, id?: number, taskId?: number, productId?: number) => {
   dialogVisible.value = true
   dialogTitle.value = t('action.' + type)
   formType.value = type
   resetForm()
+  if(taskId)
+    formData.value.taskId = taskId
+  if(productId)
+    formData.value.productId = productId
+
   // 修改时，设置数据
   if (id) {
     formLoading.value = true
@@ -141,6 +158,10 @@ const open = async (type: string, id?: number) => {
   }
   // 加载用户列表
   userList.value = await UserApi.getSimpleUserList()
+  // 列表
+  productList.value = await ProductApi.getMesProductSimpleList()
+  // 列表
+  taskList.value = await TaskApi.getPlanTaskList()
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
diff --git a/src/views/mes/plan/index.vue b/src/views/mes/plan/index.vue
index d7c9e4f6..568196fb 100644
--- a/src/views/mes/plan/index.vue
+++ b/src/views/mes/plan/index.vue
@@ -10,13 +10,20 @@
     >
 
       <el-form-item label="任务单" prop="taskId">
-        <el-input
+        <el-select
           v-model="queryParams.taskId"
-          placeholder="请输入任务单ID"
           clearable
-          @keyup.enter="handleQuery"
+          filterable
+          placeholder="请选择"
           class="!w-240px"
-        />
+        >
+          <el-option
+            v-for="item in taskList"
+            :key="item.id"
+            :label="item.code"
+            :value="item.id"
+          />
+        </el-select>
       </el-form-item>
 
       <el-form-item label="计划编码" prop="code">
@@ -28,15 +35,23 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="产品ID" prop="productId">
-        <el-input
+      <el-form-item label="产品" prop="productId">
+        <el-select
           v-model="queryParams.productId"
-          placeholder="请输入产品ID"
           clearable
-          @keyup.enter="handleQuery"
+          filterable
+          placeholder="请选择产品"
           class="!w-240px"
-        />
+        >
+          <el-option
+            v-for="item in productList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
       </el-form-item>
+
       <el-form-item label="状态" prop="status">
         <el-select
           v-model="queryParams.status"
@@ -226,13 +241,17 @@ import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import { PlanApi, PlanVO } from '@/api/mes/plan'
 import PlanForm from './PlanForm.vue'
+import {ProductApi, ProductVO} from "@/api/erp/product/product";
+import {TaskApi, TaskVO} from "@/api/mes/task";
 
+const productList = ref<ProductVO[]>([]) // 产品列表
+const taskList = ref<TaskVO[]>([]) // 列表
 /** 生产计划 列表 */
 defineOptions({ name: 'Plan' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
-
+const {query}  = useRoute() // 查询参数
 const loading = ref(true) // 列表的加载中
 const list = ref<PlanVO[]>([]) // 列表的数据
 const total = ref(0) // 列表的总页数
@@ -317,7 +336,18 @@ const handleExport = async () => {
 }
 
 /** 初始化 **/
-onMounted(() => {
-  getList()
+onMounted(async () => {
+
+  //处理其他页面跳转过来的参数
+  if(query.taskId)
+    queryParams.taskId = String(query.taskId)
+  if(query.productId)
+    queryParams.productId = String(query.productId)
+  // 加载产品、任务单
+  productList.value = await ProductApi.getMesProductSimpleList()
+  taskList.value = await TaskApi.getTaskList()
+  await getList()
+
 })
+
 </script>
diff --git a/src/views/mes/task/components/TaskAddSaleDetailForm.vue b/src/views/mes/task/components/TaskAddSaleDetailForm.vue
index d693d85b..c27a5667 100644
--- a/src/views/mes/task/components/TaskAddSaleDetailForm.vue
+++ b/src/views/mes/task/components/TaskAddSaleDetailForm.vue
@@ -137,7 +137,9 @@
       </el-table-column>
       <el-table-column align="center" fixed="right" label="操作" width="60">
         <template #default="{ $index }">
-          <el-button @click="handleDelete($index)" link>—</el-button>
+          <el-button type="danger" @click="handleDelete($index)" link>
+            <Icon icon="ep:delete" />
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/mes/tasksummary/components/TaskDetailForm.vue b/src/views/mes/tasksummary/components/TaskDetailForm.vue
new file mode 100644
index 00000000..364ef02d
--- /dev/null
+++ b/src/views/mes/tasksummary/components/TaskDetailForm.vue
@@ -0,0 +1,210 @@
+<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="产品" prop="productId">
+        <el-select
+          v-model="formData.productId"
+          clearable
+          filterable
+          placeholder="请选择产品"
+        >
+          <el-option
+            v-for="item in productList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="单位" prop="unitId">
+        <el-select
+          v-model="formData.unitId"
+          clearable
+          filterable
+          placeholder="请选择产品"
+        >
+          <el-option
+            v-for="item in unitList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+       <el-form-item label="数量" prop="number">
+         <el-input-number
+           v-model="formData.number"
+           :min="0"
+           class="!w-1/1"
+           placeholder="请输入数量"
+         />
+      </el-form-item>
+      <el-form-item label="每包/个" prop="packageSize">
+        <el-input-number
+          v-model="formData.packageSize"
+          :min="0"
+          class="!w-1/1"
+          placeholder="请输入打包要求(每包/个)"
+        />
+      </el-form-item>
+      <el-form-item label="项目名称" prop="projectName">
+        <el-input v-model="formData.projectName" placeholder="请输入项目名称" />
+      </el-form-item>
+      <el-form-item label="技术要求" prop="techRequirements">
+        <el-input v-model="formData.techRequirements" placeholder="请输入技术要求" />
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="formData.remark" placeholder="请输入备注" />
+      </el-form-item>
+      <el-form-item label="打包数量/包" prop="packageNumber">
+        <el-input-number
+          v-model="formData.packageNumber"
+          :min="0"
+          class="!w-1/1"
+          placeholder="请输入数量"
+        />
+      </el-form-item>
+      <el-form-item label="条码" prop="barCode">
+        <el-input v-model="formData.barCode" placeholder="请输入条码" />
+      </el-form-item>
+      <el-form-item label="附件" prop="attachment">
+        <UploadFile v-model="formData.attachment" :limit="1"/>
+      </el-form-item>
+
+      <el-form-item label="工厂完成" prop="finishDate">
+        <el-date-picker
+          v-model="formData.finishDate"
+          type="date"
+          value-format="x"
+          placeholder="选择工厂完成日期"
+        />
+      </el-form-item>
+      <el-form-item label="装柜日期" prop="boxingDate">
+        <el-date-picker
+          v-model="formData.boxingDate"
+          type="date"
+          value-format="x"
+          placeholder="选择装柜日期"
+        />
+      </el-form-item>
+      <el-form-item label="到达日期" prop="arriveDate">
+        <el-date-picker
+          v-model="formData.arriveDate"
+          type="date"
+          value-format="x"
+          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 { TaskApi } from '@/api/mes/task'
+import { ProductUnitApi, ProductUnitVO } from '@/api/erp/product/unit'
+import {ProductApi, ProductVO} from "@/api/erp/product/product";
+
+const unitList = ref<ProductUnitVO[]>([]) // 产品单位列表
+const productList = ref<ProductVO[]>([]) // 产品列表
+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,
+  productId: undefined,
+  unitId: undefined,
+  taskId: undefined,
+  number: undefined,
+  packageSize: undefined,
+  projectName: undefined,
+  techRequirements: undefined,
+  remark: undefined,
+  packageNumber: undefined,
+  finishDate: undefined,
+  boxingDate: undefined,
+  arriveDate: undefined,
+})
+const formRules = reactive({
+  productId: [{ required: true, message: '产品ID不能为空', trigger: 'blur' }],
+  unitId: [{ required: true, message: '单位ID不能为空', trigger: 'blur' }],
+  taskId: [{ required: true, message: 'task ID不能为空', trigger: 'blur' }],
+  number: [{ required: true, message: '数量不能为空', trigger: 'blur' }],
+  packageSize: [{ required: true, message: '打包要求(每包/个)不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number, taskId: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  formData.value.taskId = taskId
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await TaskApi.getTaskDetail(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+  // 产品单位
+  unitList.value = await ProductUnitApi.getProductUnitSimpleList()
+  productList.value = await ProductApi.getMesProductSimpleList()
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value
+    if (formType.value === 'create') {
+      await TaskApi.createTaskDetail(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await TaskApi.updateTaskDetail(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    productId: undefined,
+    unitId: undefined,
+    taskId: undefined,
+    number: undefined,
+    packageSize: undefined,
+    projectName: undefined,
+    techRequirements: undefined,
+    remark: undefined
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/mes/tasksummary/components/TaskDetailList.vue b/src/views/mes/tasksummary/components/TaskDetailList.vue
new file mode 100644
index 00000000..eecbe89c
--- /dev/null
+++ b/src/views/mes/tasksummary/components/TaskDetailList.vue
@@ -0,0 +1,98 @@
+<template>
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="任务单" align="center" prop="taskCode" />
+      <el-table-column label="产品" align="center" prop="productName" />
+       <el-table-column label="任务总数" align="center" prop="totalNumber" />
+      <el-table-column label="已计划数" align="center" prop="planNumber" />
+      <el-table-column label="操作" align="center" width="180px">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="addPlanForm(scope.row.taskId, scope.row.productId)"
+            v-hasPermi="['mes:task:update']"
+          >
+            新增计划
+          </el-button>
+          <el-button
+            link
+            type="success"
+            @click="openPlan(scope.row.taskId, scope.row.productId)"
+            v-hasPermi="['mes:plan:query']"
+          >
+            生产计划
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+  </ContentWrap>
+  <!-- 表单弹窗：添加/修改 -->
+  <PlanForm ref="formRef" @success="getList" />
+
+</template>
+<script setup lang="ts">
+import { TaskApi } from '@/api/mes/task'
+import PlanForm from "@/views/mes/plan/PlanForm.vue";
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+const { push } = useRouter()
+const props = defineProps<{
+  taskId?: number // task ID（主表的关联字段）
+}>()
+const loading = ref(false) // 列表的加载中
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  taskId: undefined as unknown
+})
+
+/** 监听主表的关联字段的变化，加载对应的子表数据 */
+watch(
+  () => props.taskId,
+  (val: number) => {
+    if (!val) {
+      return
+    }
+    queryParams.taskId = val
+    handleQuery()
+  },
+    { immediate: true, deep: true }
+)
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    list.value = await TaskApi.getTaskDetailSummaryListByTaskId(queryParams.taskId)
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const addPlanForm = (taskId: number, productId: number) => {
+  if (!props.taskId) {
+    message.error('请选择一个生产任务单')
+    return
+  }
+  formRef.value.open('create', undefined, taskId, productId)
+}
+/** 跳转生产计划页面**/
+const openPlan = (taskId: number, productId: number) => {
+  // 跳转页面并设置请求参数，使用 `query` 属性
+  push('/mes/plan?taskId=' + taskId + '&productId=' + productId)
+
+}
+</script>
diff --git a/src/views/mes/tasksummary/index.vue b/src/views/mes/tasksummary/index.vue
new file mode 100644
index 00000000..1942af22
--- /dev/null
+++ b/src/views/mes/tasksummary/index.vue
@@ -0,0 +1,261 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="" prop="code">
+        <el-input
+          v-model="queryParams.code"
+          placeholder="请输入编码"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="下达" prop="orderDate">
+        <el-date-picker
+          v-model="queryParams.orderDate"
+          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 label="交货" prop="deliveryDate">
+        <el-date-picker
+          v-model="queryParams.deliveryDate"
+          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 label="" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择状态"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.MES_TASK_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="备注" prop="remark">
+        <el-input
+          v-model="queryParams.remark"
+          placeholder="请输入备注"
+          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:task:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['mes:task: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"
+      highlight-current-row
+      @current-change="handleCurrentChange"
+    >
+      <el-table-column label="任务单" align="center" prop="code" />
+      <el-table-column label="下达日期" align="center" prop="orderDate" :formatter="dateFormatter2" />
+      <el-table-column label="交货日期" align="center" prop="deliveryDate" :formatter="dateFormatter2"/>
+      <el-table-column label="状态" align="center" prop="status">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.MES_TASK_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />
+
+      <el-table-column label="操作" align="center" min-width="200px">
+        <template #default="scope">
+
+          <el-button
+            link
+            type="success"
+            v-hasPermi="['mes:task:update']"
+          >
+            物料
+          </el-button>
+
+          <el-button
+            link
+            type="success"
+            @click="openPlan(scope.row.id)"
+            v-hasPermi="['mes:plan:query']"
+          >
+            生产计划
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 子表的列表 -->
+  <ContentWrap>
+    <el-tabs model-value="taskDetail">
+      <el-tab-pane label="任务单汇总明细" name="taskDetail">
+        <TaskDetailList :task-id="currentRow.id" />
+      </el-tab-pane>
+    </el-tabs>
+  </ContentWrap>
+</template>
+
+<script setup lang="ts">
+import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
+import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
+import download from '@/utils/download'
+import { TaskApi, TaskVO } from '@/api/mes/task'
+import TaskDetailList from './components/TaskDetailList.vue'
+
+/** 生产任务单 列表 */
+defineOptions({ name: 'Task' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref<TaskVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  code: undefined,
+  orderDate: [],
+  deliveryDate: [],
+  status: undefined,
+  processInstanceId: undefined,
+  remark: undefined,
+  createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+const { push } = useRouter()
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await TaskApi.getPlanTaskPage(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 handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await TaskApi.deleteTask(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await TaskApi.exportTask(queryParams)
+    download.excel(data, '生产任务单.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 选中行操作 */
+const currentRow = ref({}) // 选中行
+const handleCurrentChange = (row) => {
+  currentRow.value = row
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+/** 跳转生产计划页面**/
+const openPlan = (taskId: number) => {
+  // 跳转页面并设置请求参数，使用 `query` 属性
+  push('/mes/plan?taskId=' + taskId)
+}
+
+</script>