diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index 58c0ea9..a253b6d 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -191,6 +191,18 @@
               activeMenu: '/meteringdept',
             },
           },
+          {
+            path: '/meteringdept/:type',
+            name: 'MeteringdetEdit',
+            component: () => import('@/views/tested/MeasurementPlan/dept/components/edit.vue'),
+            meta: {
+              title: '部门送检通知编辑',
+              auth: '/tested/metering/dept',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/meteringdept',
+            },
+          },
         ],
       },
       {
@@ -216,6 +228,18 @@
               activeMenu: '/meteringtask',
             },
           },
+          {
+            path: '/meteringtask/:type',
+            name: 'MeteringtaskEdit',
+            component: () => import('@/views/tested/MeasurementPlan/task/components/edit.vue'),
+            meta: {
+              title: '任务单管理编辑',
+              auth: '/tested/metering/task',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/meteringtask',
+            },
+          },
         ],
       },
     ],

diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index 58c0ea9..a253b6d 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -191,6 +191,18 @@
               activeMenu: '/meteringdept',
             },
           },
+          {
+            path: '/meteringdept/:type',
+            name: 'MeteringdetEdit',
+            component: () => import('@/views/tested/MeasurementPlan/dept/components/edit.vue'),
+            meta: {
+              title: '部门送检通知编辑',
+              auth: '/tested/metering/dept',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/meteringdept',
+            },
+          },
         ],
       },
       {
@@ -216,6 +228,18 @@
               activeMenu: '/meteringtask',
             },
           },
+          {
+            path: '/meteringtask/:type',
+            name: 'MeteringtaskEdit',
+            component: () => import('@/views/tested/MeasurementPlan/task/components/edit.vue'),
+            meta: {
+              title: '任务单管理编辑',
+              auth: '/tested/metering/task',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/meteringtask',
+            },
+          },
         ],
       },
     ],
diff --git a/src/views/tested/MeasurementPlan/dept/components/edit.vue b/src/views/tested/MeasurementPlan/dept/components/edit.vue
new file mode 100644
index 0000000..99f02b1
--- /dev/null
+++ b/src/views/tested/MeasurementPlan/dept/components/edit.vue
@@ -0,0 +1,181 @@
+<!-- 设备分组信息-编辑 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import tableList from './tableList.vue'
+import { getDictByCode } from '@/api/system/dict'
+import useUserStore from '@/store/modules/user'
+const $route = useRoute()
+const $router = useRouter()
+const userStore = useUserStore()
+const ruleFormRef = ref<FormInstance>() // from组件
+const statusName = $route.query.statusName as string
+const title = ref('')
+// 显示标题
+const textMap: { [key: string]: string } = {
+  update: '编辑',
+  create: '新增',
+  detail: '详情',
+}
+// 对话框类型：create,update
+const dialogStatus = ref('create')
+const ruleForm = ref({
+}) // 表单
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称必填', trigger: 'blur' }],
+}) // 表单验证规则
+// 弹窗初始化
+const initDialog = () => {
+  dialogStatus.value = $route.params.type as string
+  ruleFormRef.value?.resetFields()
+  if ($route.params.type === 'create') {
+    // ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+  }
+  else {
+    ruleForm.value = JSON.parse($route.query.row as string)
+    // getInfoDetail({ equipmentId: $route.query.id as string }).then(res => {
+    //   ruleForm.value = res.data
+    // })
+  }
+}
+onMounted(() => {
+  initDialog()
+})
+// 关闭弹窗
+const close = () => {
+  $router.back()
+}
+// 保存
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        ruleForm.value.attachments = tableRef.value.list
+        ruleForm.value.technicalTargetList = technologyRef.value.list
+        editInfo(ruleForm.value).then((res) => {
+          console.log(res.data, '123')
+          ElMessage.success('保存成功')
+          submitId.value = res.data
+        })
+      })
+    }
+  })
+}
+// 提交
+const submitForm = () => {
+  if (!submitId.value) {
+    ElMessage.warning('请先保存')
+    return false
+  }
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    submitInfo({ id: submitId.value, formId: SCHEDULE.DEVICE_INFO_APPROVAL }).then((res) => {
+      ElMessage.success('已提交')
+      close()
+    })
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+}
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <approval-dialog ref="approvalDialogRef" @on-success="() => { $router.back() }" />
+    <detail-page title="部门送检通知">
+      <template #btns>
+        <el-button v-if="statusName !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-com>
+      <div class="tips">
+        您部门负责的设备已到检定/校准期，为了保证我单位设备的合格率，请于接到本通知之日起，在检定的年/季/月内将设备及时送检。若有提前/延迟送检需求，请及时提交申请。谢谢您的合作!
+      </div>
+      <div class="tips" style="height: 15px;line-height: 15px;" />
+    </detail-block-com>
+    <detail-block-com>
+      <el-form label-position="right" label-width="110px" class="form">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="通知编号">
+              <el-input v-model.trim="ruleForm.approvalTypeName" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="通知名称">
+              <el-input v-model.trim="ruleForm.createUserName" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计划分类">
+              <el-input v-model.trim="ruleForm.createTime" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="创建单位">
+              <el-input v-model.trim="ruleForm.createUserName" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人">
+              <el-input v-model.trim="ruleForm.createTime" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建时间">
+              <el-input v-model.trim="ruleForm.createUserName" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="18">
+            <el-form-item label="备注">
+              <el-input v-model.trim="ruleForm.createUserName" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-com>
+    <detail-block-com>
+      <table-list />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.tips {
+  height: 25px;
+  line-height: 25px;
+  padding: 10px;
+  padding-top: 0;
+  padding-bottom: 0;
+}
+</style>

diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index 58c0ea9..a253b6d 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -191,6 +191,18 @@
               activeMenu: '/meteringdept',
             },
           },
+          {
+            path: '/meteringdept/:type',
+            name: 'MeteringdetEdit',
+            component: () => import('@/views/tested/MeasurementPlan/dept/components/edit.vue'),
+            meta: {
+              title: '部门送检通知编辑',
+              auth: '/tested/metering/dept',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/meteringdept',
+            },
+          },
         ],
       },
       {
@@ -216,6 +228,18 @@
               activeMenu: '/meteringtask',
             },
           },
+          {
+            path: '/meteringtask/:type',
+            name: 'MeteringtaskEdit',
+            component: () => import('@/views/tested/MeasurementPlan/task/components/edit.vue'),
+            meta: {
+              title: '任务单管理编辑',
+              auth: '/tested/metering/task',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/meteringtask',
+            },
+          },
         ],
       },
     ],
diff --git a/src/views/tested/MeasurementPlan/dept/components/edit.vue b/src/views/tested/MeasurementPlan/dept/components/edit.vue
new file mode 100644
index 0000000..99f02b1
--- /dev/null
+++ b/src/views/tested/MeasurementPlan/dept/components/edit.vue
@@ -0,0 +1,181 @@
+<!-- 设备分组信息-编辑 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import tableList from './tableList.vue'
+import { getDictByCode } from '@/api/system/dict'
+import useUserStore from '@/store/modules/user'
+const $route = useRoute()
+const $router = useRouter()
+const userStore = useUserStore()
+const ruleFormRef = ref<FormInstance>() // from组件
+const statusName = $route.query.statusName as string
+const title = ref('')
+// 显示标题
+const textMap: { [key: string]: string } = {
+  update: '编辑',
+  create: '新增',
+  detail: '详情',
+}
+// 对话框类型：create,update
+const dialogStatus = ref('create')
+const ruleForm = ref({
+}) // 表单
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称必填', trigger: 'blur' }],
+}) // 表单验证规则
+// 弹窗初始化
+const initDialog = () => {
+  dialogStatus.value = $route.params.type as string
+  ruleFormRef.value?.resetFields()
+  if ($route.params.type === 'create') {
+    // ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+  }
+  else {
+    ruleForm.value = JSON.parse($route.query.row as string)
+    // getInfoDetail({ equipmentId: $route.query.id as string }).then(res => {
+    //   ruleForm.value = res.data
+    // })
+  }
+}
+onMounted(() => {
+  initDialog()
+})
+// 关闭弹窗
+const close = () => {
+  $router.back()
+}
+// 保存
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        ruleForm.value.attachments = tableRef.value.list
+        ruleForm.value.technicalTargetList = technologyRef.value.list
+        editInfo(ruleForm.value).then((res) => {
+          console.log(res.data, '123')
+          ElMessage.success('保存成功')
+          submitId.value = res.data
+        })
+      })
+    }
+  })
+}
+// 提交
+const submitForm = () => {
+  if (!submitId.value) {
+    ElMessage.warning('请先保存')
+    return false
+  }
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    submitInfo({ id: submitId.value, formId: SCHEDULE.DEVICE_INFO_APPROVAL }).then((res) => {
+      ElMessage.success('已提交')
+      close()
+    })
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+}
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <approval-dialog ref="approvalDialogRef" @on-success="() => { $router.back() }" />
+    <detail-page title="部门送检通知">
+      <template #btns>
+        <el-button v-if="statusName !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-com>
+      <div class="tips">
+        您部门负责的设备已到检定/校准期，为了保证我单位设备的合格率，请于接到本通知之日起，在检定的年/季/月内将设备及时送检。若有提前/延迟送检需求，请及时提交申请。谢谢您的合作!
+      </div>
+      <div class="tips" style="height: 15px;line-height: 15px;" />
+    </detail-block-com>
+    <detail-block-com>
+      <el-form label-position="right" label-width="110px" class="form">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="通知编号">
+              <el-input v-model.trim="ruleForm.approvalTypeName" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="通知名称">
+              <el-input v-model.trim="ruleForm.createUserName" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计划分类">
+              <el-input v-model.trim="ruleForm.createTime" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="创建单位">
+              <el-input v-model.trim="ruleForm.createUserName" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人">
+              <el-input v-model.trim="ruleForm.createTime" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建时间">
+              <el-input v-model.trim="ruleForm.createUserName" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="18">
+            <el-form-item label="备注">
+              <el-input v-model.trim="ruleForm.createUserName" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-com>
+    <detail-block-com>
+      <table-list />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.tips {
+  height: 25px;
+  line-height: 25px;
+  padding: 10px;
+  padding-top: 0;
+  padding-bottom: 0;
+}
+</style>
diff --git a/src/views/tested/MeasurementPlan/dept/components/tableList.vue b/src/views/tested/MeasurementPlan/dept/components/tableList.vue
new file mode 100644
index 0000000..856bb1d
--- /dev/null
+++ b/src/views/tested/MeasurementPlan/dept/components/tableList.vue
@@ -0,0 +1,150 @@
+<!-- 任务单列表 -->
+<script lang="ts" setup name="EditPlatform">
+import { ElMessage, ElMessageBox } from 'element-plus'
+const columns = ref([
+  {
+    text: '统一编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '型号规格',
+    value: 'model',
+    align: 'center',
+  },
+  {
+    text: '使用部门',
+    value: 'succeed',
+    align: 'center',
+  },
+  {
+    text: '使用岗位',
+    value: 'usePosition',
+    align: 'center',
+  },
+  {
+    text: '检定(校准)单位',
+    value: 'meterIdentify',
+    align: 'center',
+  },
+  {
+    text: '证书有效期',
+    value: 'checkCycle',
+    align: 'center',
+  },
+  {
+    text: '执行状态',
+    value: 'certificateValid',
+    align: 'center',
+  },
+  {
+    text: '执行时间',
+    value: 'certificateValid',
+    align: 'center',
+  },
+  {
+    text: '检定完成度',
+    value: 'certificateValid',
+    align: 'center',
+  },
+  {
+    text: '检定完成时间',
+    value: 'certificateValid',
+    align: 'center',
+  },
+])
+
+// 获取聚合表格数据
+const togetherLoading = ref(false)
+const togetherList = ref([])
+const fetchTogetherData = () => {
+  togetherLoading.value = false
+  // getInfoListTogether(listQuery).then((res) => {
+  //   togetherList.value = res.data
+  //   togetherLoading.value = false
+  // })
+}
+// 获取展开行内表格数据
+const expandLoading = ref(true)
+const expandList = ref([])
+const fetchExpandData = (params: any) => {
+  expandLoading.value = false
+  // getInfoList(params).then((res) => {
+  //   expandList.value = res.data
+  //   expandLoading.value = false
+  // })
+}
+const getRowKeys = (row: any) => { // 获取当前行id
+  return row.equipmentName // 这里看这一行中需要根据哪个属性值是id
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+// 控制展开行
+const expands = ref()
+const expandChange = (row: any, expandedRows: any) => {
+  if (expandedRows.length) {
+    expands.value = []
+    if (row) {
+      expands.value.push(row.equipmentName)
+    }
+  }
+  else {
+    expands.value = []
+  }
+}
+watch(() => expands.value, (newVal) => {
+  fetchExpandData({ equipmentName: newVal[0] })
+},
+{
+  deep: true,
+})
+</script>
+
+<template>
+  <detail-block-switch title="任务单列表">
+    <table-container>
+      <!-- 展开行表格 -->
+      <normal-table
+        class="nortable-header" :data="[]" :total="0" :columns="columns" :options="{
+          needIndex: false, // 是否需要序号列
+          border: true, // 是否需要上方边框
+        }
+        " :pagination="false" :is-showmulti-select="true"
+      />
+      <el-table
+        v-loading="togetherLoading" :data="togetherList" border style="width: 100%;" :row-key="getRowKeys"
+        :expand-row-keys="expands" :show-header="false" @expand-change="expandChange"
+      >
+        <el-table-column type="expand">
+          <template #default="props">
+            <normal-table
+              :data="list" :total="total" :columns="columns" :list-loading="expandLoading" :options="{
+                needIndex: false, // 是否需要序号列
+                border: true, // 是否需要上方边框
+              }
+              " :pagination="false" :is-showmulti-select="true" :show-header="false"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="设备名称" prop="equipmentName" align="center" />
+        <el-table-column label="数量" align="center">
+          <template #default="scope">
+            共计{{ scope.row.count }}台
+          </template>
+        </el-table-column>
+      </el-table>
+    </table-container>
+  </detail-block-switch>
+</template>
+
+<style lang="scss" scoped>
+.nortable-header {
+  ::v-deep(.el-table__body-wrapper) {
+    display: none;
+  }
+}
+</style>

diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index 58c0ea9..a253b6d 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -191,6 +191,18 @@
               activeMenu: '/meteringdept',
             },
           },
+          {
+            path: '/meteringdept/:type',
+            name: 'MeteringdetEdit',
+            component: () => import('@/views/tested/MeasurementPlan/dept/components/edit.vue'),
+            meta: {
+              title: '部门送检通知编辑',
+              auth: '/tested/metering/dept',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/meteringdept',
+            },
+          },
         ],
       },
       {
@@ -216,6 +228,18 @@
               activeMenu: '/meteringtask',
             },
           },
+          {
+            path: '/meteringtask/:type',
+            name: 'MeteringtaskEdit',
+            component: () => import('@/views/tested/MeasurementPlan/task/components/edit.vue'),
+            meta: {
+              title: '任务单管理编辑',
+              auth: '/tested/metering/task',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/meteringtask',
+            },
+          },
         ],
       },
     ],
diff --git a/src/views/tested/MeasurementPlan/dept/components/edit.vue b/src/views/tested/MeasurementPlan/dept/components/edit.vue
new file mode 100644
index 0000000..99f02b1
--- /dev/null
+++ b/src/views/tested/MeasurementPlan/dept/components/edit.vue
@@ -0,0 +1,181 @@
+<!-- 设备分组信息-编辑 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import tableList from './tableList.vue'
+import { getDictByCode } from '@/api/system/dict'
+import useUserStore from '@/store/modules/user'
+const $route = useRoute()
+const $router = useRouter()
+const userStore = useUserStore()
+const ruleFormRef = ref<FormInstance>() // from组件
+const statusName = $route.query.statusName as string
+const title = ref('')
+// 显示标题
+const textMap: { [key: string]: string } = {
+  update: '编辑',
+  create: '新增',
+  detail: '详情',
+}
+// 对话框类型：create,update
+const dialogStatus = ref('create')
+const ruleForm = ref({
+}) // 表单
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称必填', trigger: 'blur' }],
+}) // 表单验证规则
+// 弹窗初始化
+const initDialog = () => {
+  dialogStatus.value = $route.params.type as string
+  ruleFormRef.value?.resetFields()
+  if ($route.params.type === 'create') {
+    // ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+  }
+  else {
+    ruleForm.value = JSON.parse($route.query.row as string)
+    // getInfoDetail({ equipmentId: $route.query.id as string }).then(res => {
+    //   ruleForm.value = res.data
+    // })
+  }
+}
+onMounted(() => {
+  initDialog()
+})
+// 关闭弹窗
+const close = () => {
+  $router.back()
+}
+// 保存
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        ruleForm.value.attachments = tableRef.value.list
+        ruleForm.value.technicalTargetList = technologyRef.value.list
+        editInfo(ruleForm.value).then((res) => {
+          console.log(res.data, '123')
+          ElMessage.success('保存成功')
+          submitId.value = res.data
+        })
+      })
+    }
+  })
+}
+// 提交
+const submitForm = () => {
+  if (!submitId.value) {
+    ElMessage.warning('请先保存')
+    return false
+  }
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    submitInfo({ id: submitId.value, formId: SCHEDULE.DEVICE_INFO_APPROVAL }).then((res) => {
+      ElMessage.success('已提交')
+      close()
+    })
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+}
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <approval-dialog ref="approvalDialogRef" @on-success="() => { $router.back() }" />
+    <detail-page title="部门送检通知">
+      <template #btns>
+        <el-button v-if="statusName !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-com>
+      <div class="tips">
+        您部门负责的设备已到检定/校准期，为了保证我单位设备的合格率，请于接到本通知之日起，在检定的年/季/月内将设备及时送检。若有提前/延迟送检需求，请及时提交申请。谢谢您的合作!
+      </div>
+      <div class="tips" style="height: 15px;line-height: 15px;" />
+    </detail-block-com>
+    <detail-block-com>
+      <el-form label-position="right" label-width="110px" class="form">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="通知编号">
+              <el-input v-model.trim="ruleForm.approvalTypeName" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="通知名称">
+              <el-input v-model.trim="ruleForm.createUserName" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计划分类">
+              <el-input v-model.trim="ruleForm.createTime" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="创建单位">
+              <el-input v-model.trim="ruleForm.createUserName" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人">
+              <el-input v-model.trim="ruleForm.createTime" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建时间">
+              <el-input v-model.trim="ruleForm.createUserName" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="18">
+            <el-form-item label="备注">
+              <el-input v-model.trim="ruleForm.createUserName" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-com>
+    <detail-block-com>
+      <table-list />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.tips {
+  height: 25px;
+  line-height: 25px;
+  padding: 10px;
+  padding-top: 0;
+  padding-bottom: 0;
+}
+</style>
diff --git a/src/views/tested/MeasurementPlan/dept/components/tableList.vue b/src/views/tested/MeasurementPlan/dept/components/tableList.vue
new file mode 100644
index 0000000..856bb1d
--- /dev/null
+++ b/src/views/tested/MeasurementPlan/dept/components/tableList.vue
@@ -0,0 +1,150 @@
+<!-- 任务单列表 -->
+<script lang="ts" setup name="EditPlatform">
+import { ElMessage, ElMessageBox } from 'element-plus'
+const columns = ref([
+  {
+    text: '统一编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '型号规格',
+    value: 'model',
+    align: 'center',
+  },
+  {
+    text: '使用部门',
+    value: 'succeed',
+    align: 'center',
+  },
+  {
+    text: '使用岗位',
+    value: 'usePosition',
+    align: 'center',
+  },
+  {
+    text: '检定(校准)单位',
+    value: 'meterIdentify',
+    align: 'center',
+  },
+  {
+    text: '证书有效期',
+    value: 'checkCycle',
+    align: 'center',
+  },
+  {
+    text: '执行状态',
+    value: 'certificateValid',
+    align: 'center',
+  },
+  {
+    text: '执行时间',
+    value: 'certificateValid',
+    align: 'center',
+  },
+  {
+    text: '检定完成度',
+    value: 'certificateValid',
+    align: 'center',
+  },
+  {
+    text: '检定完成时间',
+    value: 'certificateValid',
+    align: 'center',
+  },
+])
+
+// 获取聚合表格数据
+const togetherLoading = ref(false)
+const togetherList = ref([])
+const fetchTogetherData = () => {
+  togetherLoading.value = false
+  // getInfoListTogether(listQuery).then((res) => {
+  //   togetherList.value = res.data
+  //   togetherLoading.value = false
+  // })
+}
+// 获取展开行内表格数据
+const expandLoading = ref(true)
+const expandList = ref([])
+const fetchExpandData = (params: any) => {
+  expandLoading.value = false
+  // getInfoList(params).then((res) => {
+  //   expandList.value = res.data
+  //   expandLoading.value = false
+  // })
+}
+const getRowKeys = (row: any) => { // 获取当前行id
+  return row.equipmentName // 这里看这一行中需要根据哪个属性值是id
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+// 控制展开行
+const expands = ref()
+const expandChange = (row: any, expandedRows: any) => {
+  if (expandedRows.length) {
+    expands.value = []
+    if (row) {
+      expands.value.push(row.equipmentName)
+    }
+  }
+  else {
+    expands.value = []
+  }
+}
+watch(() => expands.value, (newVal) => {
+  fetchExpandData({ equipmentName: newVal[0] })
+},
+{
+  deep: true,
+})
+</script>
+
+<template>
+  <detail-block-switch title="任务单列表">
+    <table-container>
+      <!-- 展开行表格 -->
+      <normal-table
+        class="nortable-header" :data="[]" :total="0" :columns="columns" :options="{
+          needIndex: false, // 是否需要序号列
+          border: true, // 是否需要上方边框
+        }
+        " :pagination="false" :is-showmulti-select="true"
+      />
+      <el-table
+        v-loading="togetherLoading" :data="togetherList" border style="width: 100%;" :row-key="getRowKeys"
+        :expand-row-keys="expands" :show-header="false" @expand-change="expandChange"
+      >
+        <el-table-column type="expand">
+          <template #default="props">
+            <normal-table
+              :data="list" :total="total" :columns="columns" :list-loading="expandLoading" :options="{
+                needIndex: false, // 是否需要序号列
+                border: true, // 是否需要上方边框
+              }
+              " :pagination="false" :is-showmulti-select="true" :show-header="false"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="设备名称" prop="equipmentName" align="center" />
+        <el-table-column label="数量" align="center">
+          <template #default="scope">
+            共计{{ scope.row.count }}台
+          </template>
+        </el-table-column>
+      </el-table>
+    </table-container>
+  </detail-block-switch>
+</template>
+
+<style lang="scss" scoped>
+.nortable-header {
+  ::v-deep(.el-table__body-wrapper) {
+    display: none;
+  }
+}
+</style>
diff --git a/src/views/tested/MeasurementPlan/dept/index.vue b/src/views/tested/MeasurementPlan/dept/index.vue
index 9569a89..80e7a89 100644
--- a/src/views/tested/MeasurementPlan/dept/index.vue
+++ b/src/views/tested/MeasurementPlan/dept/index.vue
@@ -1,3 +1,144 @@
+<!-- 部门送检通知表格 -->
+<script lang="ts" setup name="LoginLog">
+import { reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+const { proxy } = getCurrentInstance() as any
+const listQuery = reactive({
+  groupName: '',
+  offset: 1,
+  limit: 10,
+})
+const columns = ref([
+  {
+    text: '通知编号',
+    value: 'groupName',
+    align: 'center',
+  },
+  {
+    text: '通知名称',
+    value: 'createUserName',
+    align: 'center',
+  },
+  {
+    text: '计划分类',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '创建单位',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '创建人',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '创建时间',
+    value: 'remark',
+    align: 'center',
+  },
+])
+const list = ref([])
+const total = ref(0)
+const listLoading = ref(true)
+
+// 获取数据
+const fetchData = (isNowPage = true) => {
+  listLoading.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  // getInfoListPage(listQuery, $props.statusName).then((response) => {
+  //   list.value = response.data.rows
+  //   total.value = parseInt(response.data.total)
+  //   listLoading.value = false
+  // })
+  listLoading.value = false
+}
+fetchData()
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+const $router = useRouter()
+// 新建编辑操作
+const handler = (row: any, type: string) => {
+  $router.push({
+    path: `/meteringdept/${type}`,
+    query: {
+      row: JSON.stringify(row),
+      id: row.id,
+    },
+  })
+}
+// 删除
+const delHandler = (row: any) => {
+  ElMessageBox.confirm(
+    '确认取消此任务单信息吗?',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    // deleteInfo({ id: row.id }).then((res) => {
+    //   ElMessage.success('操作成功')
+    //   close()
+    // })
+  })
+}
+</script>
+
 <template>
-  部门送检通知
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="分组名称" clearable />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-add" title="新增" @click="handler({}, 'create')" />
+      </template>
+      <!-- 普通表格 -->
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :is-showmulti-select="true" @change="changePage"
+      >
+        <template #columns>
+          <el-table-column label="操作" width="140" align="center">
+            <template #default="scope">
+              <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
+                查看
+              </el-button>
+              <!-- <el-button link type="primary" size="small" @click="handler(scope.row, 'update')">
+                编辑
+              </el-button>
+              <el-button link type="danger" size="small" @click="delHandler(scope.row)">
+                取消
+              </el-button> -->
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
+
+

diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index 58c0ea9..a253b6d 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -191,6 +191,18 @@
               activeMenu: '/meteringdept',
             },
           },
+          {
+            path: '/meteringdept/:type',
+            name: 'MeteringdetEdit',
+            component: () => import('@/views/tested/MeasurementPlan/dept/components/edit.vue'),
+            meta: {
+              title: '部门送检通知编辑',
+              auth: '/tested/metering/dept',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/meteringdept',
+            },
+          },
         ],
       },
       {
@@ -216,6 +228,18 @@
               activeMenu: '/meteringtask',
             },
           },
+          {
+            path: '/meteringtask/:type',
+            name: 'MeteringtaskEdit',
+            component: () => import('@/views/tested/MeasurementPlan/task/components/edit.vue'),
+            meta: {
+              title: '任务单管理编辑',
+              auth: '/tested/metering/task',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/meteringtask',
+            },
+          },
         ],
       },
     ],
diff --git a/src/views/tested/MeasurementPlan/dept/components/edit.vue b/src/views/tested/MeasurementPlan/dept/components/edit.vue
new file mode 100644
index 0000000..99f02b1
--- /dev/null
+++ b/src/views/tested/MeasurementPlan/dept/components/edit.vue
@@ -0,0 +1,181 @@
+<!-- 设备分组信息-编辑 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import tableList from './tableList.vue'
+import { getDictByCode } from '@/api/system/dict'
+import useUserStore from '@/store/modules/user'
+const $route = useRoute()
+const $router = useRouter()
+const userStore = useUserStore()
+const ruleFormRef = ref<FormInstance>() // from组件
+const statusName = $route.query.statusName as string
+const title = ref('')
+// 显示标题
+const textMap: { [key: string]: string } = {
+  update: '编辑',
+  create: '新增',
+  detail: '详情',
+}
+// 对话框类型：create,update
+const dialogStatus = ref('create')
+const ruleForm = ref({
+}) // 表单
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称必填', trigger: 'blur' }],
+}) // 表单验证规则
+// 弹窗初始化
+const initDialog = () => {
+  dialogStatus.value = $route.params.type as string
+  ruleFormRef.value?.resetFields()
+  if ($route.params.type === 'create') {
+    // ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+  }
+  else {
+    ruleForm.value = JSON.parse($route.query.row as string)
+    // getInfoDetail({ equipmentId: $route.query.id as string }).then(res => {
+    //   ruleForm.value = res.data
+    // })
+  }
+}
+onMounted(() => {
+  initDialog()
+})
+// 关闭弹窗
+const close = () => {
+  $router.back()
+}
+// 保存
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        ruleForm.value.attachments = tableRef.value.list
+        ruleForm.value.technicalTargetList = technologyRef.value.list
+        editInfo(ruleForm.value).then((res) => {
+          console.log(res.data, '123')
+          ElMessage.success('保存成功')
+          submitId.value = res.data
+        })
+      })
+    }
+  })
+}
+// 提交
+const submitForm = () => {
+  if (!submitId.value) {
+    ElMessage.warning('请先保存')
+    return false
+  }
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    submitInfo({ id: submitId.value, formId: SCHEDULE.DEVICE_INFO_APPROVAL }).then((res) => {
+      ElMessage.success('已提交')
+      close()
+    })
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+}
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <approval-dialog ref="approvalDialogRef" @on-success="() => { $router.back() }" />
+    <detail-page title="部门送检通知">
+      <template #btns>
+        <el-button v-if="statusName !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-com>
+      <div class="tips">
+        您部门负责的设备已到检定/校准期，为了保证我单位设备的合格率，请于接到本通知之日起，在检定的年/季/月内将设备及时送检。若有提前/延迟送检需求，请及时提交申请。谢谢您的合作!
+      </div>
+      <div class="tips" style="height: 15px;line-height: 15px;" />
+    </detail-block-com>
+    <detail-block-com>
+      <el-form label-position="right" label-width="110px" class="form">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="通知编号">
+              <el-input v-model.trim="ruleForm.approvalTypeName" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="通知名称">
+              <el-input v-model.trim="ruleForm.createUserName" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计划分类">
+              <el-input v-model.trim="ruleForm.createTime" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="创建单位">
+              <el-input v-model.trim="ruleForm.createUserName" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人">
+              <el-input v-model.trim="ruleForm.createTime" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建时间">
+              <el-input v-model.trim="ruleForm.createUserName" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="18">
+            <el-form-item label="备注">
+              <el-input v-model.trim="ruleForm.createUserName" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-com>
+    <detail-block-com>
+      <table-list />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.tips {
+  height: 25px;
+  line-height: 25px;
+  padding: 10px;
+  padding-top: 0;
+  padding-bottom: 0;
+}
+</style>
diff --git a/src/views/tested/MeasurementPlan/dept/components/tableList.vue b/src/views/tested/MeasurementPlan/dept/components/tableList.vue
new file mode 100644
index 0000000..856bb1d
--- /dev/null
+++ b/src/views/tested/MeasurementPlan/dept/components/tableList.vue
@@ -0,0 +1,150 @@
+<!-- 任务单列表 -->
+<script lang="ts" setup name="EditPlatform">
+import { ElMessage, ElMessageBox } from 'element-plus'
+const columns = ref([
+  {
+    text: '统一编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '型号规格',
+    value: 'model',
+    align: 'center',
+  },
+  {
+    text: '使用部门',
+    value: 'succeed',
+    align: 'center',
+  },
+  {
+    text: '使用岗位',
+    value: 'usePosition',
+    align: 'center',
+  },
+  {
+    text: '检定(校准)单位',
+    value: 'meterIdentify',
+    align: 'center',
+  },
+  {
+    text: '证书有效期',
+    value: 'checkCycle',
+    align: 'center',
+  },
+  {
+    text: '执行状态',
+    value: 'certificateValid',
+    align: 'center',
+  },
+  {
+    text: '执行时间',
+    value: 'certificateValid',
+    align: 'center',
+  },
+  {
+    text: '检定完成度',
+    value: 'certificateValid',
+    align: 'center',
+  },
+  {
+    text: '检定完成时间',
+    value: 'certificateValid',
+    align: 'center',
+  },
+])
+
+// 获取聚合表格数据
+const togetherLoading = ref(false)
+const togetherList = ref([])
+const fetchTogetherData = () => {
+  togetherLoading.value = false
+  // getInfoListTogether(listQuery).then((res) => {
+  //   togetherList.value = res.data
+  //   togetherLoading.value = false
+  // })
+}
+// 获取展开行内表格数据
+const expandLoading = ref(true)
+const expandList = ref([])
+const fetchExpandData = (params: any) => {
+  expandLoading.value = false
+  // getInfoList(params).then((res) => {
+  //   expandList.value = res.data
+  //   expandLoading.value = false
+  // })
+}
+const getRowKeys = (row: any) => { // 获取当前行id
+  return row.equipmentName // 这里看这一行中需要根据哪个属性值是id
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+// 控制展开行
+const expands = ref()
+const expandChange = (row: any, expandedRows: any) => {
+  if (expandedRows.length) {
+    expands.value = []
+    if (row) {
+      expands.value.push(row.equipmentName)
+    }
+  }
+  else {
+    expands.value = []
+  }
+}
+watch(() => expands.value, (newVal) => {
+  fetchExpandData({ equipmentName: newVal[0] })
+},
+{
+  deep: true,
+})
+</script>
+
+<template>
+  <detail-block-switch title="任务单列表">
+    <table-container>
+      <!-- 展开行表格 -->
+      <normal-table
+        class="nortable-header" :data="[]" :total="0" :columns="columns" :options="{
+          needIndex: false, // 是否需要序号列
+          border: true, // 是否需要上方边框
+        }
+        " :pagination="false" :is-showmulti-select="true"
+      />
+      <el-table
+        v-loading="togetherLoading" :data="togetherList" border style="width: 100%;" :row-key="getRowKeys"
+        :expand-row-keys="expands" :show-header="false" @expand-change="expandChange"
+      >
+        <el-table-column type="expand">
+          <template #default="props">
+            <normal-table
+              :data="list" :total="total" :columns="columns" :list-loading="expandLoading" :options="{
+                needIndex: false, // 是否需要序号列
+                border: true, // 是否需要上方边框
+              }
+              " :pagination="false" :is-showmulti-select="true" :show-header="false"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="设备名称" prop="equipmentName" align="center" />
+        <el-table-column label="数量" align="center">
+          <template #default="scope">
+            共计{{ scope.row.count }}台
+          </template>
+        </el-table-column>
+      </el-table>
+    </table-container>
+  </detail-block-switch>
+</template>
+
+<style lang="scss" scoped>
+.nortable-header {
+  ::v-deep(.el-table__body-wrapper) {
+    display: none;
+  }
+}
+</style>
diff --git a/src/views/tested/MeasurementPlan/dept/index.vue b/src/views/tested/MeasurementPlan/dept/index.vue
index 9569a89..80e7a89 100644
--- a/src/views/tested/MeasurementPlan/dept/index.vue
+++ b/src/views/tested/MeasurementPlan/dept/index.vue
@@ -1,3 +1,144 @@
+<!-- 部门送检通知表格 -->
+<script lang="ts" setup name="LoginLog">
+import { reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+const { proxy } = getCurrentInstance() as any
+const listQuery = reactive({
+  groupName: '',
+  offset: 1,
+  limit: 10,
+})
+const columns = ref([
+  {
+    text: '通知编号',
+    value: 'groupName',
+    align: 'center',
+  },
+  {
+    text: '通知名称',
+    value: 'createUserName',
+    align: 'center',
+  },
+  {
+    text: '计划分类',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '创建单位',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '创建人',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '创建时间',
+    value: 'remark',
+    align: 'center',
+  },
+])
+const list = ref([])
+const total = ref(0)
+const listLoading = ref(true)
+
+// 获取数据
+const fetchData = (isNowPage = true) => {
+  listLoading.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  // getInfoListPage(listQuery, $props.statusName).then((response) => {
+  //   list.value = response.data.rows
+  //   total.value = parseInt(response.data.total)
+  //   listLoading.value = false
+  // })
+  listLoading.value = false
+}
+fetchData()
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+const $router = useRouter()
+// 新建编辑操作
+const handler = (row: any, type: string) => {
+  $router.push({
+    path: `/meteringdept/${type}`,
+    query: {
+      row: JSON.stringify(row),
+      id: row.id,
+    },
+  })
+}
+// 删除
+const delHandler = (row: any) => {
+  ElMessageBox.confirm(
+    '确认取消此任务单信息吗?',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    // deleteInfo({ id: row.id }).then((res) => {
+    //   ElMessage.success('操作成功')
+    //   close()
+    // })
+  })
+}
+</script>
+
 <template>
-  部门送检通知
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="分组名称" clearable />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-add" title="新增" @click="handler({}, 'create')" />
+      </template>
+      <!-- 普通表格 -->
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :is-showmulti-select="true" @change="changePage"
+      >
+        <template #columns>
+          <el-table-column label="操作" width="140" align="center">
+            <template #default="scope">
+              <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
+                查看
+              </el-button>
+              <!-- <el-button link type="primary" size="small" @click="handler(scope.row, 'update')">
+                编辑
+              </el-button>
+              <el-button link type="danger" size="small" @click="delHandler(scope.row)">
+                取消
+              </el-button> -->
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
+
+
diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue
new file mode 100644
index 0000000..c8b6c8b
--- /dev/null
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -0,0 +1,205 @@
+<!-- 设备分组信息-编辑 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import tableList from './tableList.vue'
+import { getDictByCode } from '@/api/system/dict'
+import useUserStore from '@/store/modules/user'
+const $route = useRoute()
+const $router = useRouter()
+const userStore = useUserStore()
+const ruleFormRef = ref<FormInstance>() // from组件
+const statusName = $route.query.statusName as string
+const title = ref('')
+// 显示标题
+const textMap: { [key: string]: string } = {
+  update: '编辑',
+  create: '新增',
+  detail: '详情',
+}
+// 对话框类型：create,update
+const dialogStatus = ref('create')
+const ruleForm = ref({
+}) // 表单
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称必填', trigger: 'blur' }],
+}) // 表单验证规则
+// 弹窗初始化
+const initDialog = () => {
+  dialogStatus.value = $route.params.type as string
+  ruleFormRef.value?.resetFields()
+  if ($route.params.type === 'create') {
+    // ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+  }
+  else {
+    ruleForm.value = JSON.parse($route.query.row as string)
+    // getInfoDetail({ equipmentId: $route.query.id as string }).then(res => {
+    //   ruleForm.value = res.data
+    // })
+  }
+}
+onMounted(() => {
+  initDialog()
+})
+// 关闭弹窗
+const close = () => {
+  $router.back()
+}
+// 保存
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        ruleForm.value.attachments = tableRef.value.list
+        ruleForm.value.technicalTargetList = technologyRef.value.list
+        editInfo(ruleForm.value).then((res) => {
+          console.log(res.data, '123')
+          ElMessage.success('保存成功')
+          submitId.value = res.data
+        })
+      })
+    }
+  })
+}
+// 提交
+const submitForm = () => {
+  if (!submitId.value) {
+    ElMessage.warning('请先保存')
+    return false
+  }
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    submitInfo({ id: submitId.value, formId: SCHEDULE.DEVICE_INFO_APPROVAL }).then((res) => {
+      ElMessage.success('已提交')
+      close()
+    })
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+}
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <approval-dialog ref="approvalDialogRef" @on-success="() => { $router.back() }" />
+    <detail-page :title="`任务单管理-${textMap[dialogStatus]}`">
+      <template #btns>
+        <el-button v-if="statusName !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-com>
+      <el-form label-position="right" label-width="110px" class="form">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="任务单编号">
+              <el-input v-model.trim="ruleForm.approvalTypeName" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人">
+              <el-input v-model.trim="ruleForm.createUserName" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建时间">
+              <el-input v-model.trim="ruleForm.createTime" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="送检人">
+              <el-input v-model.trim="ruleForm.createUserName" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="委托方">
+              <el-input v-model.trim="ruleForm.createUserName" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="委托方地址">
+              <el-input v-model.trim="ruleForm.createTime" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="电话">
+              <el-input v-model.trim="ruleForm.createUserName" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="预计送达时间">
+              <el-input v-model.trim="ruleForm.createUserName" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="要求检完时间">
+              <el-input v-model.trim="ruleForm.createTime" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="是否加急">
+              <el-input v-model.trim="ruleForm.createUserName" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检修专业">
+              <el-input v-model.trim="ruleForm.createUserName" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="检定(校准)单位">
+              <el-input v-model.trim="ruleForm.createUserName" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="承接人">
+              <el-input v-model.trim="ruleForm.createTime" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="承接时间">
+              <el-input v-model.trim="ruleForm.createUserName" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-com>
+    <detail-block-com>
+      <table-list ref="tableRef" :data="[]" :status="dialogStatus" />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>

diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index 58c0ea9..a253b6d 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -191,6 +191,18 @@
               activeMenu: '/meteringdept',
             },
           },
+          {
+            path: '/meteringdept/:type',
+            name: 'MeteringdetEdit',
+            component: () => import('@/views/tested/MeasurementPlan/dept/components/edit.vue'),
+            meta: {
+              title: '部门送检通知编辑',
+              auth: '/tested/metering/dept',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/meteringdept',
+            },
+          },
         ],
       },
       {
@@ -216,6 +228,18 @@
               activeMenu: '/meteringtask',
             },
           },
+          {
+            path: '/meteringtask/:type',
+            name: 'MeteringtaskEdit',
+            component: () => import('@/views/tested/MeasurementPlan/task/components/edit.vue'),
+            meta: {
+              title: '任务单管理编辑',
+              auth: '/tested/metering/task',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/meteringtask',
+            },
+          },
         ],
       },
     ],
diff --git a/src/views/tested/MeasurementPlan/dept/components/edit.vue b/src/views/tested/MeasurementPlan/dept/components/edit.vue
new file mode 100644
index 0000000..99f02b1
--- /dev/null
+++ b/src/views/tested/MeasurementPlan/dept/components/edit.vue
@@ -0,0 +1,181 @@
+<!-- 设备分组信息-编辑 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import tableList from './tableList.vue'
+import { getDictByCode } from '@/api/system/dict'
+import useUserStore from '@/store/modules/user'
+const $route = useRoute()
+const $router = useRouter()
+const userStore = useUserStore()
+const ruleFormRef = ref<FormInstance>() // from组件
+const statusName = $route.query.statusName as string
+const title = ref('')
+// 显示标题
+const textMap: { [key: string]: string } = {
+  update: '编辑',
+  create: '新增',
+  detail: '详情',
+}
+// 对话框类型：create,update
+const dialogStatus = ref('create')
+const ruleForm = ref({
+}) // 表单
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称必填', trigger: 'blur' }],
+}) // 表单验证规则
+// 弹窗初始化
+const initDialog = () => {
+  dialogStatus.value = $route.params.type as string
+  ruleFormRef.value?.resetFields()
+  if ($route.params.type === 'create') {
+    // ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+  }
+  else {
+    ruleForm.value = JSON.parse($route.query.row as string)
+    // getInfoDetail({ equipmentId: $route.query.id as string }).then(res => {
+    //   ruleForm.value = res.data
+    // })
+  }
+}
+onMounted(() => {
+  initDialog()
+})
+// 关闭弹窗
+const close = () => {
+  $router.back()
+}
+// 保存
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        ruleForm.value.attachments = tableRef.value.list
+        ruleForm.value.technicalTargetList = technologyRef.value.list
+        editInfo(ruleForm.value).then((res) => {
+          console.log(res.data, '123')
+          ElMessage.success('保存成功')
+          submitId.value = res.data
+        })
+      })
+    }
+  })
+}
+// 提交
+const submitForm = () => {
+  if (!submitId.value) {
+    ElMessage.warning('请先保存')
+    return false
+  }
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    submitInfo({ id: submitId.value, formId: SCHEDULE.DEVICE_INFO_APPROVAL }).then((res) => {
+      ElMessage.success('已提交')
+      close()
+    })
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+}
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <approval-dialog ref="approvalDialogRef" @on-success="() => { $router.back() }" />
+    <detail-page title="部门送检通知">
+      <template #btns>
+        <el-button v-if="statusName !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-com>
+      <div class="tips">
+        您部门负责的设备已到检定/校准期，为了保证我单位设备的合格率，请于接到本通知之日起，在检定的年/季/月内将设备及时送检。若有提前/延迟送检需求，请及时提交申请。谢谢您的合作!
+      </div>
+      <div class="tips" style="height: 15px;line-height: 15px;" />
+    </detail-block-com>
+    <detail-block-com>
+      <el-form label-position="right" label-width="110px" class="form">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="通知编号">
+              <el-input v-model.trim="ruleForm.approvalTypeName" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="通知名称">
+              <el-input v-model.trim="ruleForm.createUserName" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计划分类">
+              <el-input v-model.trim="ruleForm.createTime" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="创建单位">
+              <el-input v-model.trim="ruleForm.createUserName" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人">
+              <el-input v-model.trim="ruleForm.createTime" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建时间">
+              <el-input v-model.trim="ruleForm.createUserName" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="18">
+            <el-form-item label="备注">
+              <el-input v-model.trim="ruleForm.createUserName" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-com>
+    <detail-block-com>
+      <table-list />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.tips {
+  height: 25px;
+  line-height: 25px;
+  padding: 10px;
+  padding-top: 0;
+  padding-bottom: 0;
+}
+</style>
diff --git a/src/views/tested/MeasurementPlan/dept/components/tableList.vue b/src/views/tested/MeasurementPlan/dept/components/tableList.vue
new file mode 100644
index 0000000..856bb1d
--- /dev/null
+++ b/src/views/tested/MeasurementPlan/dept/components/tableList.vue
@@ -0,0 +1,150 @@
+<!-- 任务单列表 -->
+<script lang="ts" setup name="EditPlatform">
+import { ElMessage, ElMessageBox } from 'element-plus'
+const columns = ref([
+  {
+    text: '统一编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '型号规格',
+    value: 'model',
+    align: 'center',
+  },
+  {
+    text: '使用部门',
+    value: 'succeed',
+    align: 'center',
+  },
+  {
+    text: '使用岗位',
+    value: 'usePosition',
+    align: 'center',
+  },
+  {
+    text: '检定(校准)单位',
+    value: 'meterIdentify',
+    align: 'center',
+  },
+  {
+    text: '证书有效期',
+    value: 'checkCycle',
+    align: 'center',
+  },
+  {
+    text: '执行状态',
+    value: 'certificateValid',
+    align: 'center',
+  },
+  {
+    text: '执行时间',
+    value: 'certificateValid',
+    align: 'center',
+  },
+  {
+    text: '检定完成度',
+    value: 'certificateValid',
+    align: 'center',
+  },
+  {
+    text: '检定完成时间',
+    value: 'certificateValid',
+    align: 'center',
+  },
+])
+
+// 获取聚合表格数据
+const togetherLoading = ref(false)
+const togetherList = ref([])
+const fetchTogetherData = () => {
+  togetherLoading.value = false
+  // getInfoListTogether(listQuery).then((res) => {
+  //   togetherList.value = res.data
+  //   togetherLoading.value = false
+  // })
+}
+// 获取展开行内表格数据
+const expandLoading = ref(true)
+const expandList = ref([])
+const fetchExpandData = (params: any) => {
+  expandLoading.value = false
+  // getInfoList(params).then((res) => {
+  //   expandList.value = res.data
+  //   expandLoading.value = false
+  // })
+}
+const getRowKeys = (row: any) => { // 获取当前行id
+  return row.equipmentName // 这里看这一行中需要根据哪个属性值是id
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+// 控制展开行
+const expands = ref()
+const expandChange = (row: any, expandedRows: any) => {
+  if (expandedRows.length) {
+    expands.value = []
+    if (row) {
+      expands.value.push(row.equipmentName)
+    }
+  }
+  else {
+    expands.value = []
+  }
+}
+watch(() => expands.value, (newVal) => {
+  fetchExpandData({ equipmentName: newVal[0] })
+},
+{
+  deep: true,
+})
+</script>
+
+<template>
+  <detail-block-switch title="任务单列表">
+    <table-container>
+      <!-- 展开行表格 -->
+      <normal-table
+        class="nortable-header" :data="[]" :total="0" :columns="columns" :options="{
+          needIndex: false, // 是否需要序号列
+          border: true, // 是否需要上方边框
+        }
+        " :pagination="false" :is-showmulti-select="true"
+      />
+      <el-table
+        v-loading="togetherLoading" :data="togetherList" border style="width: 100%;" :row-key="getRowKeys"
+        :expand-row-keys="expands" :show-header="false" @expand-change="expandChange"
+      >
+        <el-table-column type="expand">
+          <template #default="props">
+            <normal-table
+              :data="list" :total="total" :columns="columns" :list-loading="expandLoading" :options="{
+                needIndex: false, // 是否需要序号列
+                border: true, // 是否需要上方边框
+              }
+              " :pagination="false" :is-showmulti-select="true" :show-header="false"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="设备名称" prop="equipmentName" align="center" />
+        <el-table-column label="数量" align="center">
+          <template #default="scope">
+            共计{{ scope.row.count }}台
+          </template>
+        </el-table-column>
+      </el-table>
+    </table-container>
+  </detail-block-switch>
+</template>
+
+<style lang="scss" scoped>
+.nortable-header {
+  ::v-deep(.el-table__body-wrapper) {
+    display: none;
+  }
+}
+</style>
diff --git a/src/views/tested/MeasurementPlan/dept/index.vue b/src/views/tested/MeasurementPlan/dept/index.vue
index 9569a89..80e7a89 100644
--- a/src/views/tested/MeasurementPlan/dept/index.vue
+++ b/src/views/tested/MeasurementPlan/dept/index.vue
@@ -1,3 +1,144 @@
+<!-- 部门送检通知表格 -->
+<script lang="ts" setup name="LoginLog">
+import { reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+const { proxy } = getCurrentInstance() as any
+const listQuery = reactive({
+  groupName: '',
+  offset: 1,
+  limit: 10,
+})
+const columns = ref([
+  {
+    text: '通知编号',
+    value: 'groupName',
+    align: 'center',
+  },
+  {
+    text: '通知名称',
+    value: 'createUserName',
+    align: 'center',
+  },
+  {
+    text: '计划分类',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '创建单位',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '创建人',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '创建时间',
+    value: 'remark',
+    align: 'center',
+  },
+])
+const list = ref([])
+const total = ref(0)
+const listLoading = ref(true)
+
+// 获取数据
+const fetchData = (isNowPage = true) => {
+  listLoading.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  // getInfoListPage(listQuery, $props.statusName).then((response) => {
+  //   list.value = response.data.rows
+  //   total.value = parseInt(response.data.total)
+  //   listLoading.value = false
+  // })
+  listLoading.value = false
+}
+fetchData()
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+const $router = useRouter()
+// 新建编辑操作
+const handler = (row: any, type: string) => {
+  $router.push({
+    path: `/meteringdept/${type}`,
+    query: {
+      row: JSON.stringify(row),
+      id: row.id,
+    },
+  })
+}
+// 删除
+const delHandler = (row: any) => {
+  ElMessageBox.confirm(
+    '确认取消此任务单信息吗?',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    // deleteInfo({ id: row.id }).then((res) => {
+    //   ElMessage.success('操作成功')
+    //   close()
+    // })
+  })
+}
+</script>
+
 <template>
-  部门送检通知
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="分组名称" clearable />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-add" title="新增" @click="handler({}, 'create')" />
+      </template>
+      <!-- 普通表格 -->
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :is-showmulti-select="true" @change="changePage"
+      >
+        <template #columns>
+          <el-table-column label="操作" width="140" align="center">
+            <template #default="scope">
+              <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
+                查看
+              </el-button>
+              <!-- <el-button link type="primary" size="small" @click="handler(scope.row, 'update')">
+                编辑
+              </el-button>
+              <el-button link type="danger" size="small" @click="delHandler(scope.row)">
+                取消
+              </el-button> -->
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
+
+
diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue
new file mode 100644
index 0000000..c8b6c8b
--- /dev/null
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -0,0 +1,205 @@
+<!-- 设备分组信息-编辑 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import tableList from './tableList.vue'
+import { getDictByCode } from '@/api/system/dict'
+import useUserStore from '@/store/modules/user'
+const $route = useRoute()
+const $router = useRouter()
+const userStore = useUserStore()
+const ruleFormRef = ref<FormInstance>() // from组件
+const statusName = $route.query.statusName as string
+const title = ref('')
+// 显示标题
+const textMap: { [key: string]: string } = {
+  update: '编辑',
+  create: '新增',
+  detail: '详情',
+}
+// 对话框类型：create,update
+const dialogStatus = ref('create')
+const ruleForm = ref({
+}) // 表单
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称必填', trigger: 'blur' }],
+}) // 表单验证规则
+// 弹窗初始化
+const initDialog = () => {
+  dialogStatus.value = $route.params.type as string
+  ruleFormRef.value?.resetFields()
+  if ($route.params.type === 'create') {
+    // ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+  }
+  else {
+    ruleForm.value = JSON.parse($route.query.row as string)
+    // getInfoDetail({ equipmentId: $route.query.id as string }).then(res => {
+    //   ruleForm.value = res.data
+    // })
+  }
+}
+onMounted(() => {
+  initDialog()
+})
+// 关闭弹窗
+const close = () => {
+  $router.back()
+}
+// 保存
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        ruleForm.value.attachments = tableRef.value.list
+        ruleForm.value.technicalTargetList = technologyRef.value.list
+        editInfo(ruleForm.value).then((res) => {
+          console.log(res.data, '123')
+          ElMessage.success('保存成功')
+          submitId.value = res.data
+        })
+      })
+    }
+  })
+}
+// 提交
+const submitForm = () => {
+  if (!submitId.value) {
+    ElMessage.warning('请先保存')
+    return false
+  }
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    submitInfo({ id: submitId.value, formId: SCHEDULE.DEVICE_INFO_APPROVAL }).then((res) => {
+      ElMessage.success('已提交')
+      close()
+    })
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+}
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <approval-dialog ref="approvalDialogRef" @on-success="() => { $router.back() }" />
+    <detail-page :title="`任务单管理-${textMap[dialogStatus]}`">
+      <template #btns>
+        <el-button v-if="statusName !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-com>
+      <el-form label-position="right" label-width="110px" class="form">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="任务单编号">
+              <el-input v-model.trim="ruleForm.approvalTypeName" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人">
+              <el-input v-model.trim="ruleForm.createUserName" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建时间">
+              <el-input v-model.trim="ruleForm.createTime" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="送检人">
+              <el-input v-model.trim="ruleForm.createUserName" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="委托方">
+              <el-input v-model.trim="ruleForm.createUserName" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="委托方地址">
+              <el-input v-model.trim="ruleForm.createTime" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="电话">
+              <el-input v-model.trim="ruleForm.createUserName" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="预计送达时间">
+              <el-input v-model.trim="ruleForm.createUserName" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="要求检完时间">
+              <el-input v-model.trim="ruleForm.createTime" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="是否加急">
+              <el-input v-model.trim="ruleForm.createUserName" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检修专业">
+              <el-input v-model.trim="ruleForm.createUserName" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="检定(校准)单位">
+              <el-input v-model.trim="ruleForm.createUserName" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="承接人">
+              <el-input v-model.trim="ruleForm.createTime" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="承接时间">
+              <el-input v-model.trim="ruleForm.createUserName" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-com>
+    <detail-block-com>
+      <table-list ref="tableRef" :data="[]" :status="dialogStatus" />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
new file mode 100644
index 0000000..5cdcd4b
--- /dev/null
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -0,0 +1,189 @@
+<!-- 任务单列表 -->
+<script lang="ts" setup name="EditPlatform">
+import { ElMessage, ElMessageBox } from 'element-plus'
+const $props = defineProps({
+  data: {
+    type: Array,
+    default: () => ([]),
+  },
+  status: {
+    type: String,
+    required: true,
+  },
+})
+const dialogStatus = ref('update') // 对话框类型：create,update
+// 表头显示标题
+const columns = ref([
+  {
+    text: '统一编号',
+    value: 'name',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '设备名称',
+    value: 'information',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '型号',
+    value: 'location',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '附件',
+    value: 'location',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '接收状态',
+    value: 'location',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '接受状态说明',
+    value: 'location',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '检定结果',
+    value: 'location',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '检定完成时间',
+    value: 'location',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '检定说明',
+    value: 'location',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+])
+const list = ref([])
+// 检查数据列表
+function checkCertificateList() {
+  for (let index = 0; index < list.value.length; index++) {
+    const item = list.value[index]
+    for (const prop of columns.value) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
+        return false
+      }
+    }
+  }
+  return true
+}
+// 将列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of list.value) {
+    item.editable = false
+  }
+}
+// 双击行显示输入框
+const dblclickRow = (row: any) => {
+  if (dialogStatus.value == 'detail') {
+    return
+  }
+  setAllRowReadable()
+  row.editable = true
+}
+const SelectionList = ref()
+// 表格选中
+const handleSelectionChange = (e: any[]) => {
+  SelectionList.value = e
+}
+// 添加行
+const addRow = () => {
+  // certificateRef.value.initDialog({ title: '添加' })
+  if (checkCertificateList()) {
+    setAllRowReadable()
+    list.value.push({
+      name: '',
+      information: '',
+      location: '',
+      editable: true,
+    })
+  }
+}
+// 删除行
+const removeRow = () => {
+  list.value = list.value.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+const initDialog = () => {
+  list.value = $props.data
+  dialogStatus.value = $props.status
+}
+initDialog()
+defineExpose({
+  list,
+})
+</script>
+
+<template>
+  <detail-block-switch title="任务单列表">
+    <template v-if="dialogStatus !== 'detail'" #btns>
+      <el-button type="primary">
+        二维码扫描增加
+      </el-button>
+      <el-button type="primary">
+        RFID扫描增加
+      </el-button>
+      <el-button type="primary">
+        批量增加
+      </el-button>
+      <el-button type="primary" @click="addRow">
+        增加行
+      </el-button>
+      <el-button type="info" @click="removeRow">
+        删除行
+      </el-button>
+    </template>
+    <el-table
+      ref="multipleTableRef" :data="list" style="width: 100%;" border @selection-change="handleSelectionChange"
+      @row-dblclick="dblclickRow"
+    >
+      <el-table-column v-if="dialogStatus !== 'detail'" type="selection" width="38" />
+      <el-table-column align="center" label="序号" width="80" type="index" />
+      <el-table-column
+        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        align="center"
+      >
+        <template #header>
+          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+        </template>
+        <template #default="scope">
+          <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+          <el-input
+            v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
+            :placeholder="`${item.text}`" class="input"
+          />
+          <el-date-picker v-if="scope.row.editable && item.Select" v-model="scope.row[item.value]" type="date"
+              format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`" />
+        </template>
+      </el-table-column>
+    </el-table>
+  </detail-block-switch>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>

diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts
index 58c0ea9..a253b6d 100644
--- a/src/router/modules/tested.ts
+++ b/src/router/modules/tested.ts
@@ -191,6 +191,18 @@
               activeMenu: '/meteringdept',
             },
           },
+          {
+            path: '/meteringdept/:type',
+            name: 'MeteringdetEdit',
+            component: () => import('@/views/tested/MeasurementPlan/dept/components/edit.vue'),
+            meta: {
+              title: '部门送检通知编辑',
+              auth: '/tested/metering/dept',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/meteringdept',
+            },
+          },
         ],
       },
       {
@@ -216,6 +228,18 @@
               activeMenu: '/meteringtask',
             },
           },
+          {
+            path: '/meteringtask/:type',
+            name: 'MeteringtaskEdit',
+            component: () => import('@/views/tested/MeasurementPlan/task/components/edit.vue'),
+            meta: {
+              title: '任务单管理编辑',
+              auth: '/tested/metering/task',
+              sidebar: false,
+              breadcrumb: false,
+              activeMenu: '/meteringtask',
+            },
+          },
         ],
       },
     ],
diff --git a/src/views/tested/MeasurementPlan/dept/components/edit.vue b/src/views/tested/MeasurementPlan/dept/components/edit.vue
new file mode 100644
index 0000000..99f02b1
--- /dev/null
+++ b/src/views/tested/MeasurementPlan/dept/components/edit.vue
@@ -0,0 +1,181 @@
+<!-- 设备分组信息-编辑 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import tableList from './tableList.vue'
+import { getDictByCode } from '@/api/system/dict'
+import useUserStore from '@/store/modules/user'
+const $route = useRoute()
+const $router = useRouter()
+const userStore = useUserStore()
+const ruleFormRef = ref<FormInstance>() // from组件
+const statusName = $route.query.statusName as string
+const title = ref('')
+// 显示标题
+const textMap: { [key: string]: string } = {
+  update: '编辑',
+  create: '新增',
+  detail: '详情',
+}
+// 对话框类型：create,update
+const dialogStatus = ref('create')
+const ruleForm = ref({
+}) // 表单
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称必填', trigger: 'blur' }],
+}) // 表单验证规则
+// 弹窗初始化
+const initDialog = () => {
+  dialogStatus.value = $route.params.type as string
+  ruleFormRef.value?.resetFields()
+  if ($route.params.type === 'create') {
+    // ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+  }
+  else {
+    ruleForm.value = JSON.parse($route.query.row as string)
+    // getInfoDetail({ equipmentId: $route.query.id as string }).then(res => {
+    //   ruleForm.value = res.data
+    // })
+  }
+}
+onMounted(() => {
+  initDialog()
+})
+// 关闭弹窗
+const close = () => {
+  $router.back()
+}
+// 保存
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        ruleForm.value.attachments = tableRef.value.list
+        ruleForm.value.technicalTargetList = technologyRef.value.list
+        editInfo(ruleForm.value).then((res) => {
+          console.log(res.data, '123')
+          ElMessage.success('保存成功')
+          submitId.value = res.data
+        })
+      })
+    }
+  })
+}
+// 提交
+const submitForm = () => {
+  if (!submitId.value) {
+    ElMessage.warning('请先保存')
+    return false
+  }
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    submitInfo({ id: submitId.value, formId: SCHEDULE.DEVICE_INFO_APPROVAL }).then((res) => {
+      ElMessage.success('已提交')
+      close()
+    })
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+}
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <approval-dialog ref="approvalDialogRef" @on-success="() => { $router.back() }" />
+    <detail-page title="部门送检通知">
+      <template #btns>
+        <el-button v-if="statusName !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-com>
+      <div class="tips">
+        您部门负责的设备已到检定/校准期，为了保证我单位设备的合格率，请于接到本通知之日起，在检定的年/季/月内将设备及时送检。若有提前/延迟送检需求，请及时提交申请。谢谢您的合作!
+      </div>
+      <div class="tips" style="height: 15px;line-height: 15px;" />
+    </detail-block-com>
+    <detail-block-com>
+      <el-form label-position="right" label-width="110px" class="form">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="通知编号">
+              <el-input v-model.trim="ruleForm.approvalTypeName" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="通知名称">
+              <el-input v-model.trim="ruleForm.createUserName" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="计划分类">
+              <el-input v-model.trim="ruleForm.createTime" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="创建单位">
+              <el-input v-model.trim="ruleForm.createUserName" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人">
+              <el-input v-model.trim="ruleForm.createTime" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建时间">
+              <el-input v-model.trim="ruleForm.createUserName" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="18">
+            <el-form-item label="备注">
+              <el-input v-model.trim="ruleForm.createUserName" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-com>
+    <detail-block-com>
+      <table-list />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+.tips {
+  height: 25px;
+  line-height: 25px;
+  padding: 10px;
+  padding-top: 0;
+  padding-bottom: 0;
+}
+</style>
diff --git a/src/views/tested/MeasurementPlan/dept/components/tableList.vue b/src/views/tested/MeasurementPlan/dept/components/tableList.vue
new file mode 100644
index 0000000..856bb1d
--- /dev/null
+++ b/src/views/tested/MeasurementPlan/dept/components/tableList.vue
@@ -0,0 +1,150 @@
+<!-- 任务单列表 -->
+<script lang="ts" setup name="EditPlatform">
+import { ElMessage, ElMessageBox } from 'element-plus'
+const columns = ref([
+  {
+    text: '统一编号',
+    value: 'equipmentNo',
+    align: 'center',
+  },
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+  },
+  {
+    text: '型号规格',
+    value: 'model',
+    align: 'center',
+  },
+  {
+    text: '使用部门',
+    value: 'succeed',
+    align: 'center',
+  },
+  {
+    text: '使用岗位',
+    value: 'usePosition',
+    align: 'center',
+  },
+  {
+    text: '检定(校准)单位',
+    value: 'meterIdentify',
+    align: 'center',
+  },
+  {
+    text: '证书有效期',
+    value: 'checkCycle',
+    align: 'center',
+  },
+  {
+    text: '执行状态',
+    value: 'certificateValid',
+    align: 'center',
+  },
+  {
+    text: '执行时间',
+    value: 'certificateValid',
+    align: 'center',
+  },
+  {
+    text: '检定完成度',
+    value: 'certificateValid',
+    align: 'center',
+  },
+  {
+    text: '检定完成时间',
+    value: 'certificateValid',
+    align: 'center',
+  },
+])
+
+// 获取聚合表格数据
+const togetherLoading = ref(false)
+const togetherList = ref([])
+const fetchTogetherData = () => {
+  togetherLoading.value = false
+  // getInfoListTogether(listQuery).then((res) => {
+  //   togetherList.value = res.data
+  //   togetherLoading.value = false
+  // })
+}
+// 获取展开行内表格数据
+const expandLoading = ref(true)
+const expandList = ref([])
+const fetchExpandData = (params: any) => {
+  expandLoading.value = false
+  // getInfoList(params).then((res) => {
+  //   expandList.value = res.data
+  //   expandLoading.value = false
+  // })
+}
+const getRowKeys = (row: any) => { // 获取当前行id
+  return row.equipmentName // 这里看这一行中需要根据哪个属性值是id
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+// 控制展开行
+const expands = ref()
+const expandChange = (row: any, expandedRows: any) => {
+  if (expandedRows.length) {
+    expands.value = []
+    if (row) {
+      expands.value.push(row.equipmentName)
+    }
+  }
+  else {
+    expands.value = []
+  }
+}
+watch(() => expands.value, (newVal) => {
+  fetchExpandData({ equipmentName: newVal[0] })
+},
+{
+  deep: true,
+})
+</script>
+
+<template>
+  <detail-block-switch title="任务单列表">
+    <table-container>
+      <!-- 展开行表格 -->
+      <normal-table
+        class="nortable-header" :data="[]" :total="0" :columns="columns" :options="{
+          needIndex: false, // 是否需要序号列
+          border: true, // 是否需要上方边框
+        }
+        " :pagination="false" :is-showmulti-select="true"
+      />
+      <el-table
+        v-loading="togetherLoading" :data="togetherList" border style="width: 100%;" :row-key="getRowKeys"
+        :expand-row-keys="expands" :show-header="false" @expand-change="expandChange"
+      >
+        <el-table-column type="expand">
+          <template #default="props">
+            <normal-table
+              :data="list" :total="total" :columns="columns" :list-loading="expandLoading" :options="{
+                needIndex: false, // 是否需要序号列
+                border: true, // 是否需要上方边框
+              }
+              " :pagination="false" :is-showmulti-select="true" :show-header="false"
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="设备名称" prop="equipmentName" align="center" />
+        <el-table-column label="数量" align="center">
+          <template #default="scope">
+            共计{{ scope.row.count }}台
+          </template>
+        </el-table-column>
+      </el-table>
+    </table-container>
+  </detail-block-switch>
+</template>
+
+<style lang="scss" scoped>
+.nortable-header {
+  ::v-deep(.el-table__body-wrapper) {
+    display: none;
+  }
+}
+</style>
diff --git a/src/views/tested/MeasurementPlan/dept/index.vue b/src/views/tested/MeasurementPlan/dept/index.vue
index 9569a89..80e7a89 100644
--- a/src/views/tested/MeasurementPlan/dept/index.vue
+++ b/src/views/tested/MeasurementPlan/dept/index.vue
@@ -1,3 +1,144 @@
+<!-- 部门送检通知表格 -->
+<script lang="ts" setup name="LoginLog">
+import { reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+const { proxy } = getCurrentInstance() as any
+const listQuery = reactive({
+  groupName: '',
+  offset: 1,
+  limit: 10,
+})
+const columns = ref([
+  {
+    text: '通知编号',
+    value: 'groupName',
+    align: 'center',
+  },
+  {
+    text: '通知名称',
+    value: 'createUserName',
+    align: 'center',
+  },
+  {
+    text: '计划分类',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '创建单位',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '创建人',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '创建时间',
+    value: 'remark',
+    align: 'center',
+  },
+])
+const list = ref([])
+const total = ref(0)
+const listLoading = ref(true)
+
+// 获取数据
+const fetchData = (isNowPage = true) => {
+  listLoading.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  // getInfoListPage(listQuery, $props.statusName).then((response) => {
+  //   list.value = response.data.rows
+  //   total.value = parseInt(response.data.total)
+  //   listLoading.value = false
+  // })
+  listLoading.value = false
+}
+fetchData()
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+const $router = useRouter()
+// 新建编辑操作
+const handler = (row: any, type: string) => {
+  $router.push({
+    path: `/meteringdept/${type}`,
+    query: {
+      row: JSON.stringify(row),
+      id: row.id,
+    },
+  })
+}
+// 删除
+const delHandler = (row: any) => {
+  ElMessageBox.confirm(
+    '确认取消此任务单信息吗?',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    // deleteInfo({ id: row.id }).then((res) => {
+    //   ElMessage.success('操作成功')
+    //   close()
+    // })
+  })
+}
+</script>
+
 <template>
-  部门送检通知
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="分组名称" clearable />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-add" title="新增" @click="handler({}, 'create')" />
+      </template>
+      <!-- 普通表格 -->
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :is-showmulti-select="true" @change="changePage"
+      >
+        <template #columns>
+          <el-table-column label="操作" width="140" align="center">
+            <template #default="scope">
+              <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
+                查看
+              </el-button>
+              <!-- <el-button link type="primary" size="small" @click="handler(scope.row, 'update')">
+                编辑
+              </el-button>
+              <el-button link type="danger" size="small" @click="delHandler(scope.row)">
+                取消
+              </el-button> -->
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
+
+
diff --git a/src/views/tested/MeasurementPlan/task/components/edit.vue b/src/views/tested/MeasurementPlan/task/components/edit.vue
new file mode 100644
index 0000000..c8b6c8b
--- /dev/null
+++ b/src/views/tested/MeasurementPlan/task/components/edit.vue
@@ -0,0 +1,205 @@
+<!-- 设备分组信息-编辑 -->
+<script lang="ts" setup name="addNotice">
+import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import tableList from './tableList.vue'
+import { getDictByCode } from '@/api/system/dict'
+import useUserStore from '@/store/modules/user'
+const $route = useRoute()
+const $router = useRouter()
+const userStore = useUserStore()
+const ruleFormRef = ref<FormInstance>() // from组件
+const statusName = $route.query.statusName as string
+const title = ref('')
+// 显示标题
+const textMap: { [key: string]: string } = {
+  update: '编辑',
+  create: '新增',
+  detail: '详情',
+}
+// 对话框类型：create,update
+const dialogStatus = ref('create')
+const ruleForm = ref({
+}) // 表单
+const rules = ref<FormRules>({
+  fileName: [{ required: true, message: '名称必填', trigger: 'blur' }],
+}) // 表单验证规则
+// 弹窗初始化
+const initDialog = () => {
+  dialogStatus.value = $route.params.type as string
+  ruleFormRef.value?.resetFields()
+  if ($route.params.type === 'create') {
+    // ruleForm.value.createTime = dayjs().format('YYYY-MM-DD HH:mm:ss') // 创建时间
+  }
+  else {
+    ruleForm.value = JSON.parse($route.query.row as string)
+    // getInfoDetail({ equipmentId: $route.query.id as string }).then(res => {
+    //   ruleForm.value = res.data
+    // })
+  }
+}
+onMounted(() => {
+  initDialog()
+})
+// 关闭弹窗
+const close = () => {
+  $router.back()
+}
+// 保存
+const saveForm = async (formEl: FormInstance | undefined) => {
+  if (!formEl) { return }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认保存吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then((res) => {
+        ruleForm.value.attachments = tableRef.value.list
+        ruleForm.value.technicalTargetList = technologyRef.value.list
+        editInfo(ruleForm.value).then((res) => {
+          console.log(res.data, '123')
+          ElMessage.success('保存成功')
+          submitId.value = res.data
+        })
+      })
+    }
+  })
+}
+// 提交
+const submitForm = () => {
+  if (!submitId.value) {
+    ElMessage.warning('请先保存')
+    return false
+  }
+  ElMessageBox.confirm(
+    '确认提交吗？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then((res) => {
+    submitInfo({ id: submitId.value, formId: SCHEDULE.DEVICE_INFO_APPROVAL }).then((res) => {
+      ElMessage.success('已提交')
+      close()
+    })
+  })
+}
+// 取消
+const resetForm = (formEl: FormInstance | undefined) => {
+  formEl?.resetFields()
+  close()
+}
+</script>
+
+<template>
+  <app-container style="overflow: hidden;">
+    <approval-dialog ref="approvalDialogRef" @on-success="() => { $router.back() }" />
+    <detail-page :title="`任务单管理-${textMap[dialogStatus]}`">
+      <template #btns>
+        <el-button v-if="statusName !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button>
+        <el-button type="info" @click="resetForm(ruleFormRef)">
+          关闭
+        </el-button>
+      </template>
+    </detail-page>
+    <detail-block-com>
+      <el-form label-position="right" label-width="110px" class="form">
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="任务单编号">
+              <el-input v-model.trim="ruleForm.approvalTypeName" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建人">
+              <el-input v-model.trim="ruleForm.createUserName" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="创建时间">
+              <el-input v-model.trim="ruleForm.createTime" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="送检人">
+              <el-input v-model.trim="ruleForm.createUserName" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="委托方">
+              <el-input v-model.trim="ruleForm.createUserName" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="委托方地址">
+              <el-input v-model.trim="ruleForm.createTime" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="电话">
+              <el-input v-model.trim="ruleForm.createUserName" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="预计送达时间">
+              <el-input v-model.trim="ruleForm.createUserName" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="要求检完时间">
+              <el-input v-model.trim="ruleForm.createTime" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="是否加急">
+              <el-input v-model.trim="ruleForm.createUserName" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检修专业">
+              <el-input v-model.trim="ruleForm.createUserName" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="检定(校准)单位">
+              <el-input v-model.trim="ruleForm.createUserName" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="承接人">
+              <el-input v-model.trim="ruleForm.createTime" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="承接时间">
+              <el-input v-model.trim="ruleForm.createUserName" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-block-com>
+    <detail-block-com>
+      <table-list ref="tableRef" :data="[]" :status="dialogStatus" />
+    </detail-block-com>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/tested/MeasurementPlan/task/components/tableList.vue b/src/views/tested/MeasurementPlan/task/components/tableList.vue
new file mode 100644
index 0000000..5cdcd4b
--- /dev/null
+++ b/src/views/tested/MeasurementPlan/task/components/tableList.vue
@@ -0,0 +1,189 @@
+<!-- 任务单列表 -->
+<script lang="ts" setup name="EditPlatform">
+import { ElMessage, ElMessageBox } from 'element-plus'
+const $props = defineProps({
+  data: {
+    type: Array,
+    default: () => ([]),
+  },
+  status: {
+    type: String,
+    required: true,
+  },
+})
+const dialogStatus = ref('update') // 对话框类型：create,update
+// 表头显示标题
+const columns = ref([
+  {
+    text: '统一编号',
+    value: 'name',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '设备名称',
+    value: 'information',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '型号',
+    value: 'location',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '附件',
+    value: 'location',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '接收状态',
+    value: 'location',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '接受状态说明',
+    value: 'location',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '检定结果',
+    value: 'location',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '检定完成时间',
+    value: 'location',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+  {
+    text: '检定说明',
+    value: 'location',
+    required: true,
+    isSelect: false, // 是否下拉框
+  },
+])
+const list = ref([])
+// 检查数据列表
+function checkCertificateList() {
+  for (let index = 0; index < list.value.length; index++) {
+    const item = list.value[index]
+    for (const prop of columns.value) {
+      // 检查必填
+      if (prop.required && !item[prop.value]) {
+        ElMessage.warning(`请先完善第${index + 1}行中${prop.text}`)
+        return false
+      }
+    }
+  }
+  return true
+}
+// 将列表置为不可编辑状态
+function setAllRowReadable() {
+  for (const item of list.value) {
+    item.editable = false
+  }
+}
+// 双击行显示输入框
+const dblclickRow = (row: any) => {
+  if (dialogStatus.value == 'detail') {
+    return
+  }
+  setAllRowReadable()
+  row.editable = true
+}
+const SelectionList = ref()
+// 表格选中
+const handleSelectionChange = (e: any[]) => {
+  SelectionList.value = e
+}
+// 添加行
+const addRow = () => {
+  // certificateRef.value.initDialog({ title: '添加' })
+  if (checkCertificateList()) {
+    setAllRowReadable()
+    list.value.push({
+      name: '',
+      information: '',
+      location: '',
+      editable: true,
+    })
+  }
+}
+// 删除行
+const removeRow = () => {
+  list.value = list.value.filter((item) => {
+    return !SelectionList.value.includes(item)
+  })
+}
+const initDialog = () => {
+  list.value = $props.data
+  dialogStatus.value = $props.status
+}
+initDialog()
+defineExpose({
+  list,
+})
+</script>
+
+<template>
+  <detail-block-switch title="任务单列表">
+    <template v-if="dialogStatus !== 'detail'" #btns>
+      <el-button type="primary">
+        二维码扫描增加
+      </el-button>
+      <el-button type="primary">
+        RFID扫描增加
+      </el-button>
+      <el-button type="primary">
+        批量增加
+      </el-button>
+      <el-button type="primary" @click="addRow">
+        增加行
+      </el-button>
+      <el-button type="info" @click="removeRow">
+        删除行
+      </el-button>
+    </template>
+    <el-table
+      ref="multipleTableRef" :data="list" style="width: 100%;" border @selection-change="handleSelectionChange"
+      @row-dblclick="dblclickRow"
+    >
+      <el-table-column v-if="dialogStatus !== 'detail'" type="selection" width="38" />
+      <el-table-column align="center" label="序号" width="80" type="index" />
+      <el-table-column
+        v-for="item in columns" :key="item.id" :width="item.width" :prop="item.value" :label="item.text"
+        align="center"
+      >
+        <template #header>
+          <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+        </template>
+        <template #default="scope">
+          <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+          <el-input
+            v-if="scope.row.editable && !item.isSelect" v-model="scope.row[item.value]" :autofocus="true"
+            :placeholder="`${item.text}`" class="input"
+          />
+          <el-date-picker v-if="scope.row.editable && item.Select" v-model="scope.row[item.value]" type="date"
+              format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss" :placeholder="`${item.text}`" />
+        </template>
+      </el-table-column>
+    </el-table>
+  </detail-block-switch>
+</template>
+
+<style lang="scss" scoped>
+.el-dialog {
+  width: 700px;
+}
+
+.el-select {
+  width: 100%;
+}
+</style>
diff --git a/src/views/tested/MeasurementPlan/task/index.vue b/src/views/tested/MeasurementPlan/task/index.vue
index 15f5f58..4c10254 100644
--- a/src/views/tested/MeasurementPlan/task/index.vue
+++ b/src/views/tested/MeasurementPlan/task/index.vue
@@ -1,3 +1,148 @@
+<!-- 任务单管理表格 -->
+<script lang="ts" setup name="LoginLog">
+import { reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+const { proxy } = getCurrentInstance() as any
+const listQuery = reactive({
+  groupName: '',
+  offset: 1,
+  limit: 10,
+})
+const columns = ref([
+  {
+    text: '任务单编号',
+    value: 'groupName',
+    align: 'center',
+  },
+  {
+    text: '委托方',
+    value: 'createUserName',
+    align: 'center',
+  },
+  {
+    text: '溯源单位',
+    value: 'createTime',
+    align: 'center',
+  },
+  {
+    text: '创建人',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '创建时间',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '送检人',
+    value: 'remark',
+    align: 'center',
+  },
+  {
+    text: '接收状态',
+    value: 'remark',
+    align: 'center',
+  },
+])
+const list = ref([])
+const total = ref(0)
+const listLoading = ref(true)
+
+// 获取数据
+const fetchData = (isNowPage = true) => {
+  listLoading.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.offset = 1
+  }
+  // getInfoListPage(listQuery, $props.statusName).then((response) => {
+  //   list.value = response.data.rows
+  //   total.value = parseInt(response.data.total)
+  //   listLoading.value = false
+  // })
+  listLoading.value = false
+}
+fetchData()
+// 查询数据
+const search = () => {
+  fetchData(false)
+}
+
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size: number; page: number }) => {
+  if (val && val.size) {
+    listQuery.limit = val.size
+  }
+  if (val && val.page) {
+    listQuery.offset = val.page
+  }
+  fetchData()
+}
+const $router = useRouter()
+// 新建编辑操作
+const handler = (row: any, type: string) => {
+  $router.push({
+    path: `/meteringtask/${type}`,
+    query: {
+      row: JSON.stringify(row),
+      id: row.id,
+    },
+  })
+}
+// 删除
+const delHandler = (row: any) => {
+  ElMessageBox.confirm(
+    '确认取消此任务单信息吗?',
+    '确认',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    // deleteInfo({ id: row.id }).then((res) => {
+    //   ElMessage.success('操作成功')
+    //   close()
+    // })
+  })
+}
+</script>
+
 <template>
-  任务单管理
+  <app-container>
+    <!-- 筛选条件 -->
+    <search-area @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.equipmentNo" placeholder="分组名称" clearable />
+      </search-item>
+    </search-area>
+    <table-container>
+      <template #btns-right>
+        <icon-button icon="icon-add" title="新增" @click="handler({}, 'create')" />
+      </template>
+      <!-- 普通表格 -->
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery" :list-loading="listLoading"
+        :is-showmulti-select="true" @change="changePage"
+      >
+        <template #columns>
+          <el-table-column label="操作" width="140" align="center">
+            <template #default="scope">
+              <el-button link type="primary" size="small" @click="handler(scope.row, 'detail')">
+                查看
+              </el-button>
+              <el-button link type="primary" size="small" @click="handler(scope.row, 'update')">
+                编辑
+              </el-button>
+              <el-button link type="danger" size="small" @click="delHandler(scope.row)">
+                取消
+              </el-button>
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+  </app-container>
 </template>
+