diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index b21ad07..cf4a5b9 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -260,6 +260,19 @@
         },
       },
       {
+        path: 'myMeasureDetail/:role/:id',
+        name: 'MyMeasureDetail',
+        component: () => import('@/views/business/lab/myMeasure/measureDetail.vue'),
+        meta: {
+          title: '我的检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          auth: '/lab/myMeasure',
+          activeMenu: '/lab/myMeasureList',
+        },
+      },
+      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -270,6 +283,19 @@
         },
       },
       {
+        path: 'myMeasureDetail/:role/:id',
+        name: 'MyMeasureDetail',
+        component: () => import('@/views/business/lab/myMeasure/measureDetail.vue'),
+        meta: {
+          title: '部门检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          auth: '/lab/deptMeasureList',
+          activeMenu: '/lab/deptMeasureList',
+        },
+      },
+      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),

diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index b21ad07..cf4a5b9 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -260,6 +260,19 @@
         },
       },
       {
+        path: 'myMeasureDetail/:role/:id',
+        name: 'MyMeasureDetail',
+        component: () => import('@/views/business/lab/myMeasure/measureDetail.vue'),
+        meta: {
+          title: '我的检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          auth: '/lab/myMeasure',
+          activeMenu: '/lab/myMeasureList',
+        },
+      },
+      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -270,6 +283,19 @@
         },
       },
       {
+        path: 'myMeasureDetail/:role/:id',
+        name: 'MyMeasureDetail',
+        component: () => import('@/views/business/lab/myMeasure/measureDetail.vue'),
+        meta: {
+          title: '部门检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          auth: '/lab/deptMeasureList',
+          activeMenu: '/lab/deptMeasureList',
+        },
+      },
+      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 066f192..7a6ebea 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -102,8 +102,9 @@
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
-          localStorage.removeItem('name')
           localStorage.removeItem('token')
+          localStorage.removeItem('nameId')
+          localStorage.removeItem('depId')
           this.username = ''
           this.token = ''
           this.roleList = []
@@ -121,7 +122,8 @@
               this.roleList = res.data.roleIds
               this.roleNames = res.data.roleNames
               this.roleTips = res.data.roleTips
-              localStorage.setItem('name', res.data.name)
+              localStorage.setItem('nameId', res.data.id)
+              localStorage.setItem('depId', res.data.deptId)
             }
             else {
               reject('该用户无角色')

diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index b21ad07..cf4a5b9 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -260,6 +260,19 @@
         },
       },
       {
+        path: 'myMeasureDetail/:role/:id',
+        name: 'MyMeasureDetail',
+        component: () => import('@/views/business/lab/myMeasure/measureDetail.vue'),
+        meta: {
+          title: '我的检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          auth: '/lab/myMeasure',
+          activeMenu: '/lab/myMeasureList',
+        },
+      },
+      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -270,6 +283,19 @@
         },
       },
       {
+        path: 'myMeasureDetail/:role/:id',
+        name: 'MyMeasureDetail',
+        component: () => import('@/views/business/lab/myMeasure/measureDetail.vue'),
+        meta: {
+          title: '部门检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          auth: '/lab/deptMeasureList',
+          activeMenu: '/lab/deptMeasureList',
+        },
+      },
+      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 066f192..7a6ebea 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -102,8 +102,9 @@
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
-          localStorage.removeItem('name')
           localStorage.removeItem('token')
+          localStorage.removeItem('nameId')
+          localStorage.removeItem('depId')
           this.username = ''
           this.token = ''
           this.roleList = []
@@ -121,7 +122,8 @@
               this.roleList = res.data.roleIds
               this.roleNames = res.data.roleNames
               this.roleTips = res.data.roleTips
-              localStorage.setItem('name', res.data.name)
+              localStorage.setItem('nameId', res.data.id)
+              localStorage.setItem('depId', res.data.deptId)
             }
             else {
               reject('该用户无角色')
diff --git a/src/views/business/board/overdueReminder/detail.vue b/src/views/business/board/overdueReminder/detail.vue
index 92987d1..0239b71 100644
--- a/src/views/business/board/overdueReminder/detail.vue
+++ b/src/views/business/board/overdueReminder/detail.vue
@@ -5,7 +5,7 @@
 import { ref } from 'vue'
 import dayjs from 'dayjs'
 import ProcessConfig from '@/views/business/schedule/task/components/processConfig.vue'
-import type { ISampleMeasure, ITaskDetail } from '@/views/business/schedule/task/task-interface'
+import type { ISampleMeasure, ITaskDetail } from '@/views/business/schedule/task/task-interface.js'
 import type { Menu, SimpleCertification, SimpleMeasureRecord, dictType } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getTaskDetail } from '@/api/business/schedule/task'

diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index b21ad07..cf4a5b9 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -260,6 +260,19 @@
         },
       },
       {
+        path: 'myMeasureDetail/:role/:id',
+        name: 'MyMeasureDetail',
+        component: () => import('@/views/business/lab/myMeasure/measureDetail.vue'),
+        meta: {
+          title: '我的检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          auth: '/lab/myMeasure',
+          activeMenu: '/lab/myMeasureList',
+        },
+      },
+      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -270,6 +283,19 @@
         },
       },
       {
+        path: 'myMeasureDetail/:role/:id',
+        name: 'MyMeasureDetail',
+        component: () => import('@/views/business/lab/myMeasure/measureDetail.vue'),
+        meta: {
+          title: '部门检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          auth: '/lab/deptMeasureList',
+          activeMenu: '/lab/deptMeasureList',
+        },
+      },
+      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 066f192..7a6ebea 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -102,8 +102,9 @@
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
-          localStorage.removeItem('name')
           localStorage.removeItem('token')
+          localStorage.removeItem('nameId')
+          localStorage.removeItem('depId')
           this.username = ''
           this.token = ''
           this.roleList = []
@@ -121,7 +122,8 @@
               this.roleList = res.data.roleIds
               this.roleNames = res.data.roleNames
               this.roleTips = res.data.roleTips
-              localStorage.setItem('name', res.data.name)
+              localStorage.setItem('nameId', res.data.id)
+              localStorage.setItem('depId', res.data.deptId)
             }
             else {
               reject('该用户无角色')
diff --git a/src/views/business/board/overdueReminder/detail.vue b/src/views/business/board/overdueReminder/detail.vue
index 92987d1..0239b71 100644
--- a/src/views/business/board/overdueReminder/detail.vue
+++ b/src/views/business/board/overdueReminder/detail.vue
@@ -5,7 +5,7 @@
 import { ref } from 'vue'
 import dayjs from 'dayjs'
 import ProcessConfig from '@/views/business/schedule/task/components/processConfig.vue'
-import type { ISampleMeasure, ITaskDetail } from '@/views/business/schedule/task/task-interface'
+import type { ISampleMeasure, ITaskDetail } from '@/views/business/schedule/task/task-interface.js'
 import type { Menu, SimpleCertification, SimpleMeasureRecord, dictType } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getTaskDetail } from '@/api/business/schedule/task'
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index d6cc168..05fd811 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -4,8 +4,8 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import DistributeDialog from '../../schedule/task/components/distributeDialog.vue'
 import RollbackDialog from './../components/rollbackDialog.vue'
-import DistributeDialog from './../components/distributeDialog.vue'
 import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
@@ -131,7 +131,8 @@
 const depId = ref('')
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
+  $router.push(`myMeasureDetail/detail/${row.sampleId}?order=${row.orderId}`)
+  // $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗

diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index b21ad07..cf4a5b9 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -260,6 +260,19 @@
         },
       },
       {
+        path: 'myMeasureDetail/:role/:id',
+        name: 'MyMeasureDetail',
+        component: () => import('@/views/business/lab/myMeasure/measureDetail.vue'),
+        meta: {
+          title: '我的检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          auth: '/lab/myMeasure',
+          activeMenu: '/lab/myMeasureList',
+        },
+      },
+      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -270,6 +283,19 @@
         },
       },
       {
+        path: 'myMeasureDetail/:role/:id',
+        name: 'MyMeasureDetail',
+        component: () => import('@/views/business/lab/myMeasure/measureDetail.vue'),
+        meta: {
+          title: '部门检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          auth: '/lab/deptMeasureList',
+          activeMenu: '/lab/deptMeasureList',
+        },
+      },
+      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 066f192..7a6ebea 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -102,8 +102,9 @@
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
-          localStorage.removeItem('name')
           localStorage.removeItem('token')
+          localStorage.removeItem('nameId')
+          localStorage.removeItem('depId')
           this.username = ''
           this.token = ''
           this.roleList = []
@@ -121,7 +122,8 @@
               this.roleList = res.data.roleIds
               this.roleNames = res.data.roleNames
               this.roleTips = res.data.roleTips
-              localStorage.setItem('name', res.data.name)
+              localStorage.setItem('nameId', res.data.id)
+              localStorage.setItem('depId', res.data.deptId)
             }
             else {
               reject('该用户无角色')
diff --git a/src/views/business/board/overdueReminder/detail.vue b/src/views/business/board/overdueReminder/detail.vue
index 92987d1..0239b71 100644
--- a/src/views/business/board/overdueReminder/detail.vue
+++ b/src/views/business/board/overdueReminder/detail.vue
@@ -5,7 +5,7 @@
 import { ref } from 'vue'
 import dayjs from 'dayjs'
 import ProcessConfig from '@/views/business/schedule/task/components/processConfig.vue'
-import type { ISampleMeasure, ITaskDetail } from '@/views/business/schedule/task/task-interface'
+import type { ISampleMeasure, ITaskDetail } from '@/views/business/schedule/task/task-interface.js'
 import type { Menu, SimpleCertification, SimpleMeasureRecord, dictType } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getTaskDetail } from '@/api/business/schedule/task'
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index d6cc168..05fd811 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -4,8 +4,8 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import DistributeDialog from '../../schedule/task/components/distributeDialog.vue'
 import RollbackDialog from './../components/rollbackDialog.vue'
-import DistributeDialog from './../components/distributeDialog.vue'
 import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
@@ -131,7 +131,8 @@
 const depId = ref('')
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
+  $router.push(`myMeasureDetail/detail/${row.sampleId}?order=${row.orderId}`)
+  // $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
diff --git a/src/views/business/lab/myMeasure/components/chooseLab.vue b/src/views/business/lab/myMeasure/components/chooseLab.vue
new file mode 100644
index 0000000..0dcebfc
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/chooseLab.vue
@@ -0,0 +1,203 @@
+<script setup lang="ts" name="ChooseLab">
+// 选择实验室
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { ILabList, ILabSearchQuery } from '@/views/business/schedule/task/components/lab-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getOrganizeList } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
+const emits = defineEmits(['confirmCheckout'])
+// 是否多选
+const multi = ref(false)
+const dialogVisible = ref(false)
+
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
+// 查询条件
+const listQuery = ref<ILabSearchQuery>({
+  organizeNo: '', // 实验室编号
+  organizeName: '', // 实验室名称
+  meterMajor: '', // 专业
+  organizeType: '3', // 组织类型
+  director: '', // 负责人
+  isLab: '1', // 是否是实验室
+  createStartTime: '',
+  createEndTime: '',
+})
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '实验室名称', value: 'organizeName', width: '160', align: 'center' },
+  // { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
+  { text: '负责人', value: 'director', align: 'center', width: '120' },
+  { text: '计量专业', value: 'meterMajorName', align: 'center' },
+  { text: '实验室能力', value: 'labCapacityName', align: 'center' },
+])
+// 表格数据
+const list = ref<ILabList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 多选的内容
+const checkoutList = ref<ILabList[]>([])
+// 单选
+const singleChecked = ref()
+// 数据查询
+function fetchData(isNowPage = false) {
+  getOrganizeList(listQuery.value).then((response) => {
+    list.value = response.data
+    total.value = parseInt(response.data.length)
+    loadingTable.value = false
+  })
+  loadingTable.value = false
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    organizeNo: '', // 实验室编号
+    organizeName: '', // 实验室名称
+    meterMajor: '', // 专业
+    organizeType: '3', // 组织类型
+    director: '', // 负责人
+    isLab: '1', // 是否是实验室
+    createStartTime: '',
+    createEndTime: '',
+  }
+}
+
+// 点击取消
+const cancle = () => {
+  dialogVisible.value = false
+}
+// 点击确定
+const clickConfirm = () => {
+  // 如果多选
+  if (multi.value) {
+    if (!checkoutList.value.length) {
+      ElMessage({
+        message: '请选择至少一个实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      emits('confirmCheckout', checkoutList.value)
+    }
+  }
+  else {
+    if (!singleChecked.value) {
+      ElMessage({
+        message: '请选择检定实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      const checkValue = list.value.find(item => item.id == singleChecked.value)
+      emits('confirmCheckout', checkValue)
+    }
+  }
+
+  cancle()
+}
+
+// 初始化弹窗
+const initDialog = (multiSelect: boolean) => {
+  multi.value = multiSelect
+  dialogVisible.value = true
+  fetchData()
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <div class="choose-lab-dialog">
+    <el-dialog v-model="dialogVisible" :title="`选择检定实验室${(checkoutList.length > 0 && multi) ? `(已选择${checkoutList.length}个实验室)` : ''}`" width="1000" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.organizeName"
+            placeholder="实验室名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-select
+            v-model.trim="listQuery.meterMajor"
+            clearable
+            placeholder="计量专业"
+          >
+            <el-option
+              v-for="item in measureMajorList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <div style="padding: 5px 10px;">
+        <normal-table
+          :data="list"
+          :total="total"
+          :columns="columns"
+          :query="listQuery"
+          :list-loading="loadingTable"
+          :pagination="false"
+          size="small"
+          @multi-select="handleSelectionChange"
+        >
+          <!-- :is-showmulti-select="multi" -->
+          <!-- :is-multi="multi" -->
+          <template v-if="!multi" #preColumns>
+            <el-table-column label="#" width="55" align="center" fixed="left">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="" width="40" align="center" fixed>
+              <template #default="scope">
+                <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </div>
+
+      <template #footer>
+        <el-button type="primary" @click="clickConfirm">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.choose-lab-dialog {
+  :deep(.el-radio__label) {
+    display: none;
+  }
+}
+</style>

diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index b21ad07..cf4a5b9 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -260,6 +260,19 @@
         },
       },
       {
+        path: 'myMeasureDetail/:role/:id',
+        name: 'MyMeasureDetail',
+        component: () => import('@/views/business/lab/myMeasure/measureDetail.vue'),
+        meta: {
+          title: '我的检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          auth: '/lab/myMeasure',
+          activeMenu: '/lab/myMeasureList',
+        },
+      },
+      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -270,6 +283,19 @@
         },
       },
       {
+        path: 'myMeasureDetail/:role/:id',
+        name: 'MyMeasureDetail',
+        component: () => import('@/views/business/lab/myMeasure/measureDetail.vue'),
+        meta: {
+          title: '部门检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          auth: '/lab/deptMeasureList',
+          activeMenu: '/lab/deptMeasureList',
+        },
+      },
+      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 066f192..7a6ebea 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -102,8 +102,9 @@
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
-          localStorage.removeItem('name')
           localStorage.removeItem('token')
+          localStorage.removeItem('nameId')
+          localStorage.removeItem('depId')
           this.username = ''
           this.token = ''
           this.roleList = []
@@ -121,7 +122,8 @@
               this.roleList = res.data.roleIds
               this.roleNames = res.data.roleNames
               this.roleTips = res.data.roleTips
-              localStorage.setItem('name', res.data.name)
+              localStorage.setItem('nameId', res.data.id)
+              localStorage.setItem('depId', res.data.deptId)
             }
             else {
               reject('该用户无角色')
diff --git a/src/views/business/board/overdueReminder/detail.vue b/src/views/business/board/overdueReminder/detail.vue
index 92987d1..0239b71 100644
--- a/src/views/business/board/overdueReminder/detail.vue
+++ b/src/views/business/board/overdueReminder/detail.vue
@@ -5,7 +5,7 @@
 import { ref } from 'vue'
 import dayjs from 'dayjs'
 import ProcessConfig from '@/views/business/schedule/task/components/processConfig.vue'
-import type { ISampleMeasure, ITaskDetail } from '@/views/business/schedule/task/task-interface'
+import type { ISampleMeasure, ITaskDetail } from '@/views/business/schedule/task/task-interface.js'
 import type { Menu, SimpleCertification, SimpleMeasureRecord, dictType } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getTaskDetail } from '@/api/business/schedule/task'
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index d6cc168..05fd811 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -4,8 +4,8 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import DistributeDialog from '../../schedule/task/components/distributeDialog.vue'
 import RollbackDialog from './../components/rollbackDialog.vue'
-import DistributeDialog from './../components/distributeDialog.vue'
 import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
@@ -131,7 +131,8 @@
 const depId = ref('')
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
+  $router.push(`myMeasureDetail/detail/${row.sampleId}?order=${row.orderId}`)
+  // $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
diff --git a/src/views/business/lab/myMeasure/components/chooseLab.vue b/src/views/business/lab/myMeasure/components/chooseLab.vue
new file mode 100644
index 0000000..0dcebfc
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/chooseLab.vue
@@ -0,0 +1,203 @@
+<script setup lang="ts" name="ChooseLab">
+// 选择实验室
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { ILabList, ILabSearchQuery } from '@/views/business/schedule/task/components/lab-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getOrganizeList } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
+const emits = defineEmits(['confirmCheckout'])
+// 是否多选
+const multi = ref(false)
+const dialogVisible = ref(false)
+
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
+// 查询条件
+const listQuery = ref<ILabSearchQuery>({
+  organizeNo: '', // 实验室编号
+  organizeName: '', // 实验室名称
+  meterMajor: '', // 专业
+  organizeType: '3', // 组织类型
+  director: '', // 负责人
+  isLab: '1', // 是否是实验室
+  createStartTime: '',
+  createEndTime: '',
+})
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '实验室名称', value: 'organizeName', width: '160', align: 'center' },
+  // { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
+  { text: '负责人', value: 'director', align: 'center', width: '120' },
+  { text: '计量专业', value: 'meterMajorName', align: 'center' },
+  { text: '实验室能力', value: 'labCapacityName', align: 'center' },
+])
+// 表格数据
+const list = ref<ILabList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 多选的内容
+const checkoutList = ref<ILabList[]>([])
+// 单选
+const singleChecked = ref()
+// 数据查询
+function fetchData(isNowPage = false) {
+  getOrganizeList(listQuery.value).then((response) => {
+    list.value = response.data
+    total.value = parseInt(response.data.length)
+    loadingTable.value = false
+  })
+  loadingTable.value = false
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    organizeNo: '', // 实验室编号
+    organizeName: '', // 实验室名称
+    meterMajor: '', // 专业
+    organizeType: '3', // 组织类型
+    director: '', // 负责人
+    isLab: '1', // 是否是实验室
+    createStartTime: '',
+    createEndTime: '',
+  }
+}
+
+// 点击取消
+const cancle = () => {
+  dialogVisible.value = false
+}
+// 点击确定
+const clickConfirm = () => {
+  // 如果多选
+  if (multi.value) {
+    if (!checkoutList.value.length) {
+      ElMessage({
+        message: '请选择至少一个实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      emits('confirmCheckout', checkoutList.value)
+    }
+  }
+  else {
+    if (!singleChecked.value) {
+      ElMessage({
+        message: '请选择检定实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      const checkValue = list.value.find(item => item.id == singleChecked.value)
+      emits('confirmCheckout', checkValue)
+    }
+  }
+
+  cancle()
+}
+
+// 初始化弹窗
+const initDialog = (multiSelect: boolean) => {
+  multi.value = multiSelect
+  dialogVisible.value = true
+  fetchData()
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <div class="choose-lab-dialog">
+    <el-dialog v-model="dialogVisible" :title="`选择检定实验室${(checkoutList.length > 0 && multi) ? `(已选择${checkoutList.length}个实验室)` : ''}`" width="1000" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.organizeName"
+            placeholder="实验室名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-select
+            v-model.trim="listQuery.meterMajor"
+            clearable
+            placeholder="计量专业"
+          >
+            <el-option
+              v-for="item in measureMajorList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <div style="padding: 5px 10px;">
+        <normal-table
+          :data="list"
+          :total="total"
+          :columns="columns"
+          :query="listQuery"
+          :list-loading="loadingTable"
+          :pagination="false"
+          size="small"
+          @multi-select="handleSelectionChange"
+        >
+          <!-- :is-showmulti-select="multi" -->
+          <!-- :is-multi="multi" -->
+          <template v-if="!multi" #preColumns>
+            <el-table-column label="#" width="55" align="center" fixed="left">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="" width="40" align="center" fixed>
+              <template #default="scope">
+                <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </div>
+
+      <template #footer>
+        <el-button type="primary" @click="clickConfirm">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.choose-lab-dialog {
+  :deep(.el-radio__label) {
+    display: none;
+  }
+}
+</style>
diff --git a/src/views/business/lab/myMeasure/components/lab-interface.ts b/src/views/business/lab/myMeasure/components/lab-interface.ts
new file mode 100644
index 0000000..02b0d1d
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/lab-interface.ts
@@ -0,0 +1,29 @@
+// 查询参数类型
+export interface ILabSearchQuery {
+  organizeNo: string // 组织编号
+  organizeName: string // 名称
+  organizeType: string // 类型-3科室
+  isLab: '1' // 是否是实验室
+  director: string // 负责人
+  meterMajor: string // 专业
+  createStartTime: '' // 创建开始时间
+  createEndTime: '' // 创建结束事假
+}
+
+// 部门返回值对象类型
+export interface ILabList {
+  id: string
+  deptId: string // 部门id
+  director: string // 负责人名称
+  phone: string // 负责人电话
+  meterMajor: string // 计量专业
+  organizeNo: string // 实验室编号
+  organizeName: string // 实验室名称
+  measureItems: string // 全部检测能力
+  pDeptId: string // 所属部门
+  pDeptName: string // 所属部门
+  organizeType: string // 组织类型
+  remark?: string // 备注
+  createTime?: string // 创建时间
+  updateTime?: string // 更新时间
+}

diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index b21ad07..cf4a5b9 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -260,6 +260,19 @@
         },
       },
       {
+        path: 'myMeasureDetail/:role/:id',
+        name: 'MyMeasureDetail',
+        component: () => import('@/views/business/lab/myMeasure/measureDetail.vue'),
+        meta: {
+          title: '我的检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          auth: '/lab/myMeasure',
+          activeMenu: '/lab/myMeasureList',
+        },
+      },
+      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -270,6 +283,19 @@
         },
       },
       {
+        path: 'myMeasureDetail/:role/:id',
+        name: 'MyMeasureDetail',
+        component: () => import('@/views/business/lab/myMeasure/measureDetail.vue'),
+        meta: {
+          title: '部门检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          auth: '/lab/deptMeasureList',
+          activeMenu: '/lab/deptMeasureList',
+        },
+      },
+      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 066f192..7a6ebea 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -102,8 +102,9 @@
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
-          localStorage.removeItem('name')
           localStorage.removeItem('token')
+          localStorage.removeItem('nameId')
+          localStorage.removeItem('depId')
           this.username = ''
           this.token = ''
           this.roleList = []
@@ -121,7 +122,8 @@
               this.roleList = res.data.roleIds
               this.roleNames = res.data.roleNames
               this.roleTips = res.data.roleTips
-              localStorage.setItem('name', res.data.name)
+              localStorage.setItem('nameId', res.data.id)
+              localStorage.setItem('depId', res.data.deptId)
             }
             else {
               reject('该用户无角色')
diff --git a/src/views/business/board/overdueReminder/detail.vue b/src/views/business/board/overdueReminder/detail.vue
index 92987d1..0239b71 100644
--- a/src/views/business/board/overdueReminder/detail.vue
+++ b/src/views/business/board/overdueReminder/detail.vue
@@ -5,7 +5,7 @@
 import { ref } from 'vue'
 import dayjs from 'dayjs'
 import ProcessConfig from '@/views/business/schedule/task/components/processConfig.vue'
-import type { ISampleMeasure, ITaskDetail } from '@/views/business/schedule/task/task-interface'
+import type { ISampleMeasure, ITaskDetail } from '@/views/business/schedule/task/task-interface.js'
 import type { Menu, SimpleCertification, SimpleMeasureRecord, dictType } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getTaskDetail } from '@/api/business/schedule/task'
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index d6cc168..05fd811 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -4,8 +4,8 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import DistributeDialog from '../../schedule/task/components/distributeDialog.vue'
 import RollbackDialog from './../components/rollbackDialog.vue'
-import DistributeDialog from './../components/distributeDialog.vue'
 import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
@@ -131,7 +131,8 @@
 const depId = ref('')
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
+  $router.push(`myMeasureDetail/detail/${row.sampleId}?order=${row.orderId}`)
+  // $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
diff --git a/src/views/business/lab/myMeasure/components/chooseLab.vue b/src/views/business/lab/myMeasure/components/chooseLab.vue
new file mode 100644
index 0000000..0dcebfc
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/chooseLab.vue
@@ -0,0 +1,203 @@
+<script setup lang="ts" name="ChooseLab">
+// 选择实验室
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { ILabList, ILabSearchQuery } from '@/views/business/schedule/task/components/lab-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getOrganizeList } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
+const emits = defineEmits(['confirmCheckout'])
+// 是否多选
+const multi = ref(false)
+const dialogVisible = ref(false)
+
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
+// 查询条件
+const listQuery = ref<ILabSearchQuery>({
+  organizeNo: '', // 实验室编号
+  organizeName: '', // 实验室名称
+  meterMajor: '', // 专业
+  organizeType: '3', // 组织类型
+  director: '', // 负责人
+  isLab: '1', // 是否是实验室
+  createStartTime: '',
+  createEndTime: '',
+})
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '实验室名称', value: 'organizeName', width: '160', align: 'center' },
+  // { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
+  { text: '负责人', value: 'director', align: 'center', width: '120' },
+  { text: '计量专业', value: 'meterMajorName', align: 'center' },
+  { text: '实验室能力', value: 'labCapacityName', align: 'center' },
+])
+// 表格数据
+const list = ref<ILabList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 多选的内容
+const checkoutList = ref<ILabList[]>([])
+// 单选
+const singleChecked = ref()
+// 数据查询
+function fetchData(isNowPage = false) {
+  getOrganizeList(listQuery.value).then((response) => {
+    list.value = response.data
+    total.value = parseInt(response.data.length)
+    loadingTable.value = false
+  })
+  loadingTable.value = false
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    organizeNo: '', // 实验室编号
+    organizeName: '', // 实验室名称
+    meterMajor: '', // 专业
+    organizeType: '3', // 组织类型
+    director: '', // 负责人
+    isLab: '1', // 是否是实验室
+    createStartTime: '',
+    createEndTime: '',
+  }
+}
+
+// 点击取消
+const cancle = () => {
+  dialogVisible.value = false
+}
+// 点击确定
+const clickConfirm = () => {
+  // 如果多选
+  if (multi.value) {
+    if (!checkoutList.value.length) {
+      ElMessage({
+        message: '请选择至少一个实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      emits('confirmCheckout', checkoutList.value)
+    }
+  }
+  else {
+    if (!singleChecked.value) {
+      ElMessage({
+        message: '请选择检定实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      const checkValue = list.value.find(item => item.id == singleChecked.value)
+      emits('confirmCheckout', checkValue)
+    }
+  }
+
+  cancle()
+}
+
+// 初始化弹窗
+const initDialog = (multiSelect: boolean) => {
+  multi.value = multiSelect
+  dialogVisible.value = true
+  fetchData()
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <div class="choose-lab-dialog">
+    <el-dialog v-model="dialogVisible" :title="`选择检定实验室${(checkoutList.length > 0 && multi) ? `(已选择${checkoutList.length}个实验室)` : ''}`" width="1000" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.organizeName"
+            placeholder="实验室名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-select
+            v-model.trim="listQuery.meterMajor"
+            clearable
+            placeholder="计量专业"
+          >
+            <el-option
+              v-for="item in measureMajorList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <div style="padding: 5px 10px;">
+        <normal-table
+          :data="list"
+          :total="total"
+          :columns="columns"
+          :query="listQuery"
+          :list-loading="loadingTable"
+          :pagination="false"
+          size="small"
+          @multi-select="handleSelectionChange"
+        >
+          <!-- :is-showmulti-select="multi" -->
+          <!-- :is-multi="multi" -->
+          <template v-if="!multi" #preColumns>
+            <el-table-column label="#" width="55" align="center" fixed="left">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="" width="40" align="center" fixed>
+              <template #default="scope">
+                <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </div>
+
+      <template #footer>
+        <el-button type="primary" @click="clickConfirm">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.choose-lab-dialog {
+  :deep(.el-radio__label) {
+    display: none;
+  }
+}
+</style>
diff --git a/src/views/business/lab/myMeasure/components/lab-interface.ts b/src/views/business/lab/myMeasure/components/lab-interface.ts
new file mode 100644
index 0000000..02b0d1d
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/lab-interface.ts
@@ -0,0 +1,29 @@
+// 查询参数类型
+export interface ILabSearchQuery {
+  organizeNo: string // 组织编号
+  organizeName: string // 名称
+  organizeType: string // 类型-3科室
+  isLab: '1' // 是否是实验室
+  director: string // 负责人
+  meterMajor: string // 专业
+  createStartTime: '' // 创建开始时间
+  createEndTime: '' // 创建结束事假
+}
+
+// 部门返回值对象类型
+export interface ILabList {
+  id: string
+  deptId: string // 部门id
+  director: string // 负责人名称
+  phone: string // 负责人电话
+  meterMajor: string // 计量专业
+  organizeNo: string // 实验室编号
+  organizeName: string // 实验室名称
+  measureItems: string // 全部检测能力
+  pDeptId: string // 所属部门
+  pDeptName: string // 所属部门
+  organizeType: string // 组织类型
+  remark?: string // 备注
+  createTime?: string // 创建时间
+  updateTime?: string // 更新时间
+}
diff --git a/src/views/business/lab/myMeasure/components/processConfig.vue b/src/views/business/lab/myMeasure/components/processConfig.vue
new file mode 100644
index 0000000..bb66076
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/processConfig.vue
@@ -0,0 +1,161 @@
+<script setup lang="ts" name="ProcessConfig">
+import { ref } from 'vue'
+import draggable from 'vuedraggable'
+import { ElMessage } from 'element-plus'
+import type { ISchedule, IScheduleSet } from '../task-interface'
+import ProcessNode from './processNode.vue'
+import ProcessNodeAdd from './processNodeAdd.vue'
+import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
+import { setMeasureProcess, setMeasureProcessByFfy } from '@/api/business/schedule/task'
+const props = defineProps({
+  type: {
+    type: String,
+    default: 'distribute',
+  }, // 类型，决定调用哪个接口
+  // 是否为详情展示页面
+  detail: {
+    type: Boolean,
+    default: false,
+  },
+  // 样品id
+  sampleId: {
+    type: String,
+    required: true,
+  },
+  // 委托单id
+  orderId: {
+    type: String,
+    required: true,
+  },
+  list: {
+    type: Array,
+    default: () => [],
+  },
+})
+const emits = defineEmits(['saveOver'])
+// 默认流程节点
+const defaultProcess: IScheduleSet = {
+  measurePersonId: '', // 执行人
+  measurePerson: '', // 执行人名称
+  measureSegmentId: '', // 执行部门
+  measureSegment: '', // 执行部门名称
+  executiveItem: '', // 检定项目
+  // alreadyCertifications: 0, // 已出具证书总数
+  requireCertifications: 1, // 应出具证书总数
+  measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: '', // 流程更新时间
+}
+// 检定流程列表
+const processList = ref<IScheduleSet[]>([
+  { ...defaultProcess },
+])
+
+watch(() => props.list, (val) => {
+  if (props.list.length > 0) {
+    processList.value = props.list as ISchedule[]
+  }
+},
+{ deep: true, immediate: true })
+
+// 点击添加流程
+const processAdd = () => {
+  processList.value.push({ ...defaultProcess })
+}
+// 检查是否允许移动
+const checkMove = (evt: any) => {
+  // 目的位置元素evt.relatedContext.element
+  // 当前拖动元素evt.draggedContext.element
+  if (evt.relatedContext.element.measureState !== '0') {
+    return false
+  }
+  return true
+}
+
+// 选择实验室弹窗
+const chooseLabDialog = ref()
+// 批量添加流程
+const batchProcessAdd = () => {
+  chooseLabDialog.value.initDialog(true)
+}
+
+// 批量添加实验室
+const batchChooseOver = (labs: ILabList[]) => {
+  for (const item of labs) {
+    const processTemp: IScheduleSet = {
+      measurePersonId: '', // 执行人
+      measurePerson: '', // 执行人名称
+      measureSegmentId: item.deptId, // 执行部门
+      measureSegment: item.organizeName, // 执行部门名称
+      executiveItem: '', // 检定项目
+      measureSequence: '', // 监测顺序
+      // alreadyCertifications: 0, // 已出具证书总数
+      requireCertifications: 1, // 应出具证书总数
+      measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      updateTime: '', // 流程更新时间
+    }
+    processList.value.push(processTemp)
+  }
+}
+
+// 保存流程
+const saveProcess = () => {
+  const form = {
+    measureProcessList: processList.value,
+    executiveList: processList.value,
+    orderId: props.orderId,
+    sampleId: props.sampleId,
+  }
+  // 处理顺序
+  for (const key in form.measureProcessList) {
+    form.measureProcessList[key].measureSequence = (parseInt(key) + 1).toString()
+  }
+  if (props.type == 'distribute') {
+    setMeasureProcess(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
+  else {
+    setMeasureProcessByFfy(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
+}
+// 删除流程
+const deleteProcess = (index: number) => {
+  processList.value.splice(index, 1)
+}
+
+// --------暴露方法
+defineExpose({ saveProcess, batchProcessAdd, deleteProcess })
+</script>
+
+<template>
+  <div>
+    <div class="process-container">
+      <draggable v-model="processList" item-key="id" class="process-draggable" handle=".handle" :move="checkMove">
+        <!-- eslint-disable-next-line vue/no-unused-vars -->
+        <template #item="{ process, index }">
+          <process-node v-model="processList[index]" :step="index + 1" :detail="props.detail" @delete="deleteProcess(index)" />
+        </template>
+        <template #footer>
+          <process-node-add v-if="!props.detail" @click="processAdd" />
+        </template>
+      </draggable>
+    </div>
+    <choose-lab ref="chooseLabDialog" @confirm-checkout="batchChooseOver" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.process-container {
+  .process-draggable {
+    display: flex;
+    flex-wrap: wrap;
+  }
+}
+</style>

diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index b21ad07..cf4a5b9 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -260,6 +260,19 @@
         },
       },
       {
+        path: 'myMeasureDetail/:role/:id',
+        name: 'MyMeasureDetail',
+        component: () => import('@/views/business/lab/myMeasure/measureDetail.vue'),
+        meta: {
+          title: '我的检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          auth: '/lab/myMeasure',
+          activeMenu: '/lab/myMeasureList',
+        },
+      },
+      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -270,6 +283,19 @@
         },
       },
       {
+        path: 'myMeasureDetail/:role/:id',
+        name: 'MyMeasureDetail',
+        component: () => import('@/views/business/lab/myMeasure/measureDetail.vue'),
+        meta: {
+          title: '部门检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          auth: '/lab/deptMeasureList',
+          activeMenu: '/lab/deptMeasureList',
+        },
+      },
+      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 066f192..7a6ebea 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -102,8 +102,9 @@
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
-          localStorage.removeItem('name')
           localStorage.removeItem('token')
+          localStorage.removeItem('nameId')
+          localStorage.removeItem('depId')
           this.username = ''
           this.token = ''
           this.roleList = []
@@ -121,7 +122,8 @@
               this.roleList = res.data.roleIds
               this.roleNames = res.data.roleNames
               this.roleTips = res.data.roleTips
-              localStorage.setItem('name', res.data.name)
+              localStorage.setItem('nameId', res.data.id)
+              localStorage.setItem('depId', res.data.deptId)
             }
             else {
               reject('该用户无角色')
diff --git a/src/views/business/board/overdueReminder/detail.vue b/src/views/business/board/overdueReminder/detail.vue
index 92987d1..0239b71 100644
--- a/src/views/business/board/overdueReminder/detail.vue
+++ b/src/views/business/board/overdueReminder/detail.vue
@@ -5,7 +5,7 @@
 import { ref } from 'vue'
 import dayjs from 'dayjs'
 import ProcessConfig from '@/views/business/schedule/task/components/processConfig.vue'
-import type { ISampleMeasure, ITaskDetail } from '@/views/business/schedule/task/task-interface'
+import type { ISampleMeasure, ITaskDetail } from '@/views/business/schedule/task/task-interface.js'
 import type { Menu, SimpleCertification, SimpleMeasureRecord, dictType } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getTaskDetail } from '@/api/business/schedule/task'
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index d6cc168..05fd811 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -4,8 +4,8 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import DistributeDialog from '../../schedule/task/components/distributeDialog.vue'
 import RollbackDialog from './../components/rollbackDialog.vue'
-import DistributeDialog from './../components/distributeDialog.vue'
 import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
@@ -131,7 +131,8 @@
 const depId = ref('')
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
+  $router.push(`myMeasureDetail/detail/${row.sampleId}?order=${row.orderId}`)
+  // $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
diff --git a/src/views/business/lab/myMeasure/components/chooseLab.vue b/src/views/business/lab/myMeasure/components/chooseLab.vue
new file mode 100644
index 0000000..0dcebfc
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/chooseLab.vue
@@ -0,0 +1,203 @@
+<script setup lang="ts" name="ChooseLab">
+// 选择实验室
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { ILabList, ILabSearchQuery } from '@/views/business/schedule/task/components/lab-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getOrganizeList } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
+const emits = defineEmits(['confirmCheckout'])
+// 是否多选
+const multi = ref(false)
+const dialogVisible = ref(false)
+
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
+// 查询条件
+const listQuery = ref<ILabSearchQuery>({
+  organizeNo: '', // 实验室编号
+  organizeName: '', // 实验室名称
+  meterMajor: '', // 专业
+  organizeType: '3', // 组织类型
+  director: '', // 负责人
+  isLab: '1', // 是否是实验室
+  createStartTime: '',
+  createEndTime: '',
+})
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '实验室名称', value: 'organizeName', width: '160', align: 'center' },
+  // { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
+  { text: '负责人', value: 'director', align: 'center', width: '120' },
+  { text: '计量专业', value: 'meterMajorName', align: 'center' },
+  { text: '实验室能力', value: 'labCapacityName', align: 'center' },
+])
+// 表格数据
+const list = ref<ILabList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 多选的内容
+const checkoutList = ref<ILabList[]>([])
+// 单选
+const singleChecked = ref()
+// 数据查询
+function fetchData(isNowPage = false) {
+  getOrganizeList(listQuery.value).then((response) => {
+    list.value = response.data
+    total.value = parseInt(response.data.length)
+    loadingTable.value = false
+  })
+  loadingTable.value = false
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    organizeNo: '', // 实验室编号
+    organizeName: '', // 实验室名称
+    meterMajor: '', // 专业
+    organizeType: '3', // 组织类型
+    director: '', // 负责人
+    isLab: '1', // 是否是实验室
+    createStartTime: '',
+    createEndTime: '',
+  }
+}
+
+// 点击取消
+const cancle = () => {
+  dialogVisible.value = false
+}
+// 点击确定
+const clickConfirm = () => {
+  // 如果多选
+  if (multi.value) {
+    if (!checkoutList.value.length) {
+      ElMessage({
+        message: '请选择至少一个实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      emits('confirmCheckout', checkoutList.value)
+    }
+  }
+  else {
+    if (!singleChecked.value) {
+      ElMessage({
+        message: '请选择检定实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      const checkValue = list.value.find(item => item.id == singleChecked.value)
+      emits('confirmCheckout', checkValue)
+    }
+  }
+
+  cancle()
+}
+
+// 初始化弹窗
+const initDialog = (multiSelect: boolean) => {
+  multi.value = multiSelect
+  dialogVisible.value = true
+  fetchData()
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <div class="choose-lab-dialog">
+    <el-dialog v-model="dialogVisible" :title="`选择检定实验室${(checkoutList.length > 0 && multi) ? `(已选择${checkoutList.length}个实验室)` : ''}`" width="1000" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.organizeName"
+            placeholder="实验室名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-select
+            v-model.trim="listQuery.meterMajor"
+            clearable
+            placeholder="计量专业"
+          >
+            <el-option
+              v-for="item in measureMajorList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <div style="padding: 5px 10px;">
+        <normal-table
+          :data="list"
+          :total="total"
+          :columns="columns"
+          :query="listQuery"
+          :list-loading="loadingTable"
+          :pagination="false"
+          size="small"
+          @multi-select="handleSelectionChange"
+        >
+          <!-- :is-showmulti-select="multi" -->
+          <!-- :is-multi="multi" -->
+          <template v-if="!multi" #preColumns>
+            <el-table-column label="#" width="55" align="center" fixed="left">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="" width="40" align="center" fixed>
+              <template #default="scope">
+                <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </div>
+
+      <template #footer>
+        <el-button type="primary" @click="clickConfirm">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.choose-lab-dialog {
+  :deep(.el-radio__label) {
+    display: none;
+  }
+}
+</style>
diff --git a/src/views/business/lab/myMeasure/components/lab-interface.ts b/src/views/business/lab/myMeasure/components/lab-interface.ts
new file mode 100644
index 0000000..02b0d1d
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/lab-interface.ts
@@ -0,0 +1,29 @@
+// 查询参数类型
+export interface ILabSearchQuery {
+  organizeNo: string // 组织编号
+  organizeName: string // 名称
+  organizeType: string // 类型-3科室
+  isLab: '1' // 是否是实验室
+  director: string // 负责人
+  meterMajor: string // 专业
+  createStartTime: '' // 创建开始时间
+  createEndTime: '' // 创建结束事假
+}
+
+// 部门返回值对象类型
+export interface ILabList {
+  id: string
+  deptId: string // 部门id
+  director: string // 负责人名称
+  phone: string // 负责人电话
+  meterMajor: string // 计量专业
+  organizeNo: string // 实验室编号
+  organizeName: string // 实验室名称
+  measureItems: string // 全部检测能力
+  pDeptId: string // 所属部门
+  pDeptName: string // 所属部门
+  organizeType: string // 组织类型
+  remark?: string // 备注
+  createTime?: string // 创建时间
+  updateTime?: string // 更新时间
+}
diff --git a/src/views/business/lab/myMeasure/components/processConfig.vue b/src/views/business/lab/myMeasure/components/processConfig.vue
new file mode 100644
index 0000000..bb66076
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/processConfig.vue
@@ -0,0 +1,161 @@
+<script setup lang="ts" name="ProcessConfig">
+import { ref } from 'vue'
+import draggable from 'vuedraggable'
+import { ElMessage } from 'element-plus'
+import type { ISchedule, IScheduleSet } from '../task-interface'
+import ProcessNode from './processNode.vue'
+import ProcessNodeAdd from './processNodeAdd.vue'
+import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
+import { setMeasureProcess, setMeasureProcessByFfy } from '@/api/business/schedule/task'
+const props = defineProps({
+  type: {
+    type: String,
+    default: 'distribute',
+  }, // 类型，决定调用哪个接口
+  // 是否为详情展示页面
+  detail: {
+    type: Boolean,
+    default: false,
+  },
+  // 样品id
+  sampleId: {
+    type: String,
+    required: true,
+  },
+  // 委托单id
+  orderId: {
+    type: String,
+    required: true,
+  },
+  list: {
+    type: Array,
+    default: () => [],
+  },
+})
+const emits = defineEmits(['saveOver'])
+// 默认流程节点
+const defaultProcess: IScheduleSet = {
+  measurePersonId: '', // 执行人
+  measurePerson: '', // 执行人名称
+  measureSegmentId: '', // 执行部门
+  measureSegment: '', // 执行部门名称
+  executiveItem: '', // 检定项目
+  // alreadyCertifications: 0, // 已出具证书总数
+  requireCertifications: 1, // 应出具证书总数
+  measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: '', // 流程更新时间
+}
+// 检定流程列表
+const processList = ref<IScheduleSet[]>([
+  { ...defaultProcess },
+])
+
+watch(() => props.list, (val) => {
+  if (props.list.length > 0) {
+    processList.value = props.list as ISchedule[]
+  }
+},
+{ deep: true, immediate: true })
+
+// 点击添加流程
+const processAdd = () => {
+  processList.value.push({ ...defaultProcess })
+}
+// 检查是否允许移动
+const checkMove = (evt: any) => {
+  // 目的位置元素evt.relatedContext.element
+  // 当前拖动元素evt.draggedContext.element
+  if (evt.relatedContext.element.measureState !== '0') {
+    return false
+  }
+  return true
+}
+
+// 选择实验室弹窗
+const chooseLabDialog = ref()
+// 批量添加流程
+const batchProcessAdd = () => {
+  chooseLabDialog.value.initDialog(true)
+}
+
+// 批量添加实验室
+const batchChooseOver = (labs: ILabList[]) => {
+  for (const item of labs) {
+    const processTemp: IScheduleSet = {
+      measurePersonId: '', // 执行人
+      measurePerson: '', // 执行人名称
+      measureSegmentId: item.deptId, // 执行部门
+      measureSegment: item.organizeName, // 执行部门名称
+      executiveItem: '', // 检定项目
+      measureSequence: '', // 监测顺序
+      // alreadyCertifications: 0, // 已出具证书总数
+      requireCertifications: 1, // 应出具证书总数
+      measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      updateTime: '', // 流程更新时间
+    }
+    processList.value.push(processTemp)
+  }
+}
+
+// 保存流程
+const saveProcess = () => {
+  const form = {
+    measureProcessList: processList.value,
+    executiveList: processList.value,
+    orderId: props.orderId,
+    sampleId: props.sampleId,
+  }
+  // 处理顺序
+  for (const key in form.measureProcessList) {
+    form.measureProcessList[key].measureSequence = (parseInt(key) + 1).toString()
+  }
+  if (props.type == 'distribute') {
+    setMeasureProcess(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
+  else {
+    setMeasureProcessByFfy(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
+}
+// 删除流程
+const deleteProcess = (index: number) => {
+  processList.value.splice(index, 1)
+}
+
+// --------暴露方法
+defineExpose({ saveProcess, batchProcessAdd, deleteProcess })
+</script>
+
+<template>
+  <div>
+    <div class="process-container">
+      <draggable v-model="processList" item-key="id" class="process-draggable" handle=".handle" :move="checkMove">
+        <!-- eslint-disable-next-line vue/no-unused-vars -->
+        <template #item="{ process, index }">
+          <process-node v-model="processList[index]" :step="index + 1" :detail="props.detail" @delete="deleteProcess(index)" />
+        </template>
+        <template #footer>
+          <process-node-add v-if="!props.detail" @click="processAdd" />
+        </template>
+      </draggable>
+    </div>
+    <choose-lab ref="chooseLabDialog" @confirm-checkout="batchChooseOver" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.process-container {
+  .process-draggable {
+    display: flex;
+    flex-wrap: wrap;
+  }
+}
+</style>
diff --git a/src/views/business/lab/myMeasure/components/processNode.vue b/src/views/business/lab/myMeasure/components/processNode.vue
new file mode 100644
index 0000000..fad76ab
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/processNode.vue
@@ -0,0 +1,215 @@
+<script lang="ts" setup name="ProcessNode">
+import {
+  Aim, Rank, Remove,
+} from '@element-plus/icons-vue'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
+// 逻辑代码
+const props = defineProps({
+  // 默认数据
+  modelValue: {
+    type: Object,
+    default: () => {
+      return {
+        measurePersonId: '', // 执行人
+        measurePerson: '', // 执行人名称
+        measureSegmentId: '', // 执行部门
+        measureSegment: '', // 执行部门名称
+        executiveItem: '', // 检定项目
+        alreadyCertifications: 0, // 已出具证书总数
+        requireCertifications: 0, // 应出具证书总数
+        measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        updateTime: '', // 流程更新时间
+      }
+    },
+  },
+  // 是否为详情展示页面
+  detail: {
+    type: Boolean,
+    default: false,
+  },
+  // 步骤
+  step: {
+    type: Number,
+    default: 1,
+  },
+})
+const emit = defineEmits(['update:modelValue', 'delete'])
+
+// ------------定义props参数----------
+const processNodeData = computed({
+  get() {
+    return props.modelValue
+  },
+  set(value) {
+    emit('update:modelValue', value)
+  },
+})
+// 检定环节可编辑-只有待分发状态可编辑
+const deptEdit = computed(() => {
+  const editStates = ['']
+  return editStates.includes(processNodeData.value.measureStatus)
+})
+// 检定人可编辑-待分配状态可编辑
+const personEdit = computed(() => {
+  const editStates = ['', '1', '2']
+  return editStates.includes(processNodeData.value.measureStatus)
+})
+// 证书可编辑-待分发、待分配、待检测状态可编辑
+const certificationEdit = computed(() => {
+  const editStates = ['', '1', '2', '3']
+  return editStates.includes(processNodeData.value.measureStatus)
+})
+// 节点可移动
+const canMove = computed(() => {
+  const editStates = ['', '1']
+  return editStates.includes(processNodeData.value.measureStatus)
+})
+
+// 选择人员
+const choosePersonShow = ref(false)
+const choosePerson = () => {
+  choosePersonShow.value = true
+}
+// 人员选择完毕
+const choosePersonOver = (person: { id: string; name: string }) => {
+  processNodeData.value.measurePersonId = person.id
+  processNodeData.value.measurePerson = person.name
+  choosePersonShow.value = false
+}
+
+// 选择实验室
+const chooseLabDialog = ref()
+const clickChoose = () => {
+  chooseLabDialog.value.initDialog(false)
+}
+const _selectStaffDialog = ref()
+// 实验室选择完毕
+const chooseOver = (lab: ILabList) => {
+  console.log(lab)
+  processNodeData.value.measureSegmentId = lab.deptId
+  processNodeData.value.measureSegment = lab.organizeName
+  // 定义一个对象关联上子组件的 ref 值（注意：这里的属性名必须跟子组件定义的 ref 值一模一样，否者会关联失效）
+  // 延迟使用，因为还没挂载
+  nextTick(() => {
+    _selectStaffDialog.value.fetchData()
+  })
+}
+
+// 移除该节点
+const deleteNode = () => {
+  emit('delete')
+}
+</script>
+
+<template>
+  <div class="process-node">
+    <div class="header">
+      <div class="step">
+        {{ props.step }}
+      </div>
+      <div class="buttons">
+        <el-icon v-show="canMove && !props.detail" class="icon-button" title="移除" @click="deleteNode">
+          <remove />
+        </el-icon>
+        <el-icon v-show="canMove && !props.detail" class="icon-button handle" title="移动">
+          <rank />
+        </el-icon>
+      </div>
+    </div>
+    <div>
+      <div class="line">
+        <span class="label">检定环节</span>
+        <el-input v-model="processNodeData.measureSegment" class="process-input" readonly size="small" :disabled="!deptEdit || props.detail">
+          <template v-if="deptEdit && !props.detail" #append>
+            <el-button :icon="Aim" size="small" link @click="clickChoose" />
+          </template>
+        </el-input>
+      </div>
+      <div class="line">
+        <span class="label">检定人员</span>
+        <el-input v-model="processNodeData.measurePerson" readonly class="process-input" size="small" :disabled="!personEdit || props.detail">
+          <template v-if="personEdit && !props.detail" #append>
+            <el-button :icon="Aim" size="small" link :disabled="processNodeData.measureSegment === ''" @click="choosePerson" />
+          </template>
+        </el-input>
+      </div>
+      <div class="line">
+        <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit || props.detail" /><span class="unit"> 份</span>
+      </div>
+      <div class="line">
+        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStatusName }}</span>
+      </div>
+      <div class="line">
+        <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
+      </div>
+    </div>
+    <!-- 选择实验室弹窗 -->
+    <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
+    <!-- 成员弹框 -->
+    <select-staff-dialog ref="_selectStaffDialog" v-model:visible="choosePersonShow" :data="[processNodeData.measurePersonId]" :dept-id="processNodeData.measureSegmentId" :dept-name="processNodeData.measureSegment" :multi="false" @change="choosePersonOver" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.process-node {
+  // display: inline-block;
+  margin-right: 10px;
+  width: 280px;
+  height: 215px;
+  border: 1px solid #e0e0e0;
+  padding: 5px 15px;
+  border-radius: 5px;
+  background-color: #fafafa;
+  margin-bottom: 10px;
+
+  .header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+    .step {
+      line-height: 28px;
+      font-size: 16px;
+      color: #3d7eff;
+      font-weight: bold;
+      margin-bottom: 5px;
+    }
+
+    .icon-button {
+      color: #999;
+      margin-left: 5px;
+      font-size: 16px;
+
+      &:hover {
+        cursor: pointer;
+      }
+    }
+  }
+
+  .line {
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 4px 0;
+
+    .label {
+      width: 80px;
+      font-size: 14px;
+    }
+
+    .process-input {
+      flex: 1;
+      font-size: 14px;
+    }
+
+    .unit {
+      margin-left: 5px;
+      font-size: 14px;
+    }
+  }
+}
+</style>

diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index b21ad07..cf4a5b9 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -260,6 +260,19 @@
         },
       },
       {
+        path: 'myMeasureDetail/:role/:id',
+        name: 'MyMeasureDetail',
+        component: () => import('@/views/business/lab/myMeasure/measureDetail.vue'),
+        meta: {
+          title: '我的检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          auth: '/lab/myMeasure',
+          activeMenu: '/lab/myMeasureList',
+        },
+      },
+      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -270,6 +283,19 @@
         },
       },
       {
+        path: 'myMeasureDetail/:role/:id',
+        name: 'MyMeasureDetail',
+        component: () => import('@/views/business/lab/myMeasure/measureDetail.vue'),
+        meta: {
+          title: '部门检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          auth: '/lab/deptMeasureList',
+          activeMenu: '/lab/deptMeasureList',
+        },
+      },
+      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 066f192..7a6ebea 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -102,8 +102,9 @@
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
-          localStorage.removeItem('name')
           localStorage.removeItem('token')
+          localStorage.removeItem('nameId')
+          localStorage.removeItem('depId')
           this.username = ''
           this.token = ''
           this.roleList = []
@@ -121,7 +122,8 @@
               this.roleList = res.data.roleIds
               this.roleNames = res.data.roleNames
               this.roleTips = res.data.roleTips
-              localStorage.setItem('name', res.data.name)
+              localStorage.setItem('nameId', res.data.id)
+              localStorage.setItem('depId', res.data.deptId)
             }
             else {
               reject('该用户无角色')
diff --git a/src/views/business/board/overdueReminder/detail.vue b/src/views/business/board/overdueReminder/detail.vue
index 92987d1..0239b71 100644
--- a/src/views/business/board/overdueReminder/detail.vue
+++ b/src/views/business/board/overdueReminder/detail.vue
@@ -5,7 +5,7 @@
 import { ref } from 'vue'
 import dayjs from 'dayjs'
 import ProcessConfig from '@/views/business/schedule/task/components/processConfig.vue'
-import type { ISampleMeasure, ITaskDetail } from '@/views/business/schedule/task/task-interface'
+import type { ISampleMeasure, ITaskDetail } from '@/views/business/schedule/task/task-interface.js'
 import type { Menu, SimpleCertification, SimpleMeasureRecord, dictType } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getTaskDetail } from '@/api/business/schedule/task'
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index d6cc168..05fd811 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -4,8 +4,8 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import DistributeDialog from '../../schedule/task/components/distributeDialog.vue'
 import RollbackDialog from './../components/rollbackDialog.vue'
-import DistributeDialog from './../components/distributeDialog.vue'
 import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
@@ -131,7 +131,8 @@
 const depId = ref('')
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
+  $router.push(`myMeasureDetail/detail/${row.sampleId}?order=${row.orderId}`)
+  // $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
diff --git a/src/views/business/lab/myMeasure/components/chooseLab.vue b/src/views/business/lab/myMeasure/components/chooseLab.vue
new file mode 100644
index 0000000..0dcebfc
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/chooseLab.vue
@@ -0,0 +1,203 @@
+<script setup lang="ts" name="ChooseLab">
+// 选择实验室
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { ILabList, ILabSearchQuery } from '@/views/business/schedule/task/components/lab-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getOrganizeList } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
+const emits = defineEmits(['confirmCheckout'])
+// 是否多选
+const multi = ref(false)
+const dialogVisible = ref(false)
+
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
+// 查询条件
+const listQuery = ref<ILabSearchQuery>({
+  organizeNo: '', // 实验室编号
+  organizeName: '', // 实验室名称
+  meterMajor: '', // 专业
+  organizeType: '3', // 组织类型
+  director: '', // 负责人
+  isLab: '1', // 是否是实验室
+  createStartTime: '',
+  createEndTime: '',
+})
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '实验室名称', value: 'organizeName', width: '160', align: 'center' },
+  // { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
+  { text: '负责人', value: 'director', align: 'center', width: '120' },
+  { text: '计量专业', value: 'meterMajorName', align: 'center' },
+  { text: '实验室能力', value: 'labCapacityName', align: 'center' },
+])
+// 表格数据
+const list = ref<ILabList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 多选的内容
+const checkoutList = ref<ILabList[]>([])
+// 单选
+const singleChecked = ref()
+// 数据查询
+function fetchData(isNowPage = false) {
+  getOrganizeList(listQuery.value).then((response) => {
+    list.value = response.data
+    total.value = parseInt(response.data.length)
+    loadingTable.value = false
+  })
+  loadingTable.value = false
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    organizeNo: '', // 实验室编号
+    organizeName: '', // 实验室名称
+    meterMajor: '', // 专业
+    organizeType: '3', // 组织类型
+    director: '', // 负责人
+    isLab: '1', // 是否是实验室
+    createStartTime: '',
+    createEndTime: '',
+  }
+}
+
+// 点击取消
+const cancle = () => {
+  dialogVisible.value = false
+}
+// 点击确定
+const clickConfirm = () => {
+  // 如果多选
+  if (multi.value) {
+    if (!checkoutList.value.length) {
+      ElMessage({
+        message: '请选择至少一个实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      emits('confirmCheckout', checkoutList.value)
+    }
+  }
+  else {
+    if (!singleChecked.value) {
+      ElMessage({
+        message: '请选择检定实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      const checkValue = list.value.find(item => item.id == singleChecked.value)
+      emits('confirmCheckout', checkValue)
+    }
+  }
+
+  cancle()
+}
+
+// 初始化弹窗
+const initDialog = (multiSelect: boolean) => {
+  multi.value = multiSelect
+  dialogVisible.value = true
+  fetchData()
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <div class="choose-lab-dialog">
+    <el-dialog v-model="dialogVisible" :title="`选择检定实验室${(checkoutList.length > 0 && multi) ? `(已选择${checkoutList.length}个实验室)` : ''}`" width="1000" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.organizeName"
+            placeholder="实验室名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-select
+            v-model.trim="listQuery.meterMajor"
+            clearable
+            placeholder="计量专业"
+          >
+            <el-option
+              v-for="item in measureMajorList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <div style="padding: 5px 10px;">
+        <normal-table
+          :data="list"
+          :total="total"
+          :columns="columns"
+          :query="listQuery"
+          :list-loading="loadingTable"
+          :pagination="false"
+          size="small"
+          @multi-select="handleSelectionChange"
+        >
+          <!-- :is-showmulti-select="multi" -->
+          <!-- :is-multi="multi" -->
+          <template v-if="!multi" #preColumns>
+            <el-table-column label="#" width="55" align="center" fixed="left">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="" width="40" align="center" fixed>
+              <template #default="scope">
+                <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </div>
+
+      <template #footer>
+        <el-button type="primary" @click="clickConfirm">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.choose-lab-dialog {
+  :deep(.el-radio__label) {
+    display: none;
+  }
+}
+</style>
diff --git a/src/views/business/lab/myMeasure/components/lab-interface.ts b/src/views/business/lab/myMeasure/components/lab-interface.ts
new file mode 100644
index 0000000..02b0d1d
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/lab-interface.ts
@@ -0,0 +1,29 @@
+// 查询参数类型
+export interface ILabSearchQuery {
+  organizeNo: string // 组织编号
+  organizeName: string // 名称
+  organizeType: string // 类型-3科室
+  isLab: '1' // 是否是实验室
+  director: string // 负责人
+  meterMajor: string // 专业
+  createStartTime: '' // 创建开始时间
+  createEndTime: '' // 创建结束事假
+}
+
+// 部门返回值对象类型
+export interface ILabList {
+  id: string
+  deptId: string // 部门id
+  director: string // 负责人名称
+  phone: string // 负责人电话
+  meterMajor: string // 计量专业
+  organizeNo: string // 实验室编号
+  organizeName: string // 实验室名称
+  measureItems: string // 全部检测能力
+  pDeptId: string // 所属部门
+  pDeptName: string // 所属部门
+  organizeType: string // 组织类型
+  remark?: string // 备注
+  createTime?: string // 创建时间
+  updateTime?: string // 更新时间
+}
diff --git a/src/views/business/lab/myMeasure/components/processConfig.vue b/src/views/business/lab/myMeasure/components/processConfig.vue
new file mode 100644
index 0000000..bb66076
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/processConfig.vue
@@ -0,0 +1,161 @@
+<script setup lang="ts" name="ProcessConfig">
+import { ref } from 'vue'
+import draggable from 'vuedraggable'
+import { ElMessage } from 'element-plus'
+import type { ISchedule, IScheduleSet } from '../task-interface'
+import ProcessNode from './processNode.vue'
+import ProcessNodeAdd from './processNodeAdd.vue'
+import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
+import { setMeasureProcess, setMeasureProcessByFfy } from '@/api/business/schedule/task'
+const props = defineProps({
+  type: {
+    type: String,
+    default: 'distribute',
+  }, // 类型，决定调用哪个接口
+  // 是否为详情展示页面
+  detail: {
+    type: Boolean,
+    default: false,
+  },
+  // 样品id
+  sampleId: {
+    type: String,
+    required: true,
+  },
+  // 委托单id
+  orderId: {
+    type: String,
+    required: true,
+  },
+  list: {
+    type: Array,
+    default: () => [],
+  },
+})
+const emits = defineEmits(['saveOver'])
+// 默认流程节点
+const defaultProcess: IScheduleSet = {
+  measurePersonId: '', // 执行人
+  measurePerson: '', // 执行人名称
+  measureSegmentId: '', // 执行部门
+  measureSegment: '', // 执行部门名称
+  executiveItem: '', // 检定项目
+  // alreadyCertifications: 0, // 已出具证书总数
+  requireCertifications: 1, // 应出具证书总数
+  measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: '', // 流程更新时间
+}
+// 检定流程列表
+const processList = ref<IScheduleSet[]>([
+  { ...defaultProcess },
+])
+
+watch(() => props.list, (val) => {
+  if (props.list.length > 0) {
+    processList.value = props.list as ISchedule[]
+  }
+},
+{ deep: true, immediate: true })
+
+// 点击添加流程
+const processAdd = () => {
+  processList.value.push({ ...defaultProcess })
+}
+// 检查是否允许移动
+const checkMove = (evt: any) => {
+  // 目的位置元素evt.relatedContext.element
+  // 当前拖动元素evt.draggedContext.element
+  if (evt.relatedContext.element.measureState !== '0') {
+    return false
+  }
+  return true
+}
+
+// 选择实验室弹窗
+const chooseLabDialog = ref()
+// 批量添加流程
+const batchProcessAdd = () => {
+  chooseLabDialog.value.initDialog(true)
+}
+
+// 批量添加实验室
+const batchChooseOver = (labs: ILabList[]) => {
+  for (const item of labs) {
+    const processTemp: IScheduleSet = {
+      measurePersonId: '', // 执行人
+      measurePerson: '', // 执行人名称
+      measureSegmentId: item.deptId, // 执行部门
+      measureSegment: item.organizeName, // 执行部门名称
+      executiveItem: '', // 检定项目
+      measureSequence: '', // 监测顺序
+      // alreadyCertifications: 0, // 已出具证书总数
+      requireCertifications: 1, // 应出具证书总数
+      measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      updateTime: '', // 流程更新时间
+    }
+    processList.value.push(processTemp)
+  }
+}
+
+// 保存流程
+const saveProcess = () => {
+  const form = {
+    measureProcessList: processList.value,
+    executiveList: processList.value,
+    orderId: props.orderId,
+    sampleId: props.sampleId,
+  }
+  // 处理顺序
+  for (const key in form.measureProcessList) {
+    form.measureProcessList[key].measureSequence = (parseInt(key) + 1).toString()
+  }
+  if (props.type == 'distribute') {
+    setMeasureProcess(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
+  else {
+    setMeasureProcessByFfy(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
+}
+// 删除流程
+const deleteProcess = (index: number) => {
+  processList.value.splice(index, 1)
+}
+
+// --------暴露方法
+defineExpose({ saveProcess, batchProcessAdd, deleteProcess })
+</script>
+
+<template>
+  <div>
+    <div class="process-container">
+      <draggable v-model="processList" item-key="id" class="process-draggable" handle=".handle" :move="checkMove">
+        <!-- eslint-disable-next-line vue/no-unused-vars -->
+        <template #item="{ process, index }">
+          <process-node v-model="processList[index]" :step="index + 1" :detail="props.detail" @delete="deleteProcess(index)" />
+        </template>
+        <template #footer>
+          <process-node-add v-if="!props.detail" @click="processAdd" />
+        </template>
+      </draggable>
+    </div>
+    <choose-lab ref="chooseLabDialog" @confirm-checkout="batchChooseOver" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.process-container {
+  .process-draggable {
+    display: flex;
+    flex-wrap: wrap;
+  }
+}
+</style>
diff --git a/src/views/business/lab/myMeasure/components/processNode.vue b/src/views/business/lab/myMeasure/components/processNode.vue
new file mode 100644
index 0000000..fad76ab
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/processNode.vue
@@ -0,0 +1,215 @@
+<script lang="ts" setup name="ProcessNode">
+import {
+  Aim, Rank, Remove,
+} from '@element-plus/icons-vue'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
+// 逻辑代码
+const props = defineProps({
+  // 默认数据
+  modelValue: {
+    type: Object,
+    default: () => {
+      return {
+        measurePersonId: '', // 执行人
+        measurePerson: '', // 执行人名称
+        measureSegmentId: '', // 执行部门
+        measureSegment: '', // 执行部门名称
+        executiveItem: '', // 检定项目
+        alreadyCertifications: 0, // 已出具证书总数
+        requireCertifications: 0, // 应出具证书总数
+        measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        updateTime: '', // 流程更新时间
+      }
+    },
+  },
+  // 是否为详情展示页面
+  detail: {
+    type: Boolean,
+    default: false,
+  },
+  // 步骤
+  step: {
+    type: Number,
+    default: 1,
+  },
+})
+const emit = defineEmits(['update:modelValue', 'delete'])
+
+// ------------定义props参数----------
+const processNodeData = computed({
+  get() {
+    return props.modelValue
+  },
+  set(value) {
+    emit('update:modelValue', value)
+  },
+})
+// 检定环节可编辑-只有待分发状态可编辑
+const deptEdit = computed(() => {
+  const editStates = ['']
+  return editStates.includes(processNodeData.value.measureStatus)
+})
+// 检定人可编辑-待分配状态可编辑
+const personEdit = computed(() => {
+  const editStates = ['', '1', '2']
+  return editStates.includes(processNodeData.value.measureStatus)
+})
+// 证书可编辑-待分发、待分配、待检测状态可编辑
+const certificationEdit = computed(() => {
+  const editStates = ['', '1', '2', '3']
+  return editStates.includes(processNodeData.value.measureStatus)
+})
+// 节点可移动
+const canMove = computed(() => {
+  const editStates = ['', '1']
+  return editStates.includes(processNodeData.value.measureStatus)
+})
+
+// 选择人员
+const choosePersonShow = ref(false)
+const choosePerson = () => {
+  choosePersonShow.value = true
+}
+// 人员选择完毕
+const choosePersonOver = (person: { id: string; name: string }) => {
+  processNodeData.value.measurePersonId = person.id
+  processNodeData.value.measurePerson = person.name
+  choosePersonShow.value = false
+}
+
+// 选择实验室
+const chooseLabDialog = ref()
+const clickChoose = () => {
+  chooseLabDialog.value.initDialog(false)
+}
+const _selectStaffDialog = ref()
+// 实验室选择完毕
+const chooseOver = (lab: ILabList) => {
+  console.log(lab)
+  processNodeData.value.measureSegmentId = lab.deptId
+  processNodeData.value.measureSegment = lab.organizeName
+  // 定义一个对象关联上子组件的 ref 值（注意：这里的属性名必须跟子组件定义的 ref 值一模一样，否者会关联失效）
+  // 延迟使用，因为还没挂载
+  nextTick(() => {
+    _selectStaffDialog.value.fetchData()
+  })
+}
+
+// 移除该节点
+const deleteNode = () => {
+  emit('delete')
+}
+</script>
+
+<template>
+  <div class="process-node">
+    <div class="header">
+      <div class="step">
+        {{ props.step }}
+      </div>
+      <div class="buttons">
+        <el-icon v-show="canMove && !props.detail" class="icon-button" title="移除" @click="deleteNode">
+          <remove />
+        </el-icon>
+        <el-icon v-show="canMove && !props.detail" class="icon-button handle" title="移动">
+          <rank />
+        </el-icon>
+      </div>
+    </div>
+    <div>
+      <div class="line">
+        <span class="label">检定环节</span>
+        <el-input v-model="processNodeData.measureSegment" class="process-input" readonly size="small" :disabled="!deptEdit || props.detail">
+          <template v-if="deptEdit && !props.detail" #append>
+            <el-button :icon="Aim" size="small" link @click="clickChoose" />
+          </template>
+        </el-input>
+      </div>
+      <div class="line">
+        <span class="label">检定人员</span>
+        <el-input v-model="processNodeData.measurePerson" readonly class="process-input" size="small" :disabled="!personEdit || props.detail">
+          <template v-if="personEdit && !props.detail" #append>
+            <el-button :icon="Aim" size="small" link :disabled="processNodeData.measureSegment === ''" @click="choosePerson" />
+          </template>
+        </el-input>
+      </div>
+      <div class="line">
+        <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit || props.detail" /><span class="unit"> 份</span>
+      </div>
+      <div class="line">
+        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStatusName }}</span>
+      </div>
+      <div class="line">
+        <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
+      </div>
+    </div>
+    <!-- 选择实验室弹窗 -->
+    <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
+    <!-- 成员弹框 -->
+    <select-staff-dialog ref="_selectStaffDialog" v-model:visible="choosePersonShow" :data="[processNodeData.measurePersonId]" :dept-id="processNodeData.measureSegmentId" :dept-name="processNodeData.measureSegment" :multi="false" @change="choosePersonOver" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.process-node {
+  // display: inline-block;
+  margin-right: 10px;
+  width: 280px;
+  height: 215px;
+  border: 1px solid #e0e0e0;
+  padding: 5px 15px;
+  border-radius: 5px;
+  background-color: #fafafa;
+  margin-bottom: 10px;
+
+  .header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+    .step {
+      line-height: 28px;
+      font-size: 16px;
+      color: #3d7eff;
+      font-weight: bold;
+      margin-bottom: 5px;
+    }
+
+    .icon-button {
+      color: #999;
+      margin-left: 5px;
+      font-size: 16px;
+
+      &:hover {
+        cursor: pointer;
+      }
+    }
+  }
+
+  .line {
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 4px 0;
+
+    .label {
+      width: 80px;
+      font-size: 14px;
+    }
+
+    .process-input {
+      flex: 1;
+      font-size: 14px;
+    }
+
+    .unit {
+      margin-left: 5px;
+      font-size: 14px;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/lab/myMeasure/components/processNodeAdd.vue b/src/views/business/lab/myMeasure/components/processNodeAdd.vue
new file mode 100644
index 0000000..d7aeea0
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/processNodeAdd.vue
@@ -0,0 +1,46 @@
+<script lang="ts" setup name="ProcessNodeAdd">
+const emit = defineEmits(['click'])
+const add = () => {
+  emit('click')
+}
+</script>
+
+<template>
+  <div class="process-node" @click="add">
+    <div class="add">
+      <el-icon class="add-icon">
+        <plus />
+      </el-icon>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.process-node {
+  // display: inline-block;
+  width: 280px;
+  height: 215px;
+  border: 1px dashed #e0e0e0;
+  padding: 5px 15px;
+  border-radius: 5px;
+  background-color: #fbfbfb;
+
+  &:hover {
+    cursor: pointer;
+    background-color: #f5f5f5;
+  }
+
+  .add {
+    height: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    .add-icon {
+      vertical-align: middle;
+      font-size: 100px;
+      color: #999;
+    }
+  }
+}
+</style>

diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index b21ad07..cf4a5b9 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -260,6 +260,19 @@
         },
       },
       {
+        path: 'myMeasureDetail/:role/:id',
+        name: 'MyMeasureDetail',
+        component: () => import('@/views/business/lab/myMeasure/measureDetail.vue'),
+        meta: {
+          title: '我的检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          auth: '/lab/myMeasure',
+          activeMenu: '/lab/myMeasureList',
+        },
+      },
+      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -270,6 +283,19 @@
         },
       },
       {
+        path: 'myMeasureDetail/:role/:id',
+        name: 'MyMeasureDetail',
+        component: () => import('@/views/business/lab/myMeasure/measureDetail.vue'),
+        meta: {
+          title: '部门检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          auth: '/lab/deptMeasureList',
+          activeMenu: '/lab/deptMeasureList',
+        },
+      },
+      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 066f192..7a6ebea 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -102,8 +102,9 @@
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
-          localStorage.removeItem('name')
           localStorage.removeItem('token')
+          localStorage.removeItem('nameId')
+          localStorage.removeItem('depId')
           this.username = ''
           this.token = ''
           this.roleList = []
@@ -121,7 +122,8 @@
               this.roleList = res.data.roleIds
               this.roleNames = res.data.roleNames
               this.roleTips = res.data.roleTips
-              localStorage.setItem('name', res.data.name)
+              localStorage.setItem('nameId', res.data.id)
+              localStorage.setItem('depId', res.data.deptId)
             }
             else {
               reject('该用户无角色')
diff --git a/src/views/business/board/overdueReminder/detail.vue b/src/views/business/board/overdueReminder/detail.vue
index 92987d1..0239b71 100644
--- a/src/views/business/board/overdueReminder/detail.vue
+++ b/src/views/business/board/overdueReminder/detail.vue
@@ -5,7 +5,7 @@
 import { ref } from 'vue'
 import dayjs from 'dayjs'
 import ProcessConfig from '@/views/business/schedule/task/components/processConfig.vue'
-import type { ISampleMeasure, ITaskDetail } from '@/views/business/schedule/task/task-interface'
+import type { ISampleMeasure, ITaskDetail } from '@/views/business/schedule/task/task-interface.js'
 import type { Menu, SimpleCertification, SimpleMeasureRecord, dictType } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getTaskDetail } from '@/api/business/schedule/task'
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index d6cc168..05fd811 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -4,8 +4,8 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import DistributeDialog from '../../schedule/task/components/distributeDialog.vue'
 import RollbackDialog from './../components/rollbackDialog.vue'
-import DistributeDialog from './../components/distributeDialog.vue'
 import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
@@ -131,7 +131,8 @@
 const depId = ref('')
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
+  $router.push(`myMeasureDetail/detail/${row.sampleId}?order=${row.orderId}`)
+  // $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
diff --git a/src/views/business/lab/myMeasure/components/chooseLab.vue b/src/views/business/lab/myMeasure/components/chooseLab.vue
new file mode 100644
index 0000000..0dcebfc
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/chooseLab.vue
@@ -0,0 +1,203 @@
+<script setup lang="ts" name="ChooseLab">
+// 选择实验室
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { ILabList, ILabSearchQuery } from '@/views/business/schedule/task/components/lab-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getOrganizeList } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
+const emits = defineEmits(['confirmCheckout'])
+// 是否多选
+const multi = ref(false)
+const dialogVisible = ref(false)
+
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
+// 查询条件
+const listQuery = ref<ILabSearchQuery>({
+  organizeNo: '', // 实验室编号
+  organizeName: '', // 实验室名称
+  meterMajor: '', // 专业
+  organizeType: '3', // 组织类型
+  director: '', // 负责人
+  isLab: '1', // 是否是实验室
+  createStartTime: '',
+  createEndTime: '',
+})
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '实验室名称', value: 'organizeName', width: '160', align: 'center' },
+  // { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
+  { text: '负责人', value: 'director', align: 'center', width: '120' },
+  { text: '计量专业', value: 'meterMajorName', align: 'center' },
+  { text: '实验室能力', value: 'labCapacityName', align: 'center' },
+])
+// 表格数据
+const list = ref<ILabList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 多选的内容
+const checkoutList = ref<ILabList[]>([])
+// 单选
+const singleChecked = ref()
+// 数据查询
+function fetchData(isNowPage = false) {
+  getOrganizeList(listQuery.value).then((response) => {
+    list.value = response.data
+    total.value = parseInt(response.data.length)
+    loadingTable.value = false
+  })
+  loadingTable.value = false
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    organizeNo: '', // 实验室编号
+    organizeName: '', // 实验室名称
+    meterMajor: '', // 专业
+    organizeType: '3', // 组织类型
+    director: '', // 负责人
+    isLab: '1', // 是否是实验室
+    createStartTime: '',
+    createEndTime: '',
+  }
+}
+
+// 点击取消
+const cancle = () => {
+  dialogVisible.value = false
+}
+// 点击确定
+const clickConfirm = () => {
+  // 如果多选
+  if (multi.value) {
+    if (!checkoutList.value.length) {
+      ElMessage({
+        message: '请选择至少一个实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      emits('confirmCheckout', checkoutList.value)
+    }
+  }
+  else {
+    if (!singleChecked.value) {
+      ElMessage({
+        message: '请选择检定实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      const checkValue = list.value.find(item => item.id == singleChecked.value)
+      emits('confirmCheckout', checkValue)
+    }
+  }
+
+  cancle()
+}
+
+// 初始化弹窗
+const initDialog = (multiSelect: boolean) => {
+  multi.value = multiSelect
+  dialogVisible.value = true
+  fetchData()
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <div class="choose-lab-dialog">
+    <el-dialog v-model="dialogVisible" :title="`选择检定实验室${(checkoutList.length > 0 && multi) ? `(已选择${checkoutList.length}个实验室)` : ''}`" width="1000" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.organizeName"
+            placeholder="实验室名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-select
+            v-model.trim="listQuery.meterMajor"
+            clearable
+            placeholder="计量专业"
+          >
+            <el-option
+              v-for="item in measureMajorList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <div style="padding: 5px 10px;">
+        <normal-table
+          :data="list"
+          :total="total"
+          :columns="columns"
+          :query="listQuery"
+          :list-loading="loadingTable"
+          :pagination="false"
+          size="small"
+          @multi-select="handleSelectionChange"
+        >
+          <!-- :is-showmulti-select="multi" -->
+          <!-- :is-multi="multi" -->
+          <template v-if="!multi" #preColumns>
+            <el-table-column label="#" width="55" align="center" fixed="left">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="" width="40" align="center" fixed>
+              <template #default="scope">
+                <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </div>
+
+      <template #footer>
+        <el-button type="primary" @click="clickConfirm">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.choose-lab-dialog {
+  :deep(.el-radio__label) {
+    display: none;
+  }
+}
+</style>
diff --git a/src/views/business/lab/myMeasure/components/lab-interface.ts b/src/views/business/lab/myMeasure/components/lab-interface.ts
new file mode 100644
index 0000000..02b0d1d
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/lab-interface.ts
@@ -0,0 +1,29 @@
+// 查询参数类型
+export interface ILabSearchQuery {
+  organizeNo: string // 组织编号
+  organizeName: string // 名称
+  organizeType: string // 类型-3科室
+  isLab: '1' // 是否是实验室
+  director: string // 负责人
+  meterMajor: string // 专业
+  createStartTime: '' // 创建开始时间
+  createEndTime: '' // 创建结束事假
+}
+
+// 部门返回值对象类型
+export interface ILabList {
+  id: string
+  deptId: string // 部门id
+  director: string // 负责人名称
+  phone: string // 负责人电话
+  meterMajor: string // 计量专业
+  organizeNo: string // 实验室编号
+  organizeName: string // 实验室名称
+  measureItems: string // 全部检测能力
+  pDeptId: string // 所属部门
+  pDeptName: string // 所属部门
+  organizeType: string // 组织类型
+  remark?: string // 备注
+  createTime?: string // 创建时间
+  updateTime?: string // 更新时间
+}
diff --git a/src/views/business/lab/myMeasure/components/processConfig.vue b/src/views/business/lab/myMeasure/components/processConfig.vue
new file mode 100644
index 0000000..bb66076
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/processConfig.vue
@@ -0,0 +1,161 @@
+<script setup lang="ts" name="ProcessConfig">
+import { ref } from 'vue'
+import draggable from 'vuedraggable'
+import { ElMessage } from 'element-plus'
+import type { ISchedule, IScheduleSet } from '../task-interface'
+import ProcessNode from './processNode.vue'
+import ProcessNodeAdd from './processNodeAdd.vue'
+import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
+import { setMeasureProcess, setMeasureProcessByFfy } from '@/api/business/schedule/task'
+const props = defineProps({
+  type: {
+    type: String,
+    default: 'distribute',
+  }, // 类型，决定调用哪个接口
+  // 是否为详情展示页面
+  detail: {
+    type: Boolean,
+    default: false,
+  },
+  // 样品id
+  sampleId: {
+    type: String,
+    required: true,
+  },
+  // 委托单id
+  orderId: {
+    type: String,
+    required: true,
+  },
+  list: {
+    type: Array,
+    default: () => [],
+  },
+})
+const emits = defineEmits(['saveOver'])
+// 默认流程节点
+const defaultProcess: IScheduleSet = {
+  measurePersonId: '', // 执行人
+  measurePerson: '', // 执行人名称
+  measureSegmentId: '', // 执行部门
+  measureSegment: '', // 执行部门名称
+  executiveItem: '', // 检定项目
+  // alreadyCertifications: 0, // 已出具证书总数
+  requireCertifications: 1, // 应出具证书总数
+  measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: '', // 流程更新时间
+}
+// 检定流程列表
+const processList = ref<IScheduleSet[]>([
+  { ...defaultProcess },
+])
+
+watch(() => props.list, (val) => {
+  if (props.list.length > 0) {
+    processList.value = props.list as ISchedule[]
+  }
+},
+{ deep: true, immediate: true })
+
+// 点击添加流程
+const processAdd = () => {
+  processList.value.push({ ...defaultProcess })
+}
+// 检查是否允许移动
+const checkMove = (evt: any) => {
+  // 目的位置元素evt.relatedContext.element
+  // 当前拖动元素evt.draggedContext.element
+  if (evt.relatedContext.element.measureState !== '0') {
+    return false
+  }
+  return true
+}
+
+// 选择实验室弹窗
+const chooseLabDialog = ref()
+// 批量添加流程
+const batchProcessAdd = () => {
+  chooseLabDialog.value.initDialog(true)
+}
+
+// 批量添加实验室
+const batchChooseOver = (labs: ILabList[]) => {
+  for (const item of labs) {
+    const processTemp: IScheduleSet = {
+      measurePersonId: '', // 执行人
+      measurePerson: '', // 执行人名称
+      measureSegmentId: item.deptId, // 执行部门
+      measureSegment: item.organizeName, // 执行部门名称
+      executiveItem: '', // 检定项目
+      measureSequence: '', // 监测顺序
+      // alreadyCertifications: 0, // 已出具证书总数
+      requireCertifications: 1, // 应出具证书总数
+      measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      updateTime: '', // 流程更新时间
+    }
+    processList.value.push(processTemp)
+  }
+}
+
+// 保存流程
+const saveProcess = () => {
+  const form = {
+    measureProcessList: processList.value,
+    executiveList: processList.value,
+    orderId: props.orderId,
+    sampleId: props.sampleId,
+  }
+  // 处理顺序
+  for (const key in form.measureProcessList) {
+    form.measureProcessList[key].measureSequence = (parseInt(key) + 1).toString()
+  }
+  if (props.type == 'distribute') {
+    setMeasureProcess(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
+  else {
+    setMeasureProcessByFfy(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
+}
+// 删除流程
+const deleteProcess = (index: number) => {
+  processList.value.splice(index, 1)
+}
+
+// --------暴露方法
+defineExpose({ saveProcess, batchProcessAdd, deleteProcess })
+</script>
+
+<template>
+  <div>
+    <div class="process-container">
+      <draggable v-model="processList" item-key="id" class="process-draggable" handle=".handle" :move="checkMove">
+        <!-- eslint-disable-next-line vue/no-unused-vars -->
+        <template #item="{ process, index }">
+          <process-node v-model="processList[index]" :step="index + 1" :detail="props.detail" @delete="deleteProcess(index)" />
+        </template>
+        <template #footer>
+          <process-node-add v-if="!props.detail" @click="processAdd" />
+        </template>
+      </draggable>
+    </div>
+    <choose-lab ref="chooseLabDialog" @confirm-checkout="batchChooseOver" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.process-container {
+  .process-draggable {
+    display: flex;
+    flex-wrap: wrap;
+  }
+}
+</style>
diff --git a/src/views/business/lab/myMeasure/components/processNode.vue b/src/views/business/lab/myMeasure/components/processNode.vue
new file mode 100644
index 0000000..fad76ab
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/processNode.vue
@@ -0,0 +1,215 @@
+<script lang="ts" setup name="ProcessNode">
+import {
+  Aim, Rank, Remove,
+} from '@element-plus/icons-vue'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
+// 逻辑代码
+const props = defineProps({
+  // 默认数据
+  modelValue: {
+    type: Object,
+    default: () => {
+      return {
+        measurePersonId: '', // 执行人
+        measurePerson: '', // 执行人名称
+        measureSegmentId: '', // 执行部门
+        measureSegment: '', // 执行部门名称
+        executiveItem: '', // 检定项目
+        alreadyCertifications: 0, // 已出具证书总数
+        requireCertifications: 0, // 应出具证书总数
+        measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        updateTime: '', // 流程更新时间
+      }
+    },
+  },
+  // 是否为详情展示页面
+  detail: {
+    type: Boolean,
+    default: false,
+  },
+  // 步骤
+  step: {
+    type: Number,
+    default: 1,
+  },
+})
+const emit = defineEmits(['update:modelValue', 'delete'])
+
+// ------------定义props参数----------
+const processNodeData = computed({
+  get() {
+    return props.modelValue
+  },
+  set(value) {
+    emit('update:modelValue', value)
+  },
+})
+// 检定环节可编辑-只有待分发状态可编辑
+const deptEdit = computed(() => {
+  const editStates = ['']
+  return editStates.includes(processNodeData.value.measureStatus)
+})
+// 检定人可编辑-待分配状态可编辑
+const personEdit = computed(() => {
+  const editStates = ['', '1', '2']
+  return editStates.includes(processNodeData.value.measureStatus)
+})
+// 证书可编辑-待分发、待分配、待检测状态可编辑
+const certificationEdit = computed(() => {
+  const editStates = ['', '1', '2', '3']
+  return editStates.includes(processNodeData.value.measureStatus)
+})
+// 节点可移动
+const canMove = computed(() => {
+  const editStates = ['', '1']
+  return editStates.includes(processNodeData.value.measureStatus)
+})
+
+// 选择人员
+const choosePersonShow = ref(false)
+const choosePerson = () => {
+  choosePersonShow.value = true
+}
+// 人员选择完毕
+const choosePersonOver = (person: { id: string; name: string }) => {
+  processNodeData.value.measurePersonId = person.id
+  processNodeData.value.measurePerson = person.name
+  choosePersonShow.value = false
+}
+
+// 选择实验室
+const chooseLabDialog = ref()
+const clickChoose = () => {
+  chooseLabDialog.value.initDialog(false)
+}
+const _selectStaffDialog = ref()
+// 实验室选择完毕
+const chooseOver = (lab: ILabList) => {
+  console.log(lab)
+  processNodeData.value.measureSegmentId = lab.deptId
+  processNodeData.value.measureSegment = lab.organizeName
+  // 定义一个对象关联上子组件的 ref 值（注意：这里的属性名必须跟子组件定义的 ref 值一模一样，否者会关联失效）
+  // 延迟使用，因为还没挂载
+  nextTick(() => {
+    _selectStaffDialog.value.fetchData()
+  })
+}
+
+// 移除该节点
+const deleteNode = () => {
+  emit('delete')
+}
+</script>
+
+<template>
+  <div class="process-node">
+    <div class="header">
+      <div class="step">
+        {{ props.step }}
+      </div>
+      <div class="buttons">
+        <el-icon v-show="canMove && !props.detail" class="icon-button" title="移除" @click="deleteNode">
+          <remove />
+        </el-icon>
+        <el-icon v-show="canMove && !props.detail" class="icon-button handle" title="移动">
+          <rank />
+        </el-icon>
+      </div>
+    </div>
+    <div>
+      <div class="line">
+        <span class="label">检定环节</span>
+        <el-input v-model="processNodeData.measureSegment" class="process-input" readonly size="small" :disabled="!deptEdit || props.detail">
+          <template v-if="deptEdit && !props.detail" #append>
+            <el-button :icon="Aim" size="small" link @click="clickChoose" />
+          </template>
+        </el-input>
+      </div>
+      <div class="line">
+        <span class="label">检定人员</span>
+        <el-input v-model="processNodeData.measurePerson" readonly class="process-input" size="small" :disabled="!personEdit || props.detail">
+          <template v-if="personEdit && !props.detail" #append>
+            <el-button :icon="Aim" size="small" link :disabled="processNodeData.measureSegment === ''" @click="choosePerson" />
+          </template>
+        </el-input>
+      </div>
+      <div class="line">
+        <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit || props.detail" /><span class="unit"> 份</span>
+      </div>
+      <div class="line">
+        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStatusName }}</span>
+      </div>
+      <div class="line">
+        <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
+      </div>
+    </div>
+    <!-- 选择实验室弹窗 -->
+    <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
+    <!-- 成员弹框 -->
+    <select-staff-dialog ref="_selectStaffDialog" v-model:visible="choosePersonShow" :data="[processNodeData.measurePersonId]" :dept-id="processNodeData.measureSegmentId" :dept-name="processNodeData.measureSegment" :multi="false" @change="choosePersonOver" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.process-node {
+  // display: inline-block;
+  margin-right: 10px;
+  width: 280px;
+  height: 215px;
+  border: 1px solid #e0e0e0;
+  padding: 5px 15px;
+  border-radius: 5px;
+  background-color: #fafafa;
+  margin-bottom: 10px;
+
+  .header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+    .step {
+      line-height: 28px;
+      font-size: 16px;
+      color: #3d7eff;
+      font-weight: bold;
+      margin-bottom: 5px;
+    }
+
+    .icon-button {
+      color: #999;
+      margin-left: 5px;
+      font-size: 16px;
+
+      &:hover {
+        cursor: pointer;
+      }
+    }
+  }
+
+  .line {
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 4px 0;
+
+    .label {
+      width: 80px;
+      font-size: 14px;
+    }
+
+    .process-input {
+      flex: 1;
+      font-size: 14px;
+    }
+
+    .unit {
+      margin-left: 5px;
+      font-size: 14px;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/lab/myMeasure/components/processNodeAdd.vue b/src/views/business/lab/myMeasure/components/processNodeAdd.vue
new file mode 100644
index 0000000..d7aeea0
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/processNodeAdd.vue
@@ -0,0 +1,46 @@
+<script lang="ts" setup name="ProcessNodeAdd">
+const emit = defineEmits(['click'])
+const add = () => {
+  emit('click')
+}
+</script>
+
+<template>
+  <div class="process-node" @click="add">
+    <div class="add">
+      <el-icon class="add-icon">
+        <plus />
+      </el-icon>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.process-node {
+  // display: inline-block;
+  width: 280px;
+  height: 215px;
+  border: 1px dashed #e0e0e0;
+  padding: 5px 15px;
+  border-radius: 5px;
+  background-color: #fbfbfb;
+
+  &:hover {
+    cursor: pointer;
+    background-color: #f5f5f5;
+  }
+
+  .add {
+    height: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    .add-icon {
+      vertical-align: middle;
+      font-size: 100px;
+      color: #999;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/lab/myMeasure/measureDetail.vue b/src/views/business/lab/myMeasure/measureDetail.vue
new file mode 100644
index 0000000..1a88be8
--- /dev/null
+++ b/src/views/business/lab/myMeasure/measureDetail.vue
@@ -0,0 +1,601 @@
+<!-- 任务分发 -->
+<script lang="ts" setup name="TaskEdit">
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance } from 'element-plus'
+import { ref } from 'vue'
+import ProcessConfig from './components/processConfig.vue'
+import type { ISampleMeasure, ITaskDetail } from './task-interface'
+import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { getTaskDetail } from '@/api/business/schedule/task'
+import countries from '@/components/AddressSelect/country-code.json'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+interface dictType {
+  id: string
+  name: string
+  value: string
+}
+const roleType = ref('distribute') // 角色类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员),
+const countryList = ref(countries) // 国家列表
+const loading = ref(false) // 表单加载状态
+const sampleId = ref('') // 样品详情id
+const orderId = ref('') // 委托书id
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const mesureTypeList = ref<dictType[]>([]) // 检定方式
+const $route = useRoute()
+
+// 获取字典值
+function getDict() {
+  // 获取样品属性
+  getDictByCode('measureCategory').then((response) => {
+    mesureCategoryList.value = response.data
+  })
+  // 获取样品属性
+  getDictByCode('measureType').then((response) => {
+    mesureTypeList.value = response.data
+  })
+}
+getDict()
+
+// 基本信息表单
+const sampleForm = ref<ISampleMeasure>({
+  id: '', // 样品id
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 样品型号
+  manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  phone: '', // 委托方电话
+  postalCode: '', // 委托方邮编
+  customerAddress: '', // 委托方地址
+  measureCategory: '', // 检校类别
+  manufacturer: '', // 生产厂家
+  manufacturerCountry: '', // 厂家国别
+  manufacturingDate: '', // 出厂年月
+  abc: '', // ABC
+  measurePeriod: '', // 检定周期
+  remark: '', // 备注
+  minioFileName: '', // 说明书
+  labelBind: '', // 标签绑定
+  measureType: '1', // 检定方式  1自检、2外包、3外检
+  measureTypeName: '', // 检定方式
+  measureLastTime: '', // 检定日期
+  validDeadline: '', // 有效日期
+  powerVoltage: '', // 电源电压
+  sampleBelong: '', // 样品所属
+  sampleBelongName: '', // 样品所属
+})
+const taskForm = ref <ITaskDetail> ({
+  measureContent: '', // 检定项目
+  specialRequire: '', // 客户特殊要求
+  orderId: '', // 委托单id
+  orderCode: '', // 委托单编号
+  certifications: '', // 证书类别
+  planDeliverTime: '', // 预约送达时间
+  requireOverTime: '', // 要求检完时间
+  measureProcessList: [], // 检定流程
+  measureSendBackList: [], // 退回信息
+  remark: '', // 备注
+  deliverer: '', // 送检人
+  delivererTel: '', // 送检人联系方式
+})
+const ruleFormRef = ref<FormInstance>()
+
+// 自定义校验规则--检定周期为正整数
+const validateMesurePeriod = (rule: any, value: any, callback: any) => {
+  if (value === '') {
+    callback()
+  }
+  else if (!(/(^[1-9]\d*$)/.test(value))) {
+    callback(new Error('请输入一个正整数'))
+  }
+  else {
+    callback()
+  }
+}
+
+// 校验规则
+const rules = ref({
+  mesurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
+}) // 表单验证规则
+
+// 其他关联数据列表
+const dataList = ref({
+  measureRecords: [] as SimpleMeasureRecord[],
+  certificationRecords: [] as SimpleCertification[],
+})
+
+// 获取检定记录
+const fetchMeasureRecords = function (query = null) {
+  dataList.value.measureRecords = []
+}
+// 获取检定证书
+const fetchCertifications = function (query = null) {
+  dataList.value.certificationRecords = []
+}
+interface Menu {
+  name: string
+  columns: TableColumn[]
+  pagination: boolean
+  list: 'measureRecords' | 'certificationRecords'
+  searchFunc: Function
+}
+// 菜单
+const menu: Menu[] = [
+  {
+    name: '检定记录',
+    columns: [
+      { text: '委托单编号', value: 'orderCode' },
+      { text: '委托单日期', value: 'orderTime' },
+      { text: '委托方代码', value: 'customerCode' },
+      { text: '委托方名称', value: 'customerName' },
+      { text: '送检人', value: 'deliverer' },
+      { text: '送检日期', value: 'deliverTime' },
+    ],
+    list: 'measureRecords',
+    pagination: true,
+    searchFunc: fetchMeasureRecords,
+  },
+  {
+    name: '检定证书',
+    columns: [
+      { text: '证书编号', value: 'certificationCode' },
+      { text: '证书名称', value: 'certificationName' },
+      { text: '证书类型', value: 'certificationType' },
+      { text: '证书出具日期', value: 'effectiveDate' },
+      { text: '证书有效期', value: 'expirationDate' },
+    ],
+    list: 'certificationRecords',
+    pagination: true,
+    searchFunc: fetchCertifications,
+  },
+]
+
+const currentMenu = ref('证书监控')
+const currentMenuObj = computed(() => {
+  return menu.find(item => item.name === currentMenu.value)
+})
+
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 打印表单
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '样品详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>样品详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+// 保存样品信息
+function saveForm(formEl: FormInstance | undefined) {
+  if (!formEl) { return }
+  formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认修改样品信息吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (sampleForm.value.id) {
+          updateSample(sampleForm.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+      })
+    }
+  })
+}
+// 获取详情
+const getSampleInfo = () => {
+  getSapmleDetail({ id: sampleId.value }).then((res) => {
+    sampleForm.value = res.data
+  })
+}
+// 获取分发详情
+const getInfo = () => {
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    taskForm.value.specialRequire = res.data.specialRequire // 客户特殊要求
+    taskForm.value.deliverer = res.data.deliverer // 送检人
+    taskForm.value.delivererTel = res.data.delivererTel // 送检人联系方式
+    taskForm.value.measureContent = res.data.measureContent // 检定项目
+    taskForm.value.measureProcessList = res.data.measureProcessList // 检定流程
+    taskForm.value.measureSendBackList = res.data.measureSendBackList // 退回流程
+    console.log('pppppp')
+    console.log(taskForm.value.measureProcessList)
+
+    // 改用一个接口获取
+    sampleForm.value = res.data
+  })
+}
+
+// 点击标签绑定的扫描
+const startScan = () => {
+  // TODO
+}
+
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
+}
+// 保存流程按钮点击
+const saveProcess = () => {
+  processConfigRef.value.saveProcess()
+}
+
+// 文件上传
+const fileRef = ref()
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    // UploadFile(fd).then((res) => {
+    //   if (res.code === 200) {
+    //     sampleForm.value.minioFileName = res.data[0]
+    //     // 重置当前验证
+    //     ElMessage.success('文件上传成功')
+    //   }
+    //   else {
+    //     ElMessage.error(res.message)
+    //   }
+    // })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+onMounted(() => {
+  console.log($route)
+  // 从路由中获取页面类型参数
+  if ($route.params && $route.params.role) {
+    roleType.value = $route.params.role as string // 使用角色
+  }
+  if ($route.params.id) {
+    sampleId.value = $route.params.id as string
+    orderId.value = $route.query.order as string
+    // 获取分发详情
+    getInfo()
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="样品详情">
+      <template #btns>
+        <el-button v-if="roleType === 'detail'" v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <!-- <el-button v-if="roleType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button> -->
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <div id="form">
+        <el-form
+          ref="ruleFormRef"
+          :model="sampleForm"
+          :label-width="120"
+          label-position="right"
+          :rules="rules"
+        >
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="样品编号:" prop="sampleNo">
+                <el-input
+                  v-model="sampleForm.sampleNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品名称:" prop="sampleName">
+                <el-input
+                  v-model="sampleForm.sampleName"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品型号:" prop="sampleModel">
+                <el-input
+                  v-model="sampleForm.sampleModel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂编号:" prop="manufacturingNo">
+                <el-input
+                  v-model="sampleForm.manufacturingNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方代码" prop="customerNo">
+                <el-input
+                  v-model="sampleForm.customerNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方名称" prop="customerName">
+                <el-input
+                  v-model="sampleForm.customerName"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方电话" prop="phone">
+                <el-input
+                  v-model="sampleForm.phone"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方电话'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方邮编" prop="postalCode">
+                <el-input
+                  v-model="sampleForm.postalCode"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方邮编'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="18">
+              <el-form-item label="委托方地址:" prop="companyAddress">
+                <el-input
+                  v-model="sampleForm.customerAddress"
+                  type="textarea"
+                  autosize
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方地址'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="校检类别:">
+                <el-select
+                  v-model="sampleForm.measureCategory"
+                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :disabled="roleType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="生产厂家:">
+                <el-input
+                  v-model="sampleForm.manufacturer"
+                  :placeholder="roleType === 'detail' ? '' : '请输入生产厂家'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="厂家国别:">
+                <el-select
+                  v-model="sampleForm.manufacturerCountry"
+                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :disabled="roleType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂年月:">
+                <el-date-picker
+                  v-model="sampleForm.manufacturingDate"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="roleType === 'detail' ? '' : '请输入出厂年月'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="ABC:">
+                <el-select
+                  v-model="sampleForm.abc"
+                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :disabled="roleType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="送检人:">
+                <el-input
+                  v-model="taskForm.deliverer"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="联系方式:">
+                <el-input
+                  v-model="taskForm.delivererTel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="检定项目:" prop="mesureContent">
+                <el-input
+                  v-model="taskForm.measureContent"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  disabled
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检定周期（月）:">
+                <el-input
+                  v-model="sampleForm.measurePeriod"
+                  :placeholder="roleType === 'detail' ? '' : '请输入检定周期'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="备注:">
+                <el-input
+                  v-model="sampleForm.remark"
+                  type="textarea"
+                  :rows="2"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  disabled
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检定方式:">
+                <el-select
+                  v-model="sampleForm.measureType"
+                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :disabled="roleType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of mesureTypeList" :key="item.value" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="标签绑定:">
+                <el-input
+                  v-model="sampleForm.labelBind"
+                  :placeholder="roleType === 'detail' ? '' : '标签绑定'"
+                  :disabled="roleType === 'detail'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                >
+                  <template v-if="roleType !== 'detail'" #append>
+                    <el-button>
+                      扫描
+                    </el-button>
+                  </template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="14">
+              <el-form-item label="说明书:">
+                <show-photo v-if="sampleForm.minioFileName" :minio-file-name="sampleForm.minioFileName" />
+                <span v-else-if="roleType === 'detail'">无</span>
+                <input v-show="roleType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="roleType !== 'detail'" id="file" type="primary" :disabled="roleType === 'detail'" :style="{ 'margin-left': sampleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ sampleForm.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </detail-page>
+    <detail-block v-if="taskForm.measureProcessList && taskForm.measureProcessList.length >= 1" title="检定流程">
+      <!-- <template #btns>
+        <el-button type="primary" style="margin-bottom: 10px;" @click="batchProcessAdd">
+          批量添加
+        </el-button>
+        <el-button type="primary" style="margin-bottom: 10px;" @click="saveProcess">
+          保存
+        </el-button>
+      </template> -->
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" :detail="true" />
+    </detail-block>
+    <!-- 退回流程 -->
+    <detail-block v-if="taskForm.measureSendBackList && taskForm.measureSendBackList.length >= 1" title="退回流程">
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureSendBackList" :sample-id="sampleId" :detail="true" />
+    </detail-block>
+    <!-- 检定记录、检定证书 -->
+    <detail-block-switch :title="currentMenu">
+      <template #menu>
+        <el-radio-group v-model="currentMenu">
+          <el-radio-button label="证书监控">
+            证书监控
+          </el-radio-button>
+          <el-radio-button label="检定记录">
+            检定记录
+          </el-radio-button>
+          <el-radio-button label="检定证书">
+            检定证书
+          </el-radio-button>
+        </el-radio-group>
+      </template>
+      <!-- 证书监控 -->
+      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" />
+      <!-- 检定记录 -->
+      <measure-records v-if="currentMenu === '检定记录'" :sample-id="sampleId" />
+      <!-- 证书记录 -->
+      <certification-records v-if="currentMenu === '检定证书'" :sample-id="sampleId" />
+    </detail-block-switch>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
+

diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index b21ad07..cf4a5b9 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -260,6 +260,19 @@
         },
       },
       {
+        path: 'myMeasureDetail/:role/:id',
+        name: 'MyMeasureDetail',
+        component: () => import('@/views/business/lab/myMeasure/measureDetail.vue'),
+        meta: {
+          title: '我的检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          auth: '/lab/myMeasure',
+          activeMenu: '/lab/myMeasureList',
+        },
+      },
+      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -270,6 +283,19 @@
         },
       },
       {
+        path: 'myMeasureDetail/:role/:id',
+        name: 'MyMeasureDetail',
+        component: () => import('@/views/business/lab/myMeasure/measureDetail.vue'),
+        meta: {
+          title: '部门检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          auth: '/lab/deptMeasureList',
+          activeMenu: '/lab/deptMeasureList',
+        },
+      },
+      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 066f192..7a6ebea 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -102,8 +102,9 @@
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
-          localStorage.removeItem('name')
           localStorage.removeItem('token')
+          localStorage.removeItem('nameId')
+          localStorage.removeItem('depId')
           this.username = ''
           this.token = ''
           this.roleList = []
@@ -121,7 +122,8 @@
               this.roleList = res.data.roleIds
               this.roleNames = res.data.roleNames
               this.roleTips = res.data.roleTips
-              localStorage.setItem('name', res.data.name)
+              localStorage.setItem('nameId', res.data.id)
+              localStorage.setItem('depId', res.data.deptId)
             }
             else {
               reject('该用户无角色')
diff --git a/src/views/business/board/overdueReminder/detail.vue b/src/views/business/board/overdueReminder/detail.vue
index 92987d1..0239b71 100644
--- a/src/views/business/board/overdueReminder/detail.vue
+++ b/src/views/business/board/overdueReminder/detail.vue
@@ -5,7 +5,7 @@
 import { ref } from 'vue'
 import dayjs from 'dayjs'
 import ProcessConfig from '@/views/business/schedule/task/components/processConfig.vue'
-import type { ISampleMeasure, ITaskDetail } from '@/views/business/schedule/task/task-interface'
+import type { ISampleMeasure, ITaskDetail } from '@/views/business/schedule/task/task-interface.js'
 import type { Menu, SimpleCertification, SimpleMeasureRecord, dictType } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getTaskDetail } from '@/api/business/schedule/task'
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index d6cc168..05fd811 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -4,8 +4,8 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import DistributeDialog from '../../schedule/task/components/distributeDialog.vue'
 import RollbackDialog from './../components/rollbackDialog.vue'
-import DistributeDialog from './../components/distributeDialog.vue'
 import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
@@ -131,7 +131,8 @@
 const depId = ref('')
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
+  $router.push(`myMeasureDetail/detail/${row.sampleId}?order=${row.orderId}`)
+  // $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
diff --git a/src/views/business/lab/myMeasure/components/chooseLab.vue b/src/views/business/lab/myMeasure/components/chooseLab.vue
new file mode 100644
index 0000000..0dcebfc
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/chooseLab.vue
@@ -0,0 +1,203 @@
+<script setup lang="ts" name="ChooseLab">
+// 选择实验室
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { ILabList, ILabSearchQuery } from '@/views/business/schedule/task/components/lab-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getOrganizeList } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
+const emits = defineEmits(['confirmCheckout'])
+// 是否多选
+const multi = ref(false)
+const dialogVisible = ref(false)
+
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
+// 查询条件
+const listQuery = ref<ILabSearchQuery>({
+  organizeNo: '', // 实验室编号
+  organizeName: '', // 实验室名称
+  meterMajor: '', // 专业
+  organizeType: '3', // 组织类型
+  director: '', // 负责人
+  isLab: '1', // 是否是实验室
+  createStartTime: '',
+  createEndTime: '',
+})
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '实验室名称', value: 'organizeName', width: '160', align: 'center' },
+  // { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
+  { text: '负责人', value: 'director', align: 'center', width: '120' },
+  { text: '计量专业', value: 'meterMajorName', align: 'center' },
+  { text: '实验室能力', value: 'labCapacityName', align: 'center' },
+])
+// 表格数据
+const list = ref<ILabList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 多选的内容
+const checkoutList = ref<ILabList[]>([])
+// 单选
+const singleChecked = ref()
+// 数据查询
+function fetchData(isNowPage = false) {
+  getOrganizeList(listQuery.value).then((response) => {
+    list.value = response.data
+    total.value = parseInt(response.data.length)
+    loadingTable.value = false
+  })
+  loadingTable.value = false
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    organizeNo: '', // 实验室编号
+    organizeName: '', // 实验室名称
+    meterMajor: '', // 专业
+    organizeType: '3', // 组织类型
+    director: '', // 负责人
+    isLab: '1', // 是否是实验室
+    createStartTime: '',
+    createEndTime: '',
+  }
+}
+
+// 点击取消
+const cancle = () => {
+  dialogVisible.value = false
+}
+// 点击确定
+const clickConfirm = () => {
+  // 如果多选
+  if (multi.value) {
+    if (!checkoutList.value.length) {
+      ElMessage({
+        message: '请选择至少一个实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      emits('confirmCheckout', checkoutList.value)
+    }
+  }
+  else {
+    if (!singleChecked.value) {
+      ElMessage({
+        message: '请选择检定实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      const checkValue = list.value.find(item => item.id == singleChecked.value)
+      emits('confirmCheckout', checkValue)
+    }
+  }
+
+  cancle()
+}
+
+// 初始化弹窗
+const initDialog = (multiSelect: boolean) => {
+  multi.value = multiSelect
+  dialogVisible.value = true
+  fetchData()
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <div class="choose-lab-dialog">
+    <el-dialog v-model="dialogVisible" :title="`选择检定实验室${(checkoutList.length > 0 && multi) ? `(已选择${checkoutList.length}个实验室)` : ''}`" width="1000" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.organizeName"
+            placeholder="实验室名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-select
+            v-model.trim="listQuery.meterMajor"
+            clearable
+            placeholder="计量专业"
+          >
+            <el-option
+              v-for="item in measureMajorList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <div style="padding: 5px 10px;">
+        <normal-table
+          :data="list"
+          :total="total"
+          :columns="columns"
+          :query="listQuery"
+          :list-loading="loadingTable"
+          :pagination="false"
+          size="small"
+          @multi-select="handleSelectionChange"
+        >
+          <!-- :is-showmulti-select="multi" -->
+          <!-- :is-multi="multi" -->
+          <template v-if="!multi" #preColumns>
+            <el-table-column label="#" width="55" align="center" fixed="left">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="" width="40" align="center" fixed>
+              <template #default="scope">
+                <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </div>
+
+      <template #footer>
+        <el-button type="primary" @click="clickConfirm">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.choose-lab-dialog {
+  :deep(.el-radio__label) {
+    display: none;
+  }
+}
+</style>
diff --git a/src/views/business/lab/myMeasure/components/lab-interface.ts b/src/views/business/lab/myMeasure/components/lab-interface.ts
new file mode 100644
index 0000000..02b0d1d
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/lab-interface.ts
@@ -0,0 +1,29 @@
+// 查询参数类型
+export interface ILabSearchQuery {
+  organizeNo: string // 组织编号
+  organizeName: string // 名称
+  organizeType: string // 类型-3科室
+  isLab: '1' // 是否是实验室
+  director: string // 负责人
+  meterMajor: string // 专业
+  createStartTime: '' // 创建开始时间
+  createEndTime: '' // 创建结束事假
+}
+
+// 部门返回值对象类型
+export interface ILabList {
+  id: string
+  deptId: string // 部门id
+  director: string // 负责人名称
+  phone: string // 负责人电话
+  meterMajor: string // 计量专业
+  organizeNo: string // 实验室编号
+  organizeName: string // 实验室名称
+  measureItems: string // 全部检测能力
+  pDeptId: string // 所属部门
+  pDeptName: string // 所属部门
+  organizeType: string // 组织类型
+  remark?: string // 备注
+  createTime?: string // 创建时间
+  updateTime?: string // 更新时间
+}
diff --git a/src/views/business/lab/myMeasure/components/processConfig.vue b/src/views/business/lab/myMeasure/components/processConfig.vue
new file mode 100644
index 0000000..bb66076
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/processConfig.vue
@@ -0,0 +1,161 @@
+<script setup lang="ts" name="ProcessConfig">
+import { ref } from 'vue'
+import draggable from 'vuedraggable'
+import { ElMessage } from 'element-plus'
+import type { ISchedule, IScheduleSet } from '../task-interface'
+import ProcessNode from './processNode.vue'
+import ProcessNodeAdd from './processNodeAdd.vue'
+import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
+import { setMeasureProcess, setMeasureProcessByFfy } from '@/api/business/schedule/task'
+const props = defineProps({
+  type: {
+    type: String,
+    default: 'distribute',
+  }, // 类型，决定调用哪个接口
+  // 是否为详情展示页面
+  detail: {
+    type: Boolean,
+    default: false,
+  },
+  // 样品id
+  sampleId: {
+    type: String,
+    required: true,
+  },
+  // 委托单id
+  orderId: {
+    type: String,
+    required: true,
+  },
+  list: {
+    type: Array,
+    default: () => [],
+  },
+})
+const emits = defineEmits(['saveOver'])
+// 默认流程节点
+const defaultProcess: IScheduleSet = {
+  measurePersonId: '', // 执行人
+  measurePerson: '', // 执行人名称
+  measureSegmentId: '', // 执行部门
+  measureSegment: '', // 执行部门名称
+  executiveItem: '', // 检定项目
+  // alreadyCertifications: 0, // 已出具证书总数
+  requireCertifications: 1, // 应出具证书总数
+  measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: '', // 流程更新时间
+}
+// 检定流程列表
+const processList = ref<IScheduleSet[]>([
+  { ...defaultProcess },
+])
+
+watch(() => props.list, (val) => {
+  if (props.list.length > 0) {
+    processList.value = props.list as ISchedule[]
+  }
+},
+{ deep: true, immediate: true })
+
+// 点击添加流程
+const processAdd = () => {
+  processList.value.push({ ...defaultProcess })
+}
+// 检查是否允许移动
+const checkMove = (evt: any) => {
+  // 目的位置元素evt.relatedContext.element
+  // 当前拖动元素evt.draggedContext.element
+  if (evt.relatedContext.element.measureState !== '0') {
+    return false
+  }
+  return true
+}
+
+// 选择实验室弹窗
+const chooseLabDialog = ref()
+// 批量添加流程
+const batchProcessAdd = () => {
+  chooseLabDialog.value.initDialog(true)
+}
+
+// 批量添加实验室
+const batchChooseOver = (labs: ILabList[]) => {
+  for (const item of labs) {
+    const processTemp: IScheduleSet = {
+      measurePersonId: '', // 执行人
+      measurePerson: '', // 执行人名称
+      measureSegmentId: item.deptId, // 执行部门
+      measureSegment: item.organizeName, // 执行部门名称
+      executiveItem: '', // 检定项目
+      measureSequence: '', // 监测顺序
+      // alreadyCertifications: 0, // 已出具证书总数
+      requireCertifications: 1, // 应出具证书总数
+      measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      updateTime: '', // 流程更新时间
+    }
+    processList.value.push(processTemp)
+  }
+}
+
+// 保存流程
+const saveProcess = () => {
+  const form = {
+    measureProcessList: processList.value,
+    executiveList: processList.value,
+    orderId: props.orderId,
+    sampleId: props.sampleId,
+  }
+  // 处理顺序
+  for (const key in form.measureProcessList) {
+    form.measureProcessList[key].measureSequence = (parseInt(key) + 1).toString()
+  }
+  if (props.type == 'distribute') {
+    setMeasureProcess(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
+  else {
+    setMeasureProcessByFfy(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
+}
+// 删除流程
+const deleteProcess = (index: number) => {
+  processList.value.splice(index, 1)
+}
+
+// --------暴露方法
+defineExpose({ saveProcess, batchProcessAdd, deleteProcess })
+</script>
+
+<template>
+  <div>
+    <div class="process-container">
+      <draggable v-model="processList" item-key="id" class="process-draggable" handle=".handle" :move="checkMove">
+        <!-- eslint-disable-next-line vue/no-unused-vars -->
+        <template #item="{ process, index }">
+          <process-node v-model="processList[index]" :step="index + 1" :detail="props.detail" @delete="deleteProcess(index)" />
+        </template>
+        <template #footer>
+          <process-node-add v-if="!props.detail" @click="processAdd" />
+        </template>
+      </draggable>
+    </div>
+    <choose-lab ref="chooseLabDialog" @confirm-checkout="batchChooseOver" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.process-container {
+  .process-draggable {
+    display: flex;
+    flex-wrap: wrap;
+  }
+}
+</style>
diff --git a/src/views/business/lab/myMeasure/components/processNode.vue b/src/views/business/lab/myMeasure/components/processNode.vue
new file mode 100644
index 0000000..fad76ab
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/processNode.vue
@@ -0,0 +1,215 @@
+<script lang="ts" setup name="ProcessNode">
+import {
+  Aim, Rank, Remove,
+} from '@element-plus/icons-vue'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
+// 逻辑代码
+const props = defineProps({
+  // 默认数据
+  modelValue: {
+    type: Object,
+    default: () => {
+      return {
+        measurePersonId: '', // 执行人
+        measurePerson: '', // 执行人名称
+        measureSegmentId: '', // 执行部门
+        measureSegment: '', // 执行部门名称
+        executiveItem: '', // 检定项目
+        alreadyCertifications: 0, // 已出具证书总数
+        requireCertifications: 0, // 应出具证书总数
+        measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        updateTime: '', // 流程更新时间
+      }
+    },
+  },
+  // 是否为详情展示页面
+  detail: {
+    type: Boolean,
+    default: false,
+  },
+  // 步骤
+  step: {
+    type: Number,
+    default: 1,
+  },
+})
+const emit = defineEmits(['update:modelValue', 'delete'])
+
+// ------------定义props参数----------
+const processNodeData = computed({
+  get() {
+    return props.modelValue
+  },
+  set(value) {
+    emit('update:modelValue', value)
+  },
+})
+// 检定环节可编辑-只有待分发状态可编辑
+const deptEdit = computed(() => {
+  const editStates = ['']
+  return editStates.includes(processNodeData.value.measureStatus)
+})
+// 检定人可编辑-待分配状态可编辑
+const personEdit = computed(() => {
+  const editStates = ['', '1', '2']
+  return editStates.includes(processNodeData.value.measureStatus)
+})
+// 证书可编辑-待分发、待分配、待检测状态可编辑
+const certificationEdit = computed(() => {
+  const editStates = ['', '1', '2', '3']
+  return editStates.includes(processNodeData.value.measureStatus)
+})
+// 节点可移动
+const canMove = computed(() => {
+  const editStates = ['', '1']
+  return editStates.includes(processNodeData.value.measureStatus)
+})
+
+// 选择人员
+const choosePersonShow = ref(false)
+const choosePerson = () => {
+  choosePersonShow.value = true
+}
+// 人员选择完毕
+const choosePersonOver = (person: { id: string; name: string }) => {
+  processNodeData.value.measurePersonId = person.id
+  processNodeData.value.measurePerson = person.name
+  choosePersonShow.value = false
+}
+
+// 选择实验室
+const chooseLabDialog = ref()
+const clickChoose = () => {
+  chooseLabDialog.value.initDialog(false)
+}
+const _selectStaffDialog = ref()
+// 实验室选择完毕
+const chooseOver = (lab: ILabList) => {
+  console.log(lab)
+  processNodeData.value.measureSegmentId = lab.deptId
+  processNodeData.value.measureSegment = lab.organizeName
+  // 定义一个对象关联上子组件的 ref 值（注意：这里的属性名必须跟子组件定义的 ref 值一模一样，否者会关联失效）
+  // 延迟使用，因为还没挂载
+  nextTick(() => {
+    _selectStaffDialog.value.fetchData()
+  })
+}
+
+// 移除该节点
+const deleteNode = () => {
+  emit('delete')
+}
+</script>
+
+<template>
+  <div class="process-node">
+    <div class="header">
+      <div class="step">
+        {{ props.step }}
+      </div>
+      <div class="buttons">
+        <el-icon v-show="canMove && !props.detail" class="icon-button" title="移除" @click="deleteNode">
+          <remove />
+        </el-icon>
+        <el-icon v-show="canMove && !props.detail" class="icon-button handle" title="移动">
+          <rank />
+        </el-icon>
+      </div>
+    </div>
+    <div>
+      <div class="line">
+        <span class="label">检定环节</span>
+        <el-input v-model="processNodeData.measureSegment" class="process-input" readonly size="small" :disabled="!deptEdit || props.detail">
+          <template v-if="deptEdit && !props.detail" #append>
+            <el-button :icon="Aim" size="small" link @click="clickChoose" />
+          </template>
+        </el-input>
+      </div>
+      <div class="line">
+        <span class="label">检定人员</span>
+        <el-input v-model="processNodeData.measurePerson" readonly class="process-input" size="small" :disabled="!personEdit || props.detail">
+          <template v-if="personEdit && !props.detail" #append>
+            <el-button :icon="Aim" size="small" link :disabled="processNodeData.measureSegment === ''" @click="choosePerson" />
+          </template>
+        </el-input>
+      </div>
+      <div class="line">
+        <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit || props.detail" /><span class="unit"> 份</span>
+      </div>
+      <div class="line">
+        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStatusName }}</span>
+      </div>
+      <div class="line">
+        <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
+      </div>
+    </div>
+    <!-- 选择实验室弹窗 -->
+    <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
+    <!-- 成员弹框 -->
+    <select-staff-dialog ref="_selectStaffDialog" v-model:visible="choosePersonShow" :data="[processNodeData.measurePersonId]" :dept-id="processNodeData.measureSegmentId" :dept-name="processNodeData.measureSegment" :multi="false" @change="choosePersonOver" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.process-node {
+  // display: inline-block;
+  margin-right: 10px;
+  width: 280px;
+  height: 215px;
+  border: 1px solid #e0e0e0;
+  padding: 5px 15px;
+  border-radius: 5px;
+  background-color: #fafafa;
+  margin-bottom: 10px;
+
+  .header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+    .step {
+      line-height: 28px;
+      font-size: 16px;
+      color: #3d7eff;
+      font-weight: bold;
+      margin-bottom: 5px;
+    }
+
+    .icon-button {
+      color: #999;
+      margin-left: 5px;
+      font-size: 16px;
+
+      &:hover {
+        cursor: pointer;
+      }
+    }
+  }
+
+  .line {
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 4px 0;
+
+    .label {
+      width: 80px;
+      font-size: 14px;
+    }
+
+    .process-input {
+      flex: 1;
+      font-size: 14px;
+    }
+
+    .unit {
+      margin-left: 5px;
+      font-size: 14px;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/lab/myMeasure/components/processNodeAdd.vue b/src/views/business/lab/myMeasure/components/processNodeAdd.vue
new file mode 100644
index 0000000..d7aeea0
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/processNodeAdd.vue
@@ -0,0 +1,46 @@
+<script lang="ts" setup name="ProcessNodeAdd">
+const emit = defineEmits(['click'])
+const add = () => {
+  emit('click')
+}
+</script>
+
+<template>
+  <div class="process-node" @click="add">
+    <div class="add">
+      <el-icon class="add-icon">
+        <plus />
+      </el-icon>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.process-node {
+  // display: inline-block;
+  width: 280px;
+  height: 215px;
+  border: 1px dashed #e0e0e0;
+  padding: 5px 15px;
+  border-radius: 5px;
+  background-color: #fbfbfb;
+
+  &:hover {
+    cursor: pointer;
+    background-color: #f5f5f5;
+  }
+
+  .add {
+    height: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    .add-icon {
+      vertical-align: middle;
+      font-size: 100px;
+      color: #999;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/lab/myMeasure/measureDetail.vue b/src/views/business/lab/myMeasure/measureDetail.vue
new file mode 100644
index 0000000..1a88be8
--- /dev/null
+++ b/src/views/business/lab/myMeasure/measureDetail.vue
@@ -0,0 +1,601 @@
+<!-- 任务分发 -->
+<script lang="ts" setup name="TaskEdit">
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance } from 'element-plus'
+import { ref } from 'vue'
+import ProcessConfig from './components/processConfig.vue'
+import type { ISampleMeasure, ITaskDetail } from './task-interface'
+import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { getTaskDetail } from '@/api/business/schedule/task'
+import countries from '@/components/AddressSelect/country-code.json'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+interface dictType {
+  id: string
+  name: string
+  value: string
+}
+const roleType = ref('distribute') // 角色类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员),
+const countryList = ref(countries) // 国家列表
+const loading = ref(false) // 表单加载状态
+const sampleId = ref('') // 样品详情id
+const orderId = ref('') // 委托书id
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const mesureTypeList = ref<dictType[]>([]) // 检定方式
+const $route = useRoute()
+
+// 获取字典值
+function getDict() {
+  // 获取样品属性
+  getDictByCode('measureCategory').then((response) => {
+    mesureCategoryList.value = response.data
+  })
+  // 获取样品属性
+  getDictByCode('measureType').then((response) => {
+    mesureTypeList.value = response.data
+  })
+}
+getDict()
+
+// 基本信息表单
+const sampleForm = ref<ISampleMeasure>({
+  id: '', // 样品id
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 样品型号
+  manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  phone: '', // 委托方电话
+  postalCode: '', // 委托方邮编
+  customerAddress: '', // 委托方地址
+  measureCategory: '', // 检校类别
+  manufacturer: '', // 生产厂家
+  manufacturerCountry: '', // 厂家国别
+  manufacturingDate: '', // 出厂年月
+  abc: '', // ABC
+  measurePeriod: '', // 检定周期
+  remark: '', // 备注
+  minioFileName: '', // 说明书
+  labelBind: '', // 标签绑定
+  measureType: '1', // 检定方式  1自检、2外包、3外检
+  measureTypeName: '', // 检定方式
+  measureLastTime: '', // 检定日期
+  validDeadline: '', // 有效日期
+  powerVoltage: '', // 电源电压
+  sampleBelong: '', // 样品所属
+  sampleBelongName: '', // 样品所属
+})
+const taskForm = ref <ITaskDetail> ({
+  measureContent: '', // 检定项目
+  specialRequire: '', // 客户特殊要求
+  orderId: '', // 委托单id
+  orderCode: '', // 委托单编号
+  certifications: '', // 证书类别
+  planDeliverTime: '', // 预约送达时间
+  requireOverTime: '', // 要求检完时间
+  measureProcessList: [], // 检定流程
+  measureSendBackList: [], // 退回信息
+  remark: '', // 备注
+  deliverer: '', // 送检人
+  delivererTel: '', // 送检人联系方式
+})
+const ruleFormRef = ref<FormInstance>()
+
+// 自定义校验规则--检定周期为正整数
+const validateMesurePeriod = (rule: any, value: any, callback: any) => {
+  if (value === '') {
+    callback()
+  }
+  else if (!(/(^[1-9]\d*$)/.test(value))) {
+    callback(new Error('请输入一个正整数'))
+  }
+  else {
+    callback()
+  }
+}
+
+// 校验规则
+const rules = ref({
+  mesurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
+}) // 表单验证规则
+
+// 其他关联数据列表
+const dataList = ref({
+  measureRecords: [] as SimpleMeasureRecord[],
+  certificationRecords: [] as SimpleCertification[],
+})
+
+// 获取检定记录
+const fetchMeasureRecords = function (query = null) {
+  dataList.value.measureRecords = []
+}
+// 获取检定证书
+const fetchCertifications = function (query = null) {
+  dataList.value.certificationRecords = []
+}
+interface Menu {
+  name: string
+  columns: TableColumn[]
+  pagination: boolean
+  list: 'measureRecords' | 'certificationRecords'
+  searchFunc: Function
+}
+// 菜单
+const menu: Menu[] = [
+  {
+    name: '检定记录',
+    columns: [
+      { text: '委托单编号', value: 'orderCode' },
+      { text: '委托单日期', value: 'orderTime' },
+      { text: '委托方代码', value: 'customerCode' },
+      { text: '委托方名称', value: 'customerName' },
+      { text: '送检人', value: 'deliverer' },
+      { text: '送检日期', value: 'deliverTime' },
+    ],
+    list: 'measureRecords',
+    pagination: true,
+    searchFunc: fetchMeasureRecords,
+  },
+  {
+    name: '检定证书',
+    columns: [
+      { text: '证书编号', value: 'certificationCode' },
+      { text: '证书名称', value: 'certificationName' },
+      { text: '证书类型', value: 'certificationType' },
+      { text: '证书出具日期', value: 'effectiveDate' },
+      { text: '证书有效期', value: 'expirationDate' },
+    ],
+    list: 'certificationRecords',
+    pagination: true,
+    searchFunc: fetchCertifications,
+  },
+]
+
+const currentMenu = ref('证书监控')
+const currentMenuObj = computed(() => {
+  return menu.find(item => item.name === currentMenu.value)
+})
+
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 打印表单
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '样品详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>样品详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+// 保存样品信息
+function saveForm(formEl: FormInstance | undefined) {
+  if (!formEl) { return }
+  formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认修改样品信息吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (sampleForm.value.id) {
+          updateSample(sampleForm.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+      })
+    }
+  })
+}
+// 获取详情
+const getSampleInfo = () => {
+  getSapmleDetail({ id: sampleId.value }).then((res) => {
+    sampleForm.value = res.data
+  })
+}
+// 获取分发详情
+const getInfo = () => {
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    taskForm.value.specialRequire = res.data.specialRequire // 客户特殊要求
+    taskForm.value.deliverer = res.data.deliverer // 送检人
+    taskForm.value.delivererTel = res.data.delivererTel // 送检人联系方式
+    taskForm.value.measureContent = res.data.measureContent // 检定项目
+    taskForm.value.measureProcessList = res.data.measureProcessList // 检定流程
+    taskForm.value.measureSendBackList = res.data.measureSendBackList // 退回流程
+    console.log('pppppp')
+    console.log(taskForm.value.measureProcessList)
+
+    // 改用一个接口获取
+    sampleForm.value = res.data
+  })
+}
+
+// 点击标签绑定的扫描
+const startScan = () => {
+  // TODO
+}
+
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
+}
+// 保存流程按钮点击
+const saveProcess = () => {
+  processConfigRef.value.saveProcess()
+}
+
+// 文件上传
+const fileRef = ref()
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    // UploadFile(fd).then((res) => {
+    //   if (res.code === 200) {
+    //     sampleForm.value.minioFileName = res.data[0]
+    //     // 重置当前验证
+    //     ElMessage.success('文件上传成功')
+    //   }
+    //   else {
+    //     ElMessage.error(res.message)
+    //   }
+    // })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+onMounted(() => {
+  console.log($route)
+  // 从路由中获取页面类型参数
+  if ($route.params && $route.params.role) {
+    roleType.value = $route.params.role as string // 使用角色
+  }
+  if ($route.params.id) {
+    sampleId.value = $route.params.id as string
+    orderId.value = $route.query.order as string
+    // 获取分发详情
+    getInfo()
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="样品详情">
+      <template #btns>
+        <el-button v-if="roleType === 'detail'" v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <!-- <el-button v-if="roleType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button> -->
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <div id="form">
+        <el-form
+          ref="ruleFormRef"
+          :model="sampleForm"
+          :label-width="120"
+          label-position="right"
+          :rules="rules"
+        >
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="样品编号:" prop="sampleNo">
+                <el-input
+                  v-model="sampleForm.sampleNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品名称:" prop="sampleName">
+                <el-input
+                  v-model="sampleForm.sampleName"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品型号:" prop="sampleModel">
+                <el-input
+                  v-model="sampleForm.sampleModel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂编号:" prop="manufacturingNo">
+                <el-input
+                  v-model="sampleForm.manufacturingNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方代码" prop="customerNo">
+                <el-input
+                  v-model="sampleForm.customerNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方名称" prop="customerName">
+                <el-input
+                  v-model="sampleForm.customerName"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方电话" prop="phone">
+                <el-input
+                  v-model="sampleForm.phone"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方电话'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方邮编" prop="postalCode">
+                <el-input
+                  v-model="sampleForm.postalCode"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方邮编'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="18">
+              <el-form-item label="委托方地址:" prop="companyAddress">
+                <el-input
+                  v-model="sampleForm.customerAddress"
+                  type="textarea"
+                  autosize
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方地址'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="校检类别:">
+                <el-select
+                  v-model="sampleForm.measureCategory"
+                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :disabled="roleType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="生产厂家:">
+                <el-input
+                  v-model="sampleForm.manufacturer"
+                  :placeholder="roleType === 'detail' ? '' : '请输入生产厂家'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="厂家国别:">
+                <el-select
+                  v-model="sampleForm.manufacturerCountry"
+                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :disabled="roleType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂年月:">
+                <el-date-picker
+                  v-model="sampleForm.manufacturingDate"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="roleType === 'detail' ? '' : '请输入出厂年月'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="ABC:">
+                <el-select
+                  v-model="sampleForm.abc"
+                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :disabled="roleType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="送检人:">
+                <el-input
+                  v-model="taskForm.deliverer"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="联系方式:">
+                <el-input
+                  v-model="taskForm.delivererTel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="检定项目:" prop="mesureContent">
+                <el-input
+                  v-model="taskForm.measureContent"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  disabled
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检定周期（月）:">
+                <el-input
+                  v-model="sampleForm.measurePeriod"
+                  :placeholder="roleType === 'detail' ? '' : '请输入检定周期'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="备注:">
+                <el-input
+                  v-model="sampleForm.remark"
+                  type="textarea"
+                  :rows="2"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  disabled
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检定方式:">
+                <el-select
+                  v-model="sampleForm.measureType"
+                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :disabled="roleType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of mesureTypeList" :key="item.value" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="标签绑定:">
+                <el-input
+                  v-model="sampleForm.labelBind"
+                  :placeholder="roleType === 'detail' ? '' : '标签绑定'"
+                  :disabled="roleType === 'detail'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                >
+                  <template v-if="roleType !== 'detail'" #append>
+                    <el-button>
+                      扫描
+                    </el-button>
+                  </template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="14">
+              <el-form-item label="说明书:">
+                <show-photo v-if="sampleForm.minioFileName" :minio-file-name="sampleForm.minioFileName" />
+                <span v-else-if="roleType === 'detail'">无</span>
+                <input v-show="roleType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="roleType !== 'detail'" id="file" type="primary" :disabled="roleType === 'detail'" :style="{ 'margin-left': sampleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ sampleForm.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </detail-page>
+    <detail-block v-if="taskForm.measureProcessList && taskForm.measureProcessList.length >= 1" title="检定流程">
+      <!-- <template #btns>
+        <el-button type="primary" style="margin-bottom: 10px;" @click="batchProcessAdd">
+          批量添加
+        </el-button>
+        <el-button type="primary" style="margin-bottom: 10px;" @click="saveProcess">
+          保存
+        </el-button>
+      </template> -->
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" :detail="true" />
+    </detail-block>
+    <!-- 退回流程 -->
+    <detail-block v-if="taskForm.measureSendBackList && taskForm.measureSendBackList.length >= 1" title="退回流程">
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureSendBackList" :sample-id="sampleId" :detail="true" />
+    </detail-block>
+    <!-- 检定记录、检定证书 -->
+    <detail-block-switch :title="currentMenu">
+      <template #menu>
+        <el-radio-group v-model="currentMenu">
+          <el-radio-button label="证书监控">
+            证书监控
+          </el-radio-button>
+          <el-radio-button label="检定记录">
+            检定记录
+          </el-radio-button>
+          <el-radio-button label="检定证书">
+            检定证书
+          </el-radio-button>
+        </el-radio-group>
+      </template>
+      <!-- 证书监控 -->
+      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" />
+      <!-- 检定记录 -->
+      <measure-records v-if="currentMenu === '检定记录'" :sample-id="sampleId" />
+      <!-- 证书记录 -->
+      <certification-records v-if="currentMenu === '检定证书'" :sample-id="sampleId" />
+    </detail-block-switch>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
+
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 62f8830..e4a4637 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -13,7 +13,6 @@
 import { getMyMeasureList, myExecutiveDone, myExecutiveReceive } from '@/api/business/schedule/task'
 import type { dictType } from '@/global'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
-
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
@@ -128,7 +127,7 @@
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`myMeasureDetail/detail/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗

diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index b21ad07..cf4a5b9 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -260,6 +260,19 @@
         },
       },
       {
+        path: 'myMeasureDetail/:role/:id',
+        name: 'MyMeasureDetail',
+        component: () => import('@/views/business/lab/myMeasure/measureDetail.vue'),
+        meta: {
+          title: '我的检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          auth: '/lab/myMeasure',
+          activeMenu: '/lab/myMeasureList',
+        },
+      },
+      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -270,6 +283,19 @@
         },
       },
       {
+        path: 'myMeasureDetail/:role/:id',
+        name: 'MyMeasureDetail',
+        component: () => import('@/views/business/lab/myMeasure/measureDetail.vue'),
+        meta: {
+          title: '部门检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          auth: '/lab/deptMeasureList',
+          activeMenu: '/lab/deptMeasureList',
+        },
+      },
+      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 066f192..7a6ebea 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -102,8 +102,9 @@
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
-          localStorage.removeItem('name')
           localStorage.removeItem('token')
+          localStorage.removeItem('nameId')
+          localStorage.removeItem('depId')
           this.username = ''
           this.token = ''
           this.roleList = []
@@ -121,7 +122,8 @@
               this.roleList = res.data.roleIds
               this.roleNames = res.data.roleNames
               this.roleTips = res.data.roleTips
-              localStorage.setItem('name', res.data.name)
+              localStorage.setItem('nameId', res.data.id)
+              localStorage.setItem('depId', res.data.deptId)
             }
             else {
               reject('该用户无角色')
diff --git a/src/views/business/board/overdueReminder/detail.vue b/src/views/business/board/overdueReminder/detail.vue
index 92987d1..0239b71 100644
--- a/src/views/business/board/overdueReminder/detail.vue
+++ b/src/views/business/board/overdueReminder/detail.vue
@@ -5,7 +5,7 @@
 import { ref } from 'vue'
 import dayjs from 'dayjs'
 import ProcessConfig from '@/views/business/schedule/task/components/processConfig.vue'
-import type { ISampleMeasure, ITaskDetail } from '@/views/business/schedule/task/task-interface'
+import type { ISampleMeasure, ITaskDetail } from '@/views/business/schedule/task/task-interface.js'
 import type { Menu, SimpleCertification, SimpleMeasureRecord, dictType } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getTaskDetail } from '@/api/business/schedule/task'
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index d6cc168..05fd811 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -4,8 +4,8 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import DistributeDialog from '../../schedule/task/components/distributeDialog.vue'
 import RollbackDialog from './../components/rollbackDialog.vue'
-import DistributeDialog from './../components/distributeDialog.vue'
 import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
@@ -131,7 +131,8 @@
 const depId = ref('')
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
+  $router.push(`myMeasureDetail/detail/${row.sampleId}?order=${row.orderId}`)
+  // $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
diff --git a/src/views/business/lab/myMeasure/components/chooseLab.vue b/src/views/business/lab/myMeasure/components/chooseLab.vue
new file mode 100644
index 0000000..0dcebfc
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/chooseLab.vue
@@ -0,0 +1,203 @@
+<script setup lang="ts" name="ChooseLab">
+// 选择实验室
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { ILabList, ILabSearchQuery } from '@/views/business/schedule/task/components/lab-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getOrganizeList } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
+const emits = defineEmits(['confirmCheckout'])
+// 是否多选
+const multi = ref(false)
+const dialogVisible = ref(false)
+
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
+// 查询条件
+const listQuery = ref<ILabSearchQuery>({
+  organizeNo: '', // 实验室编号
+  organizeName: '', // 实验室名称
+  meterMajor: '', // 专业
+  organizeType: '3', // 组织类型
+  director: '', // 负责人
+  isLab: '1', // 是否是实验室
+  createStartTime: '',
+  createEndTime: '',
+})
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '实验室名称', value: 'organizeName', width: '160', align: 'center' },
+  // { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
+  { text: '负责人', value: 'director', align: 'center', width: '120' },
+  { text: '计量专业', value: 'meterMajorName', align: 'center' },
+  { text: '实验室能力', value: 'labCapacityName', align: 'center' },
+])
+// 表格数据
+const list = ref<ILabList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 多选的内容
+const checkoutList = ref<ILabList[]>([])
+// 单选
+const singleChecked = ref()
+// 数据查询
+function fetchData(isNowPage = false) {
+  getOrganizeList(listQuery.value).then((response) => {
+    list.value = response.data
+    total.value = parseInt(response.data.length)
+    loadingTable.value = false
+  })
+  loadingTable.value = false
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    organizeNo: '', // 实验室编号
+    organizeName: '', // 实验室名称
+    meterMajor: '', // 专业
+    organizeType: '3', // 组织类型
+    director: '', // 负责人
+    isLab: '1', // 是否是实验室
+    createStartTime: '',
+    createEndTime: '',
+  }
+}
+
+// 点击取消
+const cancle = () => {
+  dialogVisible.value = false
+}
+// 点击确定
+const clickConfirm = () => {
+  // 如果多选
+  if (multi.value) {
+    if (!checkoutList.value.length) {
+      ElMessage({
+        message: '请选择至少一个实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      emits('confirmCheckout', checkoutList.value)
+    }
+  }
+  else {
+    if (!singleChecked.value) {
+      ElMessage({
+        message: '请选择检定实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      const checkValue = list.value.find(item => item.id == singleChecked.value)
+      emits('confirmCheckout', checkValue)
+    }
+  }
+
+  cancle()
+}
+
+// 初始化弹窗
+const initDialog = (multiSelect: boolean) => {
+  multi.value = multiSelect
+  dialogVisible.value = true
+  fetchData()
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <div class="choose-lab-dialog">
+    <el-dialog v-model="dialogVisible" :title="`选择检定实验室${(checkoutList.length > 0 && multi) ? `(已选择${checkoutList.length}个实验室)` : ''}`" width="1000" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.organizeName"
+            placeholder="实验室名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-select
+            v-model.trim="listQuery.meterMajor"
+            clearable
+            placeholder="计量专业"
+          >
+            <el-option
+              v-for="item in measureMajorList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <div style="padding: 5px 10px;">
+        <normal-table
+          :data="list"
+          :total="total"
+          :columns="columns"
+          :query="listQuery"
+          :list-loading="loadingTable"
+          :pagination="false"
+          size="small"
+          @multi-select="handleSelectionChange"
+        >
+          <!-- :is-showmulti-select="multi" -->
+          <!-- :is-multi="multi" -->
+          <template v-if="!multi" #preColumns>
+            <el-table-column label="#" width="55" align="center" fixed="left">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="" width="40" align="center" fixed>
+              <template #default="scope">
+                <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </div>
+
+      <template #footer>
+        <el-button type="primary" @click="clickConfirm">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.choose-lab-dialog {
+  :deep(.el-radio__label) {
+    display: none;
+  }
+}
+</style>
diff --git a/src/views/business/lab/myMeasure/components/lab-interface.ts b/src/views/business/lab/myMeasure/components/lab-interface.ts
new file mode 100644
index 0000000..02b0d1d
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/lab-interface.ts
@@ -0,0 +1,29 @@
+// 查询参数类型
+export interface ILabSearchQuery {
+  organizeNo: string // 组织编号
+  organizeName: string // 名称
+  organizeType: string // 类型-3科室
+  isLab: '1' // 是否是实验室
+  director: string // 负责人
+  meterMajor: string // 专业
+  createStartTime: '' // 创建开始时间
+  createEndTime: '' // 创建结束事假
+}
+
+// 部门返回值对象类型
+export interface ILabList {
+  id: string
+  deptId: string // 部门id
+  director: string // 负责人名称
+  phone: string // 负责人电话
+  meterMajor: string // 计量专业
+  organizeNo: string // 实验室编号
+  organizeName: string // 实验室名称
+  measureItems: string // 全部检测能力
+  pDeptId: string // 所属部门
+  pDeptName: string // 所属部门
+  organizeType: string // 组织类型
+  remark?: string // 备注
+  createTime?: string // 创建时间
+  updateTime?: string // 更新时间
+}
diff --git a/src/views/business/lab/myMeasure/components/processConfig.vue b/src/views/business/lab/myMeasure/components/processConfig.vue
new file mode 100644
index 0000000..bb66076
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/processConfig.vue
@@ -0,0 +1,161 @@
+<script setup lang="ts" name="ProcessConfig">
+import { ref } from 'vue'
+import draggable from 'vuedraggable'
+import { ElMessage } from 'element-plus'
+import type { ISchedule, IScheduleSet } from '../task-interface'
+import ProcessNode from './processNode.vue'
+import ProcessNodeAdd from './processNodeAdd.vue'
+import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
+import { setMeasureProcess, setMeasureProcessByFfy } from '@/api/business/schedule/task'
+const props = defineProps({
+  type: {
+    type: String,
+    default: 'distribute',
+  }, // 类型，决定调用哪个接口
+  // 是否为详情展示页面
+  detail: {
+    type: Boolean,
+    default: false,
+  },
+  // 样品id
+  sampleId: {
+    type: String,
+    required: true,
+  },
+  // 委托单id
+  orderId: {
+    type: String,
+    required: true,
+  },
+  list: {
+    type: Array,
+    default: () => [],
+  },
+})
+const emits = defineEmits(['saveOver'])
+// 默认流程节点
+const defaultProcess: IScheduleSet = {
+  measurePersonId: '', // 执行人
+  measurePerson: '', // 执行人名称
+  measureSegmentId: '', // 执行部门
+  measureSegment: '', // 执行部门名称
+  executiveItem: '', // 检定项目
+  // alreadyCertifications: 0, // 已出具证书总数
+  requireCertifications: 1, // 应出具证书总数
+  measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: '', // 流程更新时间
+}
+// 检定流程列表
+const processList = ref<IScheduleSet[]>([
+  { ...defaultProcess },
+])
+
+watch(() => props.list, (val) => {
+  if (props.list.length > 0) {
+    processList.value = props.list as ISchedule[]
+  }
+},
+{ deep: true, immediate: true })
+
+// 点击添加流程
+const processAdd = () => {
+  processList.value.push({ ...defaultProcess })
+}
+// 检查是否允许移动
+const checkMove = (evt: any) => {
+  // 目的位置元素evt.relatedContext.element
+  // 当前拖动元素evt.draggedContext.element
+  if (evt.relatedContext.element.measureState !== '0') {
+    return false
+  }
+  return true
+}
+
+// 选择实验室弹窗
+const chooseLabDialog = ref()
+// 批量添加流程
+const batchProcessAdd = () => {
+  chooseLabDialog.value.initDialog(true)
+}
+
+// 批量添加实验室
+const batchChooseOver = (labs: ILabList[]) => {
+  for (const item of labs) {
+    const processTemp: IScheduleSet = {
+      measurePersonId: '', // 执行人
+      measurePerson: '', // 执行人名称
+      measureSegmentId: item.deptId, // 执行部门
+      measureSegment: item.organizeName, // 执行部门名称
+      executiveItem: '', // 检定项目
+      measureSequence: '', // 监测顺序
+      // alreadyCertifications: 0, // 已出具证书总数
+      requireCertifications: 1, // 应出具证书总数
+      measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      updateTime: '', // 流程更新时间
+    }
+    processList.value.push(processTemp)
+  }
+}
+
+// 保存流程
+const saveProcess = () => {
+  const form = {
+    measureProcessList: processList.value,
+    executiveList: processList.value,
+    orderId: props.orderId,
+    sampleId: props.sampleId,
+  }
+  // 处理顺序
+  for (const key in form.measureProcessList) {
+    form.measureProcessList[key].measureSequence = (parseInt(key) + 1).toString()
+  }
+  if (props.type == 'distribute') {
+    setMeasureProcess(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
+  else {
+    setMeasureProcessByFfy(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
+}
+// 删除流程
+const deleteProcess = (index: number) => {
+  processList.value.splice(index, 1)
+}
+
+// --------暴露方法
+defineExpose({ saveProcess, batchProcessAdd, deleteProcess })
+</script>
+
+<template>
+  <div>
+    <div class="process-container">
+      <draggable v-model="processList" item-key="id" class="process-draggable" handle=".handle" :move="checkMove">
+        <!-- eslint-disable-next-line vue/no-unused-vars -->
+        <template #item="{ process, index }">
+          <process-node v-model="processList[index]" :step="index + 1" :detail="props.detail" @delete="deleteProcess(index)" />
+        </template>
+        <template #footer>
+          <process-node-add v-if="!props.detail" @click="processAdd" />
+        </template>
+      </draggable>
+    </div>
+    <choose-lab ref="chooseLabDialog" @confirm-checkout="batchChooseOver" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.process-container {
+  .process-draggable {
+    display: flex;
+    flex-wrap: wrap;
+  }
+}
+</style>
diff --git a/src/views/business/lab/myMeasure/components/processNode.vue b/src/views/business/lab/myMeasure/components/processNode.vue
new file mode 100644
index 0000000..fad76ab
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/processNode.vue
@@ -0,0 +1,215 @@
+<script lang="ts" setup name="ProcessNode">
+import {
+  Aim, Rank, Remove,
+} from '@element-plus/icons-vue'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
+// 逻辑代码
+const props = defineProps({
+  // 默认数据
+  modelValue: {
+    type: Object,
+    default: () => {
+      return {
+        measurePersonId: '', // 执行人
+        measurePerson: '', // 执行人名称
+        measureSegmentId: '', // 执行部门
+        measureSegment: '', // 执行部门名称
+        executiveItem: '', // 检定项目
+        alreadyCertifications: 0, // 已出具证书总数
+        requireCertifications: 0, // 应出具证书总数
+        measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        updateTime: '', // 流程更新时间
+      }
+    },
+  },
+  // 是否为详情展示页面
+  detail: {
+    type: Boolean,
+    default: false,
+  },
+  // 步骤
+  step: {
+    type: Number,
+    default: 1,
+  },
+})
+const emit = defineEmits(['update:modelValue', 'delete'])
+
+// ------------定义props参数----------
+const processNodeData = computed({
+  get() {
+    return props.modelValue
+  },
+  set(value) {
+    emit('update:modelValue', value)
+  },
+})
+// 检定环节可编辑-只有待分发状态可编辑
+const deptEdit = computed(() => {
+  const editStates = ['']
+  return editStates.includes(processNodeData.value.measureStatus)
+})
+// 检定人可编辑-待分配状态可编辑
+const personEdit = computed(() => {
+  const editStates = ['', '1', '2']
+  return editStates.includes(processNodeData.value.measureStatus)
+})
+// 证书可编辑-待分发、待分配、待检测状态可编辑
+const certificationEdit = computed(() => {
+  const editStates = ['', '1', '2', '3']
+  return editStates.includes(processNodeData.value.measureStatus)
+})
+// 节点可移动
+const canMove = computed(() => {
+  const editStates = ['', '1']
+  return editStates.includes(processNodeData.value.measureStatus)
+})
+
+// 选择人员
+const choosePersonShow = ref(false)
+const choosePerson = () => {
+  choosePersonShow.value = true
+}
+// 人员选择完毕
+const choosePersonOver = (person: { id: string; name: string }) => {
+  processNodeData.value.measurePersonId = person.id
+  processNodeData.value.measurePerson = person.name
+  choosePersonShow.value = false
+}
+
+// 选择实验室
+const chooseLabDialog = ref()
+const clickChoose = () => {
+  chooseLabDialog.value.initDialog(false)
+}
+const _selectStaffDialog = ref()
+// 实验室选择完毕
+const chooseOver = (lab: ILabList) => {
+  console.log(lab)
+  processNodeData.value.measureSegmentId = lab.deptId
+  processNodeData.value.measureSegment = lab.organizeName
+  // 定义一个对象关联上子组件的 ref 值（注意：这里的属性名必须跟子组件定义的 ref 值一模一样，否者会关联失效）
+  // 延迟使用，因为还没挂载
+  nextTick(() => {
+    _selectStaffDialog.value.fetchData()
+  })
+}
+
+// 移除该节点
+const deleteNode = () => {
+  emit('delete')
+}
+</script>
+
+<template>
+  <div class="process-node">
+    <div class="header">
+      <div class="step">
+        {{ props.step }}
+      </div>
+      <div class="buttons">
+        <el-icon v-show="canMove && !props.detail" class="icon-button" title="移除" @click="deleteNode">
+          <remove />
+        </el-icon>
+        <el-icon v-show="canMove && !props.detail" class="icon-button handle" title="移动">
+          <rank />
+        </el-icon>
+      </div>
+    </div>
+    <div>
+      <div class="line">
+        <span class="label">检定环节</span>
+        <el-input v-model="processNodeData.measureSegment" class="process-input" readonly size="small" :disabled="!deptEdit || props.detail">
+          <template v-if="deptEdit && !props.detail" #append>
+            <el-button :icon="Aim" size="small" link @click="clickChoose" />
+          </template>
+        </el-input>
+      </div>
+      <div class="line">
+        <span class="label">检定人员</span>
+        <el-input v-model="processNodeData.measurePerson" readonly class="process-input" size="small" :disabled="!personEdit || props.detail">
+          <template v-if="personEdit && !props.detail" #append>
+            <el-button :icon="Aim" size="small" link :disabled="processNodeData.measureSegment === ''" @click="choosePerson" />
+          </template>
+        </el-input>
+      </div>
+      <div class="line">
+        <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit || props.detail" /><span class="unit"> 份</span>
+      </div>
+      <div class="line">
+        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStatusName }}</span>
+      </div>
+      <div class="line">
+        <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
+      </div>
+    </div>
+    <!-- 选择实验室弹窗 -->
+    <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
+    <!-- 成员弹框 -->
+    <select-staff-dialog ref="_selectStaffDialog" v-model:visible="choosePersonShow" :data="[processNodeData.measurePersonId]" :dept-id="processNodeData.measureSegmentId" :dept-name="processNodeData.measureSegment" :multi="false" @change="choosePersonOver" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.process-node {
+  // display: inline-block;
+  margin-right: 10px;
+  width: 280px;
+  height: 215px;
+  border: 1px solid #e0e0e0;
+  padding: 5px 15px;
+  border-radius: 5px;
+  background-color: #fafafa;
+  margin-bottom: 10px;
+
+  .header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+    .step {
+      line-height: 28px;
+      font-size: 16px;
+      color: #3d7eff;
+      font-weight: bold;
+      margin-bottom: 5px;
+    }
+
+    .icon-button {
+      color: #999;
+      margin-left: 5px;
+      font-size: 16px;
+
+      &:hover {
+        cursor: pointer;
+      }
+    }
+  }
+
+  .line {
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 4px 0;
+
+    .label {
+      width: 80px;
+      font-size: 14px;
+    }
+
+    .process-input {
+      flex: 1;
+      font-size: 14px;
+    }
+
+    .unit {
+      margin-left: 5px;
+      font-size: 14px;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/lab/myMeasure/components/processNodeAdd.vue b/src/views/business/lab/myMeasure/components/processNodeAdd.vue
new file mode 100644
index 0000000..d7aeea0
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/processNodeAdd.vue
@@ -0,0 +1,46 @@
+<script lang="ts" setup name="ProcessNodeAdd">
+const emit = defineEmits(['click'])
+const add = () => {
+  emit('click')
+}
+</script>
+
+<template>
+  <div class="process-node" @click="add">
+    <div class="add">
+      <el-icon class="add-icon">
+        <plus />
+      </el-icon>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.process-node {
+  // display: inline-block;
+  width: 280px;
+  height: 215px;
+  border: 1px dashed #e0e0e0;
+  padding: 5px 15px;
+  border-radius: 5px;
+  background-color: #fbfbfb;
+
+  &:hover {
+    cursor: pointer;
+    background-color: #f5f5f5;
+  }
+
+  .add {
+    height: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    .add-icon {
+      vertical-align: middle;
+      font-size: 100px;
+      color: #999;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/lab/myMeasure/measureDetail.vue b/src/views/business/lab/myMeasure/measureDetail.vue
new file mode 100644
index 0000000..1a88be8
--- /dev/null
+++ b/src/views/business/lab/myMeasure/measureDetail.vue
@@ -0,0 +1,601 @@
+<!-- 任务分发 -->
+<script lang="ts" setup name="TaskEdit">
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance } from 'element-plus'
+import { ref } from 'vue'
+import ProcessConfig from './components/processConfig.vue'
+import type { ISampleMeasure, ITaskDetail } from './task-interface'
+import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { getTaskDetail } from '@/api/business/schedule/task'
+import countries from '@/components/AddressSelect/country-code.json'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+interface dictType {
+  id: string
+  name: string
+  value: string
+}
+const roleType = ref('distribute') // 角色类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员),
+const countryList = ref(countries) // 国家列表
+const loading = ref(false) // 表单加载状态
+const sampleId = ref('') // 样品详情id
+const orderId = ref('') // 委托书id
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const mesureTypeList = ref<dictType[]>([]) // 检定方式
+const $route = useRoute()
+
+// 获取字典值
+function getDict() {
+  // 获取样品属性
+  getDictByCode('measureCategory').then((response) => {
+    mesureCategoryList.value = response.data
+  })
+  // 获取样品属性
+  getDictByCode('measureType').then((response) => {
+    mesureTypeList.value = response.data
+  })
+}
+getDict()
+
+// 基本信息表单
+const sampleForm = ref<ISampleMeasure>({
+  id: '', // 样品id
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 样品型号
+  manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  phone: '', // 委托方电话
+  postalCode: '', // 委托方邮编
+  customerAddress: '', // 委托方地址
+  measureCategory: '', // 检校类别
+  manufacturer: '', // 生产厂家
+  manufacturerCountry: '', // 厂家国别
+  manufacturingDate: '', // 出厂年月
+  abc: '', // ABC
+  measurePeriod: '', // 检定周期
+  remark: '', // 备注
+  minioFileName: '', // 说明书
+  labelBind: '', // 标签绑定
+  measureType: '1', // 检定方式  1自检、2外包、3外检
+  measureTypeName: '', // 检定方式
+  measureLastTime: '', // 检定日期
+  validDeadline: '', // 有效日期
+  powerVoltage: '', // 电源电压
+  sampleBelong: '', // 样品所属
+  sampleBelongName: '', // 样品所属
+})
+const taskForm = ref <ITaskDetail> ({
+  measureContent: '', // 检定项目
+  specialRequire: '', // 客户特殊要求
+  orderId: '', // 委托单id
+  orderCode: '', // 委托单编号
+  certifications: '', // 证书类别
+  planDeliverTime: '', // 预约送达时间
+  requireOverTime: '', // 要求检完时间
+  measureProcessList: [], // 检定流程
+  measureSendBackList: [], // 退回信息
+  remark: '', // 备注
+  deliverer: '', // 送检人
+  delivererTel: '', // 送检人联系方式
+})
+const ruleFormRef = ref<FormInstance>()
+
+// 自定义校验规则--检定周期为正整数
+const validateMesurePeriod = (rule: any, value: any, callback: any) => {
+  if (value === '') {
+    callback()
+  }
+  else if (!(/(^[1-9]\d*$)/.test(value))) {
+    callback(new Error('请输入一个正整数'))
+  }
+  else {
+    callback()
+  }
+}
+
+// 校验规则
+const rules = ref({
+  mesurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
+}) // 表单验证规则
+
+// 其他关联数据列表
+const dataList = ref({
+  measureRecords: [] as SimpleMeasureRecord[],
+  certificationRecords: [] as SimpleCertification[],
+})
+
+// 获取检定记录
+const fetchMeasureRecords = function (query = null) {
+  dataList.value.measureRecords = []
+}
+// 获取检定证书
+const fetchCertifications = function (query = null) {
+  dataList.value.certificationRecords = []
+}
+interface Menu {
+  name: string
+  columns: TableColumn[]
+  pagination: boolean
+  list: 'measureRecords' | 'certificationRecords'
+  searchFunc: Function
+}
+// 菜单
+const menu: Menu[] = [
+  {
+    name: '检定记录',
+    columns: [
+      { text: '委托单编号', value: 'orderCode' },
+      { text: '委托单日期', value: 'orderTime' },
+      { text: '委托方代码', value: 'customerCode' },
+      { text: '委托方名称', value: 'customerName' },
+      { text: '送检人', value: 'deliverer' },
+      { text: '送检日期', value: 'deliverTime' },
+    ],
+    list: 'measureRecords',
+    pagination: true,
+    searchFunc: fetchMeasureRecords,
+  },
+  {
+    name: '检定证书',
+    columns: [
+      { text: '证书编号', value: 'certificationCode' },
+      { text: '证书名称', value: 'certificationName' },
+      { text: '证书类型', value: 'certificationType' },
+      { text: '证书出具日期', value: 'effectiveDate' },
+      { text: '证书有效期', value: 'expirationDate' },
+    ],
+    list: 'certificationRecords',
+    pagination: true,
+    searchFunc: fetchCertifications,
+  },
+]
+
+const currentMenu = ref('证书监控')
+const currentMenuObj = computed(() => {
+  return menu.find(item => item.name === currentMenu.value)
+})
+
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 打印表单
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '样品详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>样品详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+// 保存样品信息
+function saveForm(formEl: FormInstance | undefined) {
+  if (!formEl) { return }
+  formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认修改样品信息吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (sampleForm.value.id) {
+          updateSample(sampleForm.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+      })
+    }
+  })
+}
+// 获取详情
+const getSampleInfo = () => {
+  getSapmleDetail({ id: sampleId.value }).then((res) => {
+    sampleForm.value = res.data
+  })
+}
+// 获取分发详情
+const getInfo = () => {
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    taskForm.value.specialRequire = res.data.specialRequire // 客户特殊要求
+    taskForm.value.deliverer = res.data.deliverer // 送检人
+    taskForm.value.delivererTel = res.data.delivererTel // 送检人联系方式
+    taskForm.value.measureContent = res.data.measureContent // 检定项目
+    taskForm.value.measureProcessList = res.data.measureProcessList // 检定流程
+    taskForm.value.measureSendBackList = res.data.measureSendBackList // 退回流程
+    console.log('pppppp')
+    console.log(taskForm.value.measureProcessList)
+
+    // 改用一个接口获取
+    sampleForm.value = res.data
+  })
+}
+
+// 点击标签绑定的扫描
+const startScan = () => {
+  // TODO
+}
+
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
+}
+// 保存流程按钮点击
+const saveProcess = () => {
+  processConfigRef.value.saveProcess()
+}
+
+// 文件上传
+const fileRef = ref()
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    // UploadFile(fd).then((res) => {
+    //   if (res.code === 200) {
+    //     sampleForm.value.minioFileName = res.data[0]
+    //     // 重置当前验证
+    //     ElMessage.success('文件上传成功')
+    //   }
+    //   else {
+    //     ElMessage.error(res.message)
+    //   }
+    // })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+onMounted(() => {
+  console.log($route)
+  // 从路由中获取页面类型参数
+  if ($route.params && $route.params.role) {
+    roleType.value = $route.params.role as string // 使用角色
+  }
+  if ($route.params.id) {
+    sampleId.value = $route.params.id as string
+    orderId.value = $route.query.order as string
+    // 获取分发详情
+    getInfo()
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="样品详情">
+      <template #btns>
+        <el-button v-if="roleType === 'detail'" v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <!-- <el-button v-if="roleType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button> -->
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <div id="form">
+        <el-form
+          ref="ruleFormRef"
+          :model="sampleForm"
+          :label-width="120"
+          label-position="right"
+          :rules="rules"
+        >
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="样品编号:" prop="sampleNo">
+                <el-input
+                  v-model="sampleForm.sampleNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品名称:" prop="sampleName">
+                <el-input
+                  v-model="sampleForm.sampleName"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品型号:" prop="sampleModel">
+                <el-input
+                  v-model="sampleForm.sampleModel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂编号:" prop="manufacturingNo">
+                <el-input
+                  v-model="sampleForm.manufacturingNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方代码" prop="customerNo">
+                <el-input
+                  v-model="sampleForm.customerNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方名称" prop="customerName">
+                <el-input
+                  v-model="sampleForm.customerName"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方电话" prop="phone">
+                <el-input
+                  v-model="sampleForm.phone"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方电话'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方邮编" prop="postalCode">
+                <el-input
+                  v-model="sampleForm.postalCode"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方邮编'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="18">
+              <el-form-item label="委托方地址:" prop="companyAddress">
+                <el-input
+                  v-model="sampleForm.customerAddress"
+                  type="textarea"
+                  autosize
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方地址'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="校检类别:">
+                <el-select
+                  v-model="sampleForm.measureCategory"
+                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :disabled="roleType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="生产厂家:">
+                <el-input
+                  v-model="sampleForm.manufacturer"
+                  :placeholder="roleType === 'detail' ? '' : '请输入生产厂家'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="厂家国别:">
+                <el-select
+                  v-model="sampleForm.manufacturerCountry"
+                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :disabled="roleType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂年月:">
+                <el-date-picker
+                  v-model="sampleForm.manufacturingDate"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="roleType === 'detail' ? '' : '请输入出厂年月'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="ABC:">
+                <el-select
+                  v-model="sampleForm.abc"
+                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :disabled="roleType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="送检人:">
+                <el-input
+                  v-model="taskForm.deliverer"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="联系方式:">
+                <el-input
+                  v-model="taskForm.delivererTel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="检定项目:" prop="mesureContent">
+                <el-input
+                  v-model="taskForm.measureContent"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  disabled
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检定周期（月）:">
+                <el-input
+                  v-model="sampleForm.measurePeriod"
+                  :placeholder="roleType === 'detail' ? '' : '请输入检定周期'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="备注:">
+                <el-input
+                  v-model="sampleForm.remark"
+                  type="textarea"
+                  :rows="2"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  disabled
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检定方式:">
+                <el-select
+                  v-model="sampleForm.measureType"
+                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :disabled="roleType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of mesureTypeList" :key="item.value" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="标签绑定:">
+                <el-input
+                  v-model="sampleForm.labelBind"
+                  :placeholder="roleType === 'detail' ? '' : '标签绑定'"
+                  :disabled="roleType === 'detail'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                >
+                  <template v-if="roleType !== 'detail'" #append>
+                    <el-button>
+                      扫描
+                    </el-button>
+                  </template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="14">
+              <el-form-item label="说明书:">
+                <show-photo v-if="sampleForm.minioFileName" :minio-file-name="sampleForm.minioFileName" />
+                <span v-else-if="roleType === 'detail'">无</span>
+                <input v-show="roleType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="roleType !== 'detail'" id="file" type="primary" :disabled="roleType === 'detail'" :style="{ 'margin-left': sampleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ sampleForm.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </detail-page>
+    <detail-block v-if="taskForm.measureProcessList && taskForm.measureProcessList.length >= 1" title="检定流程">
+      <!-- <template #btns>
+        <el-button type="primary" style="margin-bottom: 10px;" @click="batchProcessAdd">
+          批量添加
+        </el-button>
+        <el-button type="primary" style="margin-bottom: 10px;" @click="saveProcess">
+          保存
+        </el-button>
+      </template> -->
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" :detail="true" />
+    </detail-block>
+    <!-- 退回流程 -->
+    <detail-block v-if="taskForm.measureSendBackList && taskForm.measureSendBackList.length >= 1" title="退回流程">
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureSendBackList" :sample-id="sampleId" :detail="true" />
+    </detail-block>
+    <!-- 检定记录、检定证书 -->
+    <detail-block-switch :title="currentMenu">
+      <template #menu>
+        <el-radio-group v-model="currentMenu">
+          <el-radio-button label="证书监控">
+            证书监控
+          </el-radio-button>
+          <el-radio-button label="检定记录">
+            检定记录
+          </el-radio-button>
+          <el-radio-button label="检定证书">
+            检定证书
+          </el-radio-button>
+        </el-radio-group>
+      </template>
+      <!-- 证书监控 -->
+      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" />
+      <!-- 检定记录 -->
+      <measure-records v-if="currentMenu === '检定记录'" :sample-id="sampleId" />
+      <!-- 证书记录 -->
+      <certification-records v-if="currentMenu === '检定证书'" :sample-id="sampleId" />
+    </detail-block-switch>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
+
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 62f8830..e4a4637 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -13,7 +13,6 @@
 import { getMyMeasureList, myExecutiveDone, myExecutiveReceive } from '@/api/business/schedule/task'
 import type { dictType } from '@/global'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
-
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
@@ -128,7 +127,7 @@
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`myMeasureDetail/detail/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
diff --git a/src/views/business/lab/myMeasure/task-interface.ts b/src/views/business/lab/myMeasure/task-interface.ts
new file mode 100644
index 0000000..6503a12
--- /dev/null
+++ b/src/views/business/lab/myMeasure/task-interface.ts
@@ -0,0 +1,169 @@
+// 任务列表查询条件
+export interface ITaskQuery {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  orderNo: string // 委托书编号
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  isUrgent: string // 是否加急
+  sampleBelong: string // 样品属性
+  sampleStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
+  limit: number
+  offset: number
+}
+
+// 我的检测/部门检测查询条件
+export interface ILabQuery {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  orderNo: string // 委托书编号
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  isUrgent: string // 是否加急
+  sampleBelong: string // 样品属性
+  measureStatus: string // 分发状态
+  startTime: string | number //	应检定开始时间
+  endTime: string | number //	应检定结束时间
+  limit: number
+  offset: number
+}
+// 任务列表-返回值
+export interface ITaskList {
+  orderId: string // 委托书编号
+  sampleId: string // 样品唯一标识
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderNo: string // 委托书编号
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  isUrgent: number // 是否加急
+  isUrgentName?: string // 是否加急
+  requireOverTime: string // 应检完时间
+  sampleBelong: string // 样品属性
+  sampleBelongName: string // 样品属性
+  currentMeasureState: string // 当前检定环节
+  currentMeasureStateName: string // 当前检定环节
+  alreadyCertifications: number // 已出具证书总数
+  requireCertifications: number // 应出具证书总数
+  distributeState: string // 分发性质-初次分发、退回分发
+  handOutProperty: string // 分发性质-初次分发、退回分发
+  id?: string // 实验室id
+}
+
+// 实验室检测/我的检测列表
+export interface IlabMeasureList extends ITaskList {
+  id: string // 实验室检测id
+  measurePersonId: string // 检测人id
+  measureSegmentId: string // 检测部门id
+  currentSegmentId: string // 检测部门id (新)
+}
+
+// 全部检测流程节点
+export interface ISchedule {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications: number // 应出具证书总数
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: string // 流程更新时间
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
+  distributePerson: string // 分配人
+  distributeTime: string // 分配时间
+  startTime: string // 检定开始时间
+  overTime: string // 检定完成时间
+}
+// 检测流程节点
+export interface IScheduleSet {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications: number // 应出具证书总数
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: string // 流程更新时间
+  measureSequence?: string // 检测顺序
+}
+// 退回流程节点
+export interface IScheduleBack {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications?: number // 应出具证书总数
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
+}
+
+// 样品检测信息
+export interface ISampleMeasure {
+  id: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  manufacturingNo: string // 出厂编号
+  customerNo: string // 委托方代码
+  customerId: string // 委托方id
+  customerName: string // 委托方名称
+  phone: string // 委托方电话
+  postalCode: string // 委托方邮编
+  customerAddress: string // 委托方地址
+  measureCategory: string // 检校类别
+  manufacturer: string // 生产厂家
+  manufacturerCountry: string // 厂家国别
+  manufacturingDate: string // 出厂年月
+  abc: string // ABC
+  measurePeriod: string // 检定周期
+  minioFileName: string // 说明书
+  labelBind: string // 标签绑定
+  measureType: string // 检定方式
+  measureTypeName: string // 检定方式
+  measureLastTime?: string // 检定日期
+  validDeadline: string // 有效日期
+  powerVoltage: string // 电源电压
+  sampleBelong: string // 样品所属
+  sampleBelongName: string // 样品所属
+  remark: string // 备注
+}
+
+export interface ITaskDetail {
+  measureContent: string // 检定项目
+  measureProcessList: ISchedule[] // 检定流程
+  measureSendBackList: ISchedule[] // 退回信息
+  remark: string // 备注
+  orderId: string // 委托单id
+  orderCode: string // 委托单编号
+  certifications: string // 证书类别
+  planDeliverTime: string // 预约送达时间
+  requireOverTime: string // 要求检完时间
+  specialRequire: string // 客户特殊要求
+  deliverer: string // 送检人
+  delivererTel: string // 送检人联系方式
+}
+
+// 退回
+export interface ISendBack {
+  id: string // 实验室检测id
+  measurePersonId: string // 检定人员id
+  measureSegmentId: string //	检定环节，实验室id
+  operateReason: string // 退回原因
+  orderId: string // 委托书id
+  sampleId: string //	样品id
+}

diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index b21ad07..cf4a5b9 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -260,6 +260,19 @@
         },
       },
       {
+        path: 'myMeasureDetail/:role/:id',
+        name: 'MyMeasureDetail',
+        component: () => import('@/views/business/lab/myMeasure/measureDetail.vue'),
+        meta: {
+          title: '我的检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          auth: '/lab/myMeasure',
+          activeMenu: '/lab/myMeasureList',
+        },
+      },
+      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -270,6 +283,19 @@
         },
       },
       {
+        path: 'myMeasureDetail/:role/:id',
+        name: 'MyMeasureDetail',
+        component: () => import('@/views/business/lab/myMeasure/measureDetail.vue'),
+        meta: {
+          title: '部门检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          auth: '/lab/deptMeasureList',
+          activeMenu: '/lab/deptMeasureList',
+        },
+      },
+      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 066f192..7a6ebea 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -102,8 +102,9 @@
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
-          localStorage.removeItem('name')
           localStorage.removeItem('token')
+          localStorage.removeItem('nameId')
+          localStorage.removeItem('depId')
           this.username = ''
           this.token = ''
           this.roleList = []
@@ -121,7 +122,8 @@
               this.roleList = res.data.roleIds
               this.roleNames = res.data.roleNames
               this.roleTips = res.data.roleTips
-              localStorage.setItem('name', res.data.name)
+              localStorage.setItem('nameId', res.data.id)
+              localStorage.setItem('depId', res.data.deptId)
             }
             else {
               reject('该用户无角色')
diff --git a/src/views/business/board/overdueReminder/detail.vue b/src/views/business/board/overdueReminder/detail.vue
index 92987d1..0239b71 100644
--- a/src/views/business/board/overdueReminder/detail.vue
+++ b/src/views/business/board/overdueReminder/detail.vue
@@ -5,7 +5,7 @@
 import { ref } from 'vue'
 import dayjs from 'dayjs'
 import ProcessConfig from '@/views/business/schedule/task/components/processConfig.vue'
-import type { ISampleMeasure, ITaskDetail } from '@/views/business/schedule/task/task-interface'
+import type { ISampleMeasure, ITaskDetail } from '@/views/business/schedule/task/task-interface.js'
 import type { Menu, SimpleCertification, SimpleMeasureRecord, dictType } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getTaskDetail } from '@/api/business/schedule/task'
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index d6cc168..05fd811 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -4,8 +4,8 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import DistributeDialog from '../../schedule/task/components/distributeDialog.vue'
 import RollbackDialog from './../components/rollbackDialog.vue'
-import DistributeDialog from './../components/distributeDialog.vue'
 import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
@@ -131,7 +131,8 @@
 const depId = ref('')
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
+  $router.push(`myMeasureDetail/detail/${row.sampleId}?order=${row.orderId}`)
+  // $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
diff --git a/src/views/business/lab/myMeasure/components/chooseLab.vue b/src/views/business/lab/myMeasure/components/chooseLab.vue
new file mode 100644
index 0000000..0dcebfc
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/chooseLab.vue
@@ -0,0 +1,203 @@
+<script setup lang="ts" name="ChooseLab">
+// 选择实验室
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { ILabList, ILabSearchQuery } from '@/views/business/schedule/task/components/lab-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getOrganizeList } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
+const emits = defineEmits(['confirmCheckout'])
+// 是否多选
+const multi = ref(false)
+const dialogVisible = ref(false)
+
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
+// 查询条件
+const listQuery = ref<ILabSearchQuery>({
+  organizeNo: '', // 实验室编号
+  organizeName: '', // 实验室名称
+  meterMajor: '', // 专业
+  organizeType: '3', // 组织类型
+  director: '', // 负责人
+  isLab: '1', // 是否是实验室
+  createStartTime: '',
+  createEndTime: '',
+})
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '实验室名称', value: 'organizeName', width: '160', align: 'center' },
+  // { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
+  { text: '负责人', value: 'director', align: 'center', width: '120' },
+  { text: '计量专业', value: 'meterMajorName', align: 'center' },
+  { text: '实验室能力', value: 'labCapacityName', align: 'center' },
+])
+// 表格数据
+const list = ref<ILabList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 多选的内容
+const checkoutList = ref<ILabList[]>([])
+// 单选
+const singleChecked = ref()
+// 数据查询
+function fetchData(isNowPage = false) {
+  getOrganizeList(listQuery.value).then((response) => {
+    list.value = response.data
+    total.value = parseInt(response.data.length)
+    loadingTable.value = false
+  })
+  loadingTable.value = false
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    organizeNo: '', // 实验室编号
+    organizeName: '', // 实验室名称
+    meterMajor: '', // 专业
+    organizeType: '3', // 组织类型
+    director: '', // 负责人
+    isLab: '1', // 是否是实验室
+    createStartTime: '',
+    createEndTime: '',
+  }
+}
+
+// 点击取消
+const cancle = () => {
+  dialogVisible.value = false
+}
+// 点击确定
+const clickConfirm = () => {
+  // 如果多选
+  if (multi.value) {
+    if (!checkoutList.value.length) {
+      ElMessage({
+        message: '请选择至少一个实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      emits('confirmCheckout', checkoutList.value)
+    }
+  }
+  else {
+    if (!singleChecked.value) {
+      ElMessage({
+        message: '请选择检定实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      const checkValue = list.value.find(item => item.id == singleChecked.value)
+      emits('confirmCheckout', checkValue)
+    }
+  }
+
+  cancle()
+}
+
+// 初始化弹窗
+const initDialog = (multiSelect: boolean) => {
+  multi.value = multiSelect
+  dialogVisible.value = true
+  fetchData()
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <div class="choose-lab-dialog">
+    <el-dialog v-model="dialogVisible" :title="`选择检定实验室${(checkoutList.length > 0 && multi) ? `(已选择${checkoutList.length}个实验室)` : ''}`" width="1000" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.organizeName"
+            placeholder="实验室名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-select
+            v-model.trim="listQuery.meterMajor"
+            clearable
+            placeholder="计量专业"
+          >
+            <el-option
+              v-for="item in measureMajorList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <div style="padding: 5px 10px;">
+        <normal-table
+          :data="list"
+          :total="total"
+          :columns="columns"
+          :query="listQuery"
+          :list-loading="loadingTable"
+          :pagination="false"
+          size="small"
+          @multi-select="handleSelectionChange"
+        >
+          <!-- :is-showmulti-select="multi" -->
+          <!-- :is-multi="multi" -->
+          <template v-if="!multi" #preColumns>
+            <el-table-column label="#" width="55" align="center" fixed="left">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="" width="40" align="center" fixed>
+              <template #default="scope">
+                <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </div>
+
+      <template #footer>
+        <el-button type="primary" @click="clickConfirm">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.choose-lab-dialog {
+  :deep(.el-radio__label) {
+    display: none;
+  }
+}
+</style>
diff --git a/src/views/business/lab/myMeasure/components/lab-interface.ts b/src/views/business/lab/myMeasure/components/lab-interface.ts
new file mode 100644
index 0000000..02b0d1d
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/lab-interface.ts
@@ -0,0 +1,29 @@
+// 查询参数类型
+export interface ILabSearchQuery {
+  organizeNo: string // 组织编号
+  organizeName: string // 名称
+  organizeType: string // 类型-3科室
+  isLab: '1' // 是否是实验室
+  director: string // 负责人
+  meterMajor: string // 专业
+  createStartTime: '' // 创建开始时间
+  createEndTime: '' // 创建结束事假
+}
+
+// 部门返回值对象类型
+export interface ILabList {
+  id: string
+  deptId: string // 部门id
+  director: string // 负责人名称
+  phone: string // 负责人电话
+  meterMajor: string // 计量专业
+  organizeNo: string // 实验室编号
+  organizeName: string // 实验室名称
+  measureItems: string // 全部检测能力
+  pDeptId: string // 所属部门
+  pDeptName: string // 所属部门
+  organizeType: string // 组织类型
+  remark?: string // 备注
+  createTime?: string // 创建时间
+  updateTime?: string // 更新时间
+}
diff --git a/src/views/business/lab/myMeasure/components/processConfig.vue b/src/views/business/lab/myMeasure/components/processConfig.vue
new file mode 100644
index 0000000..bb66076
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/processConfig.vue
@@ -0,0 +1,161 @@
+<script setup lang="ts" name="ProcessConfig">
+import { ref } from 'vue'
+import draggable from 'vuedraggable'
+import { ElMessage } from 'element-plus'
+import type { ISchedule, IScheduleSet } from '../task-interface'
+import ProcessNode from './processNode.vue'
+import ProcessNodeAdd from './processNodeAdd.vue'
+import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
+import { setMeasureProcess, setMeasureProcessByFfy } from '@/api/business/schedule/task'
+const props = defineProps({
+  type: {
+    type: String,
+    default: 'distribute',
+  }, // 类型，决定调用哪个接口
+  // 是否为详情展示页面
+  detail: {
+    type: Boolean,
+    default: false,
+  },
+  // 样品id
+  sampleId: {
+    type: String,
+    required: true,
+  },
+  // 委托单id
+  orderId: {
+    type: String,
+    required: true,
+  },
+  list: {
+    type: Array,
+    default: () => [],
+  },
+})
+const emits = defineEmits(['saveOver'])
+// 默认流程节点
+const defaultProcess: IScheduleSet = {
+  measurePersonId: '', // 执行人
+  measurePerson: '', // 执行人名称
+  measureSegmentId: '', // 执行部门
+  measureSegment: '', // 执行部门名称
+  executiveItem: '', // 检定项目
+  // alreadyCertifications: 0, // 已出具证书总数
+  requireCertifications: 1, // 应出具证书总数
+  measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: '', // 流程更新时间
+}
+// 检定流程列表
+const processList = ref<IScheduleSet[]>([
+  { ...defaultProcess },
+])
+
+watch(() => props.list, (val) => {
+  if (props.list.length > 0) {
+    processList.value = props.list as ISchedule[]
+  }
+},
+{ deep: true, immediate: true })
+
+// 点击添加流程
+const processAdd = () => {
+  processList.value.push({ ...defaultProcess })
+}
+// 检查是否允许移动
+const checkMove = (evt: any) => {
+  // 目的位置元素evt.relatedContext.element
+  // 当前拖动元素evt.draggedContext.element
+  if (evt.relatedContext.element.measureState !== '0') {
+    return false
+  }
+  return true
+}
+
+// 选择实验室弹窗
+const chooseLabDialog = ref()
+// 批量添加流程
+const batchProcessAdd = () => {
+  chooseLabDialog.value.initDialog(true)
+}
+
+// 批量添加实验室
+const batchChooseOver = (labs: ILabList[]) => {
+  for (const item of labs) {
+    const processTemp: IScheduleSet = {
+      measurePersonId: '', // 执行人
+      measurePerson: '', // 执行人名称
+      measureSegmentId: item.deptId, // 执行部门
+      measureSegment: item.organizeName, // 执行部门名称
+      executiveItem: '', // 检定项目
+      measureSequence: '', // 监测顺序
+      // alreadyCertifications: 0, // 已出具证书总数
+      requireCertifications: 1, // 应出具证书总数
+      measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      updateTime: '', // 流程更新时间
+    }
+    processList.value.push(processTemp)
+  }
+}
+
+// 保存流程
+const saveProcess = () => {
+  const form = {
+    measureProcessList: processList.value,
+    executiveList: processList.value,
+    orderId: props.orderId,
+    sampleId: props.sampleId,
+  }
+  // 处理顺序
+  for (const key in form.measureProcessList) {
+    form.measureProcessList[key].measureSequence = (parseInt(key) + 1).toString()
+  }
+  if (props.type == 'distribute') {
+    setMeasureProcess(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
+  else {
+    setMeasureProcessByFfy(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
+}
+// 删除流程
+const deleteProcess = (index: number) => {
+  processList.value.splice(index, 1)
+}
+
+// --------暴露方法
+defineExpose({ saveProcess, batchProcessAdd, deleteProcess })
+</script>
+
+<template>
+  <div>
+    <div class="process-container">
+      <draggable v-model="processList" item-key="id" class="process-draggable" handle=".handle" :move="checkMove">
+        <!-- eslint-disable-next-line vue/no-unused-vars -->
+        <template #item="{ process, index }">
+          <process-node v-model="processList[index]" :step="index + 1" :detail="props.detail" @delete="deleteProcess(index)" />
+        </template>
+        <template #footer>
+          <process-node-add v-if="!props.detail" @click="processAdd" />
+        </template>
+      </draggable>
+    </div>
+    <choose-lab ref="chooseLabDialog" @confirm-checkout="batchChooseOver" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.process-container {
+  .process-draggable {
+    display: flex;
+    flex-wrap: wrap;
+  }
+}
+</style>
diff --git a/src/views/business/lab/myMeasure/components/processNode.vue b/src/views/business/lab/myMeasure/components/processNode.vue
new file mode 100644
index 0000000..fad76ab
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/processNode.vue
@@ -0,0 +1,215 @@
+<script lang="ts" setup name="ProcessNode">
+import {
+  Aim, Rank, Remove,
+} from '@element-plus/icons-vue'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
+// 逻辑代码
+const props = defineProps({
+  // 默认数据
+  modelValue: {
+    type: Object,
+    default: () => {
+      return {
+        measurePersonId: '', // 执行人
+        measurePerson: '', // 执行人名称
+        measureSegmentId: '', // 执行部门
+        measureSegment: '', // 执行部门名称
+        executiveItem: '', // 检定项目
+        alreadyCertifications: 0, // 已出具证书总数
+        requireCertifications: 0, // 应出具证书总数
+        measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        updateTime: '', // 流程更新时间
+      }
+    },
+  },
+  // 是否为详情展示页面
+  detail: {
+    type: Boolean,
+    default: false,
+  },
+  // 步骤
+  step: {
+    type: Number,
+    default: 1,
+  },
+})
+const emit = defineEmits(['update:modelValue', 'delete'])
+
+// ------------定义props参数----------
+const processNodeData = computed({
+  get() {
+    return props.modelValue
+  },
+  set(value) {
+    emit('update:modelValue', value)
+  },
+})
+// 检定环节可编辑-只有待分发状态可编辑
+const deptEdit = computed(() => {
+  const editStates = ['']
+  return editStates.includes(processNodeData.value.measureStatus)
+})
+// 检定人可编辑-待分配状态可编辑
+const personEdit = computed(() => {
+  const editStates = ['', '1', '2']
+  return editStates.includes(processNodeData.value.measureStatus)
+})
+// 证书可编辑-待分发、待分配、待检测状态可编辑
+const certificationEdit = computed(() => {
+  const editStates = ['', '1', '2', '3']
+  return editStates.includes(processNodeData.value.measureStatus)
+})
+// 节点可移动
+const canMove = computed(() => {
+  const editStates = ['', '1']
+  return editStates.includes(processNodeData.value.measureStatus)
+})
+
+// 选择人员
+const choosePersonShow = ref(false)
+const choosePerson = () => {
+  choosePersonShow.value = true
+}
+// 人员选择完毕
+const choosePersonOver = (person: { id: string; name: string }) => {
+  processNodeData.value.measurePersonId = person.id
+  processNodeData.value.measurePerson = person.name
+  choosePersonShow.value = false
+}
+
+// 选择实验室
+const chooseLabDialog = ref()
+const clickChoose = () => {
+  chooseLabDialog.value.initDialog(false)
+}
+const _selectStaffDialog = ref()
+// 实验室选择完毕
+const chooseOver = (lab: ILabList) => {
+  console.log(lab)
+  processNodeData.value.measureSegmentId = lab.deptId
+  processNodeData.value.measureSegment = lab.organizeName
+  // 定义一个对象关联上子组件的 ref 值（注意：这里的属性名必须跟子组件定义的 ref 值一模一样，否者会关联失效）
+  // 延迟使用，因为还没挂载
+  nextTick(() => {
+    _selectStaffDialog.value.fetchData()
+  })
+}
+
+// 移除该节点
+const deleteNode = () => {
+  emit('delete')
+}
+</script>
+
+<template>
+  <div class="process-node">
+    <div class="header">
+      <div class="step">
+        {{ props.step }}
+      </div>
+      <div class="buttons">
+        <el-icon v-show="canMove && !props.detail" class="icon-button" title="移除" @click="deleteNode">
+          <remove />
+        </el-icon>
+        <el-icon v-show="canMove && !props.detail" class="icon-button handle" title="移动">
+          <rank />
+        </el-icon>
+      </div>
+    </div>
+    <div>
+      <div class="line">
+        <span class="label">检定环节</span>
+        <el-input v-model="processNodeData.measureSegment" class="process-input" readonly size="small" :disabled="!deptEdit || props.detail">
+          <template v-if="deptEdit && !props.detail" #append>
+            <el-button :icon="Aim" size="small" link @click="clickChoose" />
+          </template>
+        </el-input>
+      </div>
+      <div class="line">
+        <span class="label">检定人员</span>
+        <el-input v-model="processNodeData.measurePerson" readonly class="process-input" size="small" :disabled="!personEdit || props.detail">
+          <template v-if="personEdit && !props.detail" #append>
+            <el-button :icon="Aim" size="small" link :disabled="processNodeData.measureSegment === ''" @click="choosePerson" />
+          </template>
+        </el-input>
+      </div>
+      <div class="line">
+        <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit || props.detail" /><span class="unit"> 份</span>
+      </div>
+      <div class="line">
+        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStatusName }}</span>
+      </div>
+      <div class="line">
+        <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
+      </div>
+    </div>
+    <!-- 选择实验室弹窗 -->
+    <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
+    <!-- 成员弹框 -->
+    <select-staff-dialog ref="_selectStaffDialog" v-model:visible="choosePersonShow" :data="[processNodeData.measurePersonId]" :dept-id="processNodeData.measureSegmentId" :dept-name="processNodeData.measureSegment" :multi="false" @change="choosePersonOver" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.process-node {
+  // display: inline-block;
+  margin-right: 10px;
+  width: 280px;
+  height: 215px;
+  border: 1px solid #e0e0e0;
+  padding: 5px 15px;
+  border-radius: 5px;
+  background-color: #fafafa;
+  margin-bottom: 10px;
+
+  .header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+    .step {
+      line-height: 28px;
+      font-size: 16px;
+      color: #3d7eff;
+      font-weight: bold;
+      margin-bottom: 5px;
+    }
+
+    .icon-button {
+      color: #999;
+      margin-left: 5px;
+      font-size: 16px;
+
+      &:hover {
+        cursor: pointer;
+      }
+    }
+  }
+
+  .line {
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 4px 0;
+
+    .label {
+      width: 80px;
+      font-size: 14px;
+    }
+
+    .process-input {
+      flex: 1;
+      font-size: 14px;
+    }
+
+    .unit {
+      margin-left: 5px;
+      font-size: 14px;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/lab/myMeasure/components/processNodeAdd.vue b/src/views/business/lab/myMeasure/components/processNodeAdd.vue
new file mode 100644
index 0000000..d7aeea0
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/processNodeAdd.vue
@@ -0,0 +1,46 @@
+<script lang="ts" setup name="ProcessNodeAdd">
+const emit = defineEmits(['click'])
+const add = () => {
+  emit('click')
+}
+</script>
+
+<template>
+  <div class="process-node" @click="add">
+    <div class="add">
+      <el-icon class="add-icon">
+        <plus />
+      </el-icon>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.process-node {
+  // display: inline-block;
+  width: 280px;
+  height: 215px;
+  border: 1px dashed #e0e0e0;
+  padding: 5px 15px;
+  border-radius: 5px;
+  background-color: #fbfbfb;
+
+  &:hover {
+    cursor: pointer;
+    background-color: #f5f5f5;
+  }
+
+  .add {
+    height: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    .add-icon {
+      vertical-align: middle;
+      font-size: 100px;
+      color: #999;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/lab/myMeasure/measureDetail.vue b/src/views/business/lab/myMeasure/measureDetail.vue
new file mode 100644
index 0000000..1a88be8
--- /dev/null
+++ b/src/views/business/lab/myMeasure/measureDetail.vue
@@ -0,0 +1,601 @@
+<!-- 任务分发 -->
+<script lang="ts" setup name="TaskEdit">
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance } from 'element-plus'
+import { ref } from 'vue'
+import ProcessConfig from './components/processConfig.vue'
+import type { ISampleMeasure, ITaskDetail } from './task-interface'
+import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { getTaskDetail } from '@/api/business/schedule/task'
+import countries from '@/components/AddressSelect/country-code.json'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+interface dictType {
+  id: string
+  name: string
+  value: string
+}
+const roleType = ref('distribute') // 角色类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员),
+const countryList = ref(countries) // 国家列表
+const loading = ref(false) // 表单加载状态
+const sampleId = ref('') // 样品详情id
+const orderId = ref('') // 委托书id
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const mesureTypeList = ref<dictType[]>([]) // 检定方式
+const $route = useRoute()
+
+// 获取字典值
+function getDict() {
+  // 获取样品属性
+  getDictByCode('measureCategory').then((response) => {
+    mesureCategoryList.value = response.data
+  })
+  // 获取样品属性
+  getDictByCode('measureType').then((response) => {
+    mesureTypeList.value = response.data
+  })
+}
+getDict()
+
+// 基本信息表单
+const sampleForm = ref<ISampleMeasure>({
+  id: '', // 样品id
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 样品型号
+  manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  phone: '', // 委托方电话
+  postalCode: '', // 委托方邮编
+  customerAddress: '', // 委托方地址
+  measureCategory: '', // 检校类别
+  manufacturer: '', // 生产厂家
+  manufacturerCountry: '', // 厂家国别
+  manufacturingDate: '', // 出厂年月
+  abc: '', // ABC
+  measurePeriod: '', // 检定周期
+  remark: '', // 备注
+  minioFileName: '', // 说明书
+  labelBind: '', // 标签绑定
+  measureType: '1', // 检定方式  1自检、2外包、3外检
+  measureTypeName: '', // 检定方式
+  measureLastTime: '', // 检定日期
+  validDeadline: '', // 有效日期
+  powerVoltage: '', // 电源电压
+  sampleBelong: '', // 样品所属
+  sampleBelongName: '', // 样品所属
+})
+const taskForm = ref <ITaskDetail> ({
+  measureContent: '', // 检定项目
+  specialRequire: '', // 客户特殊要求
+  orderId: '', // 委托单id
+  orderCode: '', // 委托单编号
+  certifications: '', // 证书类别
+  planDeliverTime: '', // 预约送达时间
+  requireOverTime: '', // 要求检完时间
+  measureProcessList: [], // 检定流程
+  measureSendBackList: [], // 退回信息
+  remark: '', // 备注
+  deliverer: '', // 送检人
+  delivererTel: '', // 送检人联系方式
+})
+const ruleFormRef = ref<FormInstance>()
+
+// 自定义校验规则--检定周期为正整数
+const validateMesurePeriod = (rule: any, value: any, callback: any) => {
+  if (value === '') {
+    callback()
+  }
+  else if (!(/(^[1-9]\d*$)/.test(value))) {
+    callback(new Error('请输入一个正整数'))
+  }
+  else {
+    callback()
+  }
+}
+
+// 校验规则
+const rules = ref({
+  mesurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
+}) // 表单验证规则
+
+// 其他关联数据列表
+const dataList = ref({
+  measureRecords: [] as SimpleMeasureRecord[],
+  certificationRecords: [] as SimpleCertification[],
+})
+
+// 获取检定记录
+const fetchMeasureRecords = function (query = null) {
+  dataList.value.measureRecords = []
+}
+// 获取检定证书
+const fetchCertifications = function (query = null) {
+  dataList.value.certificationRecords = []
+}
+interface Menu {
+  name: string
+  columns: TableColumn[]
+  pagination: boolean
+  list: 'measureRecords' | 'certificationRecords'
+  searchFunc: Function
+}
+// 菜单
+const menu: Menu[] = [
+  {
+    name: '检定记录',
+    columns: [
+      { text: '委托单编号', value: 'orderCode' },
+      { text: '委托单日期', value: 'orderTime' },
+      { text: '委托方代码', value: 'customerCode' },
+      { text: '委托方名称', value: 'customerName' },
+      { text: '送检人', value: 'deliverer' },
+      { text: '送检日期', value: 'deliverTime' },
+    ],
+    list: 'measureRecords',
+    pagination: true,
+    searchFunc: fetchMeasureRecords,
+  },
+  {
+    name: '检定证书',
+    columns: [
+      { text: '证书编号', value: 'certificationCode' },
+      { text: '证书名称', value: 'certificationName' },
+      { text: '证书类型', value: 'certificationType' },
+      { text: '证书出具日期', value: 'effectiveDate' },
+      { text: '证书有效期', value: 'expirationDate' },
+    ],
+    list: 'certificationRecords',
+    pagination: true,
+    searchFunc: fetchCertifications,
+  },
+]
+
+const currentMenu = ref('证书监控')
+const currentMenuObj = computed(() => {
+  return menu.find(item => item.name === currentMenu.value)
+})
+
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 打印表单
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '样品详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>样品详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+// 保存样品信息
+function saveForm(formEl: FormInstance | undefined) {
+  if (!formEl) { return }
+  formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认修改样品信息吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (sampleForm.value.id) {
+          updateSample(sampleForm.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+      })
+    }
+  })
+}
+// 获取详情
+const getSampleInfo = () => {
+  getSapmleDetail({ id: sampleId.value }).then((res) => {
+    sampleForm.value = res.data
+  })
+}
+// 获取分发详情
+const getInfo = () => {
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    taskForm.value.specialRequire = res.data.specialRequire // 客户特殊要求
+    taskForm.value.deliverer = res.data.deliverer // 送检人
+    taskForm.value.delivererTel = res.data.delivererTel // 送检人联系方式
+    taskForm.value.measureContent = res.data.measureContent // 检定项目
+    taskForm.value.measureProcessList = res.data.measureProcessList // 检定流程
+    taskForm.value.measureSendBackList = res.data.measureSendBackList // 退回流程
+    console.log('pppppp')
+    console.log(taskForm.value.measureProcessList)
+
+    // 改用一个接口获取
+    sampleForm.value = res.data
+  })
+}
+
+// 点击标签绑定的扫描
+const startScan = () => {
+  // TODO
+}
+
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
+}
+// 保存流程按钮点击
+const saveProcess = () => {
+  processConfigRef.value.saveProcess()
+}
+
+// 文件上传
+const fileRef = ref()
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    // UploadFile(fd).then((res) => {
+    //   if (res.code === 200) {
+    //     sampleForm.value.minioFileName = res.data[0]
+    //     // 重置当前验证
+    //     ElMessage.success('文件上传成功')
+    //   }
+    //   else {
+    //     ElMessage.error(res.message)
+    //   }
+    // })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+onMounted(() => {
+  console.log($route)
+  // 从路由中获取页面类型参数
+  if ($route.params && $route.params.role) {
+    roleType.value = $route.params.role as string // 使用角色
+  }
+  if ($route.params.id) {
+    sampleId.value = $route.params.id as string
+    orderId.value = $route.query.order as string
+    // 获取分发详情
+    getInfo()
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="样品详情">
+      <template #btns>
+        <el-button v-if="roleType === 'detail'" v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <!-- <el-button v-if="roleType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button> -->
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <div id="form">
+        <el-form
+          ref="ruleFormRef"
+          :model="sampleForm"
+          :label-width="120"
+          label-position="right"
+          :rules="rules"
+        >
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="样品编号:" prop="sampleNo">
+                <el-input
+                  v-model="sampleForm.sampleNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品名称:" prop="sampleName">
+                <el-input
+                  v-model="sampleForm.sampleName"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品型号:" prop="sampleModel">
+                <el-input
+                  v-model="sampleForm.sampleModel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂编号:" prop="manufacturingNo">
+                <el-input
+                  v-model="sampleForm.manufacturingNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方代码" prop="customerNo">
+                <el-input
+                  v-model="sampleForm.customerNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方名称" prop="customerName">
+                <el-input
+                  v-model="sampleForm.customerName"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方电话" prop="phone">
+                <el-input
+                  v-model="sampleForm.phone"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方电话'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方邮编" prop="postalCode">
+                <el-input
+                  v-model="sampleForm.postalCode"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方邮编'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="18">
+              <el-form-item label="委托方地址:" prop="companyAddress">
+                <el-input
+                  v-model="sampleForm.customerAddress"
+                  type="textarea"
+                  autosize
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方地址'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="校检类别:">
+                <el-select
+                  v-model="sampleForm.measureCategory"
+                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :disabled="roleType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="生产厂家:">
+                <el-input
+                  v-model="sampleForm.manufacturer"
+                  :placeholder="roleType === 'detail' ? '' : '请输入生产厂家'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="厂家国别:">
+                <el-select
+                  v-model="sampleForm.manufacturerCountry"
+                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :disabled="roleType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂年月:">
+                <el-date-picker
+                  v-model="sampleForm.manufacturingDate"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="roleType === 'detail' ? '' : '请输入出厂年月'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="ABC:">
+                <el-select
+                  v-model="sampleForm.abc"
+                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :disabled="roleType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="送检人:">
+                <el-input
+                  v-model="taskForm.deliverer"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="联系方式:">
+                <el-input
+                  v-model="taskForm.delivererTel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="检定项目:" prop="mesureContent">
+                <el-input
+                  v-model="taskForm.measureContent"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  disabled
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检定周期（月）:">
+                <el-input
+                  v-model="sampleForm.measurePeriod"
+                  :placeholder="roleType === 'detail' ? '' : '请输入检定周期'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="备注:">
+                <el-input
+                  v-model="sampleForm.remark"
+                  type="textarea"
+                  :rows="2"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  disabled
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检定方式:">
+                <el-select
+                  v-model="sampleForm.measureType"
+                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :disabled="roleType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of mesureTypeList" :key="item.value" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="标签绑定:">
+                <el-input
+                  v-model="sampleForm.labelBind"
+                  :placeholder="roleType === 'detail' ? '' : '标签绑定'"
+                  :disabled="roleType === 'detail'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                >
+                  <template v-if="roleType !== 'detail'" #append>
+                    <el-button>
+                      扫描
+                    </el-button>
+                  </template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="14">
+              <el-form-item label="说明书:">
+                <show-photo v-if="sampleForm.minioFileName" :minio-file-name="sampleForm.minioFileName" />
+                <span v-else-if="roleType === 'detail'">无</span>
+                <input v-show="roleType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="roleType !== 'detail'" id="file" type="primary" :disabled="roleType === 'detail'" :style="{ 'margin-left': sampleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ sampleForm.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </detail-page>
+    <detail-block v-if="taskForm.measureProcessList && taskForm.measureProcessList.length >= 1" title="检定流程">
+      <!-- <template #btns>
+        <el-button type="primary" style="margin-bottom: 10px;" @click="batchProcessAdd">
+          批量添加
+        </el-button>
+        <el-button type="primary" style="margin-bottom: 10px;" @click="saveProcess">
+          保存
+        </el-button>
+      </template> -->
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" :detail="true" />
+    </detail-block>
+    <!-- 退回流程 -->
+    <detail-block v-if="taskForm.measureSendBackList && taskForm.measureSendBackList.length >= 1" title="退回流程">
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureSendBackList" :sample-id="sampleId" :detail="true" />
+    </detail-block>
+    <!-- 检定记录、检定证书 -->
+    <detail-block-switch :title="currentMenu">
+      <template #menu>
+        <el-radio-group v-model="currentMenu">
+          <el-radio-button label="证书监控">
+            证书监控
+          </el-radio-button>
+          <el-radio-button label="检定记录">
+            检定记录
+          </el-radio-button>
+          <el-radio-button label="检定证书">
+            检定证书
+          </el-radio-button>
+        </el-radio-group>
+      </template>
+      <!-- 证书监控 -->
+      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" />
+      <!-- 检定记录 -->
+      <measure-records v-if="currentMenu === '检定记录'" :sample-id="sampleId" />
+      <!-- 证书记录 -->
+      <certification-records v-if="currentMenu === '检定证书'" :sample-id="sampleId" />
+    </detail-block-switch>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
+
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 62f8830..e4a4637 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -13,7 +13,6 @@
 import { getMyMeasureList, myExecutiveDone, myExecutiveReceive } from '@/api/business/schedule/task'
 import type { dictType } from '@/global'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
-
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
@@ -128,7 +127,7 @@
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`myMeasureDetail/detail/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
diff --git a/src/views/business/lab/myMeasure/task-interface.ts b/src/views/business/lab/myMeasure/task-interface.ts
new file mode 100644
index 0000000..6503a12
--- /dev/null
+++ b/src/views/business/lab/myMeasure/task-interface.ts
@@ -0,0 +1,169 @@
+// 任务列表查询条件
+export interface ITaskQuery {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  orderNo: string // 委托书编号
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  isUrgent: string // 是否加急
+  sampleBelong: string // 样品属性
+  sampleStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
+  limit: number
+  offset: number
+}
+
+// 我的检测/部门检测查询条件
+export interface ILabQuery {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  orderNo: string // 委托书编号
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  isUrgent: string // 是否加急
+  sampleBelong: string // 样品属性
+  measureStatus: string // 分发状态
+  startTime: string | number //	应检定开始时间
+  endTime: string | number //	应检定结束时间
+  limit: number
+  offset: number
+}
+// 任务列表-返回值
+export interface ITaskList {
+  orderId: string // 委托书编号
+  sampleId: string // 样品唯一标识
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderNo: string // 委托书编号
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  isUrgent: number // 是否加急
+  isUrgentName?: string // 是否加急
+  requireOverTime: string // 应检完时间
+  sampleBelong: string // 样品属性
+  sampleBelongName: string // 样品属性
+  currentMeasureState: string // 当前检定环节
+  currentMeasureStateName: string // 当前检定环节
+  alreadyCertifications: number // 已出具证书总数
+  requireCertifications: number // 应出具证书总数
+  distributeState: string // 分发性质-初次分发、退回分发
+  handOutProperty: string // 分发性质-初次分发、退回分发
+  id?: string // 实验室id
+}
+
+// 实验室检测/我的检测列表
+export interface IlabMeasureList extends ITaskList {
+  id: string // 实验室检测id
+  measurePersonId: string // 检测人id
+  measureSegmentId: string // 检测部门id
+  currentSegmentId: string // 检测部门id (新)
+}
+
+// 全部检测流程节点
+export interface ISchedule {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications: number // 应出具证书总数
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: string // 流程更新时间
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
+  distributePerson: string // 分配人
+  distributeTime: string // 分配时间
+  startTime: string // 检定开始时间
+  overTime: string // 检定完成时间
+}
+// 检测流程节点
+export interface IScheduleSet {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications: number // 应出具证书总数
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: string // 流程更新时间
+  measureSequence?: string // 检测顺序
+}
+// 退回流程节点
+export interface IScheduleBack {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications?: number // 应出具证书总数
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
+}
+
+// 样品检测信息
+export interface ISampleMeasure {
+  id: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  manufacturingNo: string // 出厂编号
+  customerNo: string // 委托方代码
+  customerId: string // 委托方id
+  customerName: string // 委托方名称
+  phone: string // 委托方电话
+  postalCode: string // 委托方邮编
+  customerAddress: string // 委托方地址
+  measureCategory: string // 检校类别
+  manufacturer: string // 生产厂家
+  manufacturerCountry: string // 厂家国别
+  manufacturingDate: string // 出厂年月
+  abc: string // ABC
+  measurePeriod: string // 检定周期
+  minioFileName: string // 说明书
+  labelBind: string // 标签绑定
+  measureType: string // 检定方式
+  measureTypeName: string // 检定方式
+  measureLastTime?: string // 检定日期
+  validDeadline: string // 有效日期
+  powerVoltage: string // 电源电压
+  sampleBelong: string // 样品所属
+  sampleBelongName: string // 样品所属
+  remark: string // 备注
+}
+
+export interface ITaskDetail {
+  measureContent: string // 检定项目
+  measureProcessList: ISchedule[] // 检定流程
+  measureSendBackList: ISchedule[] // 退回信息
+  remark: string // 备注
+  orderId: string // 委托单id
+  orderCode: string // 委托单编号
+  certifications: string // 证书类别
+  planDeliverTime: string // 预约送达时间
+  requireOverTime: string // 要求检完时间
+  specialRequire: string // 客户特殊要求
+  deliverer: string // 送检人
+  delivererTel: string // 送检人联系方式
+}
+
+// 退回
+export interface ISendBack {
+  id: string // 实验室检测id
+  measurePersonId: string // 检定人员id
+  measureSegmentId: string //	检定环节，实验室id
+  operateReason: string // 退回原因
+  orderId: string // 委托书id
+  sampleId: string //	样品id
+}
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index 0efec98..99a6852 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -141,7 +141,6 @@
 // 点击详情
 const handleDetail = (row: ITaskList) => {
   console.log('跳转任务分发详情')
-
   $router.push(`/schedule/task/distribute/${row.sampleId}?order=${row.orderId}`)
 }
 

diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index b21ad07..cf4a5b9 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -260,6 +260,19 @@
         },
       },
       {
+        path: 'myMeasureDetail/:role/:id',
+        name: 'MyMeasureDetail',
+        component: () => import('@/views/business/lab/myMeasure/measureDetail.vue'),
+        meta: {
+          title: '我的检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          auth: '/lab/myMeasure',
+          activeMenu: '/lab/myMeasureList',
+        },
+      },
+      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -270,6 +283,19 @@
         },
       },
       {
+        path: 'myMeasureDetail/:role/:id',
+        name: 'MyMeasureDetail',
+        component: () => import('@/views/business/lab/myMeasure/measureDetail.vue'),
+        meta: {
+          title: '部门检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          auth: '/lab/deptMeasureList',
+          activeMenu: '/lab/deptMeasureList',
+        },
+      },
+      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 066f192..7a6ebea 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -102,8 +102,9 @@
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
-          localStorage.removeItem('name')
           localStorage.removeItem('token')
+          localStorage.removeItem('nameId')
+          localStorage.removeItem('depId')
           this.username = ''
           this.token = ''
           this.roleList = []
@@ -121,7 +122,8 @@
               this.roleList = res.data.roleIds
               this.roleNames = res.data.roleNames
               this.roleTips = res.data.roleTips
-              localStorage.setItem('name', res.data.name)
+              localStorage.setItem('nameId', res.data.id)
+              localStorage.setItem('depId', res.data.deptId)
             }
             else {
               reject('该用户无角色')
diff --git a/src/views/business/board/overdueReminder/detail.vue b/src/views/business/board/overdueReminder/detail.vue
index 92987d1..0239b71 100644
--- a/src/views/business/board/overdueReminder/detail.vue
+++ b/src/views/business/board/overdueReminder/detail.vue
@@ -5,7 +5,7 @@
 import { ref } from 'vue'
 import dayjs from 'dayjs'
 import ProcessConfig from '@/views/business/schedule/task/components/processConfig.vue'
-import type { ISampleMeasure, ITaskDetail } from '@/views/business/schedule/task/task-interface'
+import type { ISampleMeasure, ITaskDetail } from '@/views/business/schedule/task/task-interface.js'
 import type { Menu, SimpleCertification, SimpleMeasureRecord, dictType } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getTaskDetail } from '@/api/business/schedule/task'
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index d6cc168..05fd811 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -4,8 +4,8 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import DistributeDialog from '../../schedule/task/components/distributeDialog.vue'
 import RollbackDialog from './../components/rollbackDialog.vue'
-import DistributeDialog from './../components/distributeDialog.vue'
 import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
@@ -131,7 +131,8 @@
 const depId = ref('')
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
+  $router.push(`myMeasureDetail/detail/${row.sampleId}?order=${row.orderId}`)
+  // $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
diff --git a/src/views/business/lab/myMeasure/components/chooseLab.vue b/src/views/business/lab/myMeasure/components/chooseLab.vue
new file mode 100644
index 0000000..0dcebfc
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/chooseLab.vue
@@ -0,0 +1,203 @@
+<script setup lang="ts" name="ChooseLab">
+// 选择实验室
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { ILabList, ILabSearchQuery } from '@/views/business/schedule/task/components/lab-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getOrganizeList } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
+const emits = defineEmits(['confirmCheckout'])
+// 是否多选
+const multi = ref(false)
+const dialogVisible = ref(false)
+
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
+// 查询条件
+const listQuery = ref<ILabSearchQuery>({
+  organizeNo: '', // 实验室编号
+  organizeName: '', // 实验室名称
+  meterMajor: '', // 专业
+  organizeType: '3', // 组织类型
+  director: '', // 负责人
+  isLab: '1', // 是否是实验室
+  createStartTime: '',
+  createEndTime: '',
+})
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '实验室名称', value: 'organizeName', width: '160', align: 'center' },
+  // { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
+  { text: '负责人', value: 'director', align: 'center', width: '120' },
+  { text: '计量专业', value: 'meterMajorName', align: 'center' },
+  { text: '实验室能力', value: 'labCapacityName', align: 'center' },
+])
+// 表格数据
+const list = ref<ILabList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 多选的内容
+const checkoutList = ref<ILabList[]>([])
+// 单选
+const singleChecked = ref()
+// 数据查询
+function fetchData(isNowPage = false) {
+  getOrganizeList(listQuery.value).then((response) => {
+    list.value = response.data
+    total.value = parseInt(response.data.length)
+    loadingTable.value = false
+  })
+  loadingTable.value = false
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    organizeNo: '', // 实验室编号
+    organizeName: '', // 实验室名称
+    meterMajor: '', // 专业
+    organizeType: '3', // 组织类型
+    director: '', // 负责人
+    isLab: '1', // 是否是实验室
+    createStartTime: '',
+    createEndTime: '',
+  }
+}
+
+// 点击取消
+const cancle = () => {
+  dialogVisible.value = false
+}
+// 点击确定
+const clickConfirm = () => {
+  // 如果多选
+  if (multi.value) {
+    if (!checkoutList.value.length) {
+      ElMessage({
+        message: '请选择至少一个实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      emits('confirmCheckout', checkoutList.value)
+    }
+  }
+  else {
+    if (!singleChecked.value) {
+      ElMessage({
+        message: '请选择检定实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      const checkValue = list.value.find(item => item.id == singleChecked.value)
+      emits('confirmCheckout', checkValue)
+    }
+  }
+
+  cancle()
+}
+
+// 初始化弹窗
+const initDialog = (multiSelect: boolean) => {
+  multi.value = multiSelect
+  dialogVisible.value = true
+  fetchData()
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <div class="choose-lab-dialog">
+    <el-dialog v-model="dialogVisible" :title="`选择检定实验室${(checkoutList.length > 0 && multi) ? `(已选择${checkoutList.length}个实验室)` : ''}`" width="1000" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.organizeName"
+            placeholder="实验室名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-select
+            v-model.trim="listQuery.meterMajor"
+            clearable
+            placeholder="计量专业"
+          >
+            <el-option
+              v-for="item in measureMajorList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <div style="padding: 5px 10px;">
+        <normal-table
+          :data="list"
+          :total="total"
+          :columns="columns"
+          :query="listQuery"
+          :list-loading="loadingTable"
+          :pagination="false"
+          size="small"
+          @multi-select="handleSelectionChange"
+        >
+          <!-- :is-showmulti-select="multi" -->
+          <!-- :is-multi="multi" -->
+          <template v-if="!multi" #preColumns>
+            <el-table-column label="#" width="55" align="center" fixed="left">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="" width="40" align="center" fixed>
+              <template #default="scope">
+                <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </div>
+
+      <template #footer>
+        <el-button type="primary" @click="clickConfirm">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.choose-lab-dialog {
+  :deep(.el-radio__label) {
+    display: none;
+  }
+}
+</style>
diff --git a/src/views/business/lab/myMeasure/components/lab-interface.ts b/src/views/business/lab/myMeasure/components/lab-interface.ts
new file mode 100644
index 0000000..02b0d1d
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/lab-interface.ts
@@ -0,0 +1,29 @@
+// 查询参数类型
+export interface ILabSearchQuery {
+  organizeNo: string // 组织编号
+  organizeName: string // 名称
+  organizeType: string // 类型-3科室
+  isLab: '1' // 是否是实验室
+  director: string // 负责人
+  meterMajor: string // 专业
+  createStartTime: '' // 创建开始时间
+  createEndTime: '' // 创建结束事假
+}
+
+// 部门返回值对象类型
+export interface ILabList {
+  id: string
+  deptId: string // 部门id
+  director: string // 负责人名称
+  phone: string // 负责人电话
+  meterMajor: string // 计量专业
+  organizeNo: string // 实验室编号
+  organizeName: string // 实验室名称
+  measureItems: string // 全部检测能力
+  pDeptId: string // 所属部门
+  pDeptName: string // 所属部门
+  organizeType: string // 组织类型
+  remark?: string // 备注
+  createTime?: string // 创建时间
+  updateTime?: string // 更新时间
+}
diff --git a/src/views/business/lab/myMeasure/components/processConfig.vue b/src/views/business/lab/myMeasure/components/processConfig.vue
new file mode 100644
index 0000000..bb66076
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/processConfig.vue
@@ -0,0 +1,161 @@
+<script setup lang="ts" name="ProcessConfig">
+import { ref } from 'vue'
+import draggable from 'vuedraggable'
+import { ElMessage } from 'element-plus'
+import type { ISchedule, IScheduleSet } from '../task-interface'
+import ProcessNode from './processNode.vue'
+import ProcessNodeAdd from './processNodeAdd.vue'
+import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
+import { setMeasureProcess, setMeasureProcessByFfy } from '@/api/business/schedule/task'
+const props = defineProps({
+  type: {
+    type: String,
+    default: 'distribute',
+  }, // 类型，决定调用哪个接口
+  // 是否为详情展示页面
+  detail: {
+    type: Boolean,
+    default: false,
+  },
+  // 样品id
+  sampleId: {
+    type: String,
+    required: true,
+  },
+  // 委托单id
+  orderId: {
+    type: String,
+    required: true,
+  },
+  list: {
+    type: Array,
+    default: () => [],
+  },
+})
+const emits = defineEmits(['saveOver'])
+// 默认流程节点
+const defaultProcess: IScheduleSet = {
+  measurePersonId: '', // 执行人
+  measurePerson: '', // 执行人名称
+  measureSegmentId: '', // 执行部门
+  measureSegment: '', // 执行部门名称
+  executiveItem: '', // 检定项目
+  // alreadyCertifications: 0, // 已出具证书总数
+  requireCertifications: 1, // 应出具证书总数
+  measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: '', // 流程更新时间
+}
+// 检定流程列表
+const processList = ref<IScheduleSet[]>([
+  { ...defaultProcess },
+])
+
+watch(() => props.list, (val) => {
+  if (props.list.length > 0) {
+    processList.value = props.list as ISchedule[]
+  }
+},
+{ deep: true, immediate: true })
+
+// 点击添加流程
+const processAdd = () => {
+  processList.value.push({ ...defaultProcess })
+}
+// 检查是否允许移动
+const checkMove = (evt: any) => {
+  // 目的位置元素evt.relatedContext.element
+  // 当前拖动元素evt.draggedContext.element
+  if (evt.relatedContext.element.measureState !== '0') {
+    return false
+  }
+  return true
+}
+
+// 选择实验室弹窗
+const chooseLabDialog = ref()
+// 批量添加流程
+const batchProcessAdd = () => {
+  chooseLabDialog.value.initDialog(true)
+}
+
+// 批量添加实验室
+const batchChooseOver = (labs: ILabList[]) => {
+  for (const item of labs) {
+    const processTemp: IScheduleSet = {
+      measurePersonId: '', // 执行人
+      measurePerson: '', // 执行人名称
+      measureSegmentId: item.deptId, // 执行部门
+      measureSegment: item.organizeName, // 执行部门名称
+      executiveItem: '', // 检定项目
+      measureSequence: '', // 监测顺序
+      // alreadyCertifications: 0, // 已出具证书总数
+      requireCertifications: 1, // 应出具证书总数
+      measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      updateTime: '', // 流程更新时间
+    }
+    processList.value.push(processTemp)
+  }
+}
+
+// 保存流程
+const saveProcess = () => {
+  const form = {
+    measureProcessList: processList.value,
+    executiveList: processList.value,
+    orderId: props.orderId,
+    sampleId: props.sampleId,
+  }
+  // 处理顺序
+  for (const key in form.measureProcessList) {
+    form.measureProcessList[key].measureSequence = (parseInt(key) + 1).toString()
+  }
+  if (props.type == 'distribute') {
+    setMeasureProcess(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
+  else {
+    setMeasureProcessByFfy(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
+}
+// 删除流程
+const deleteProcess = (index: number) => {
+  processList.value.splice(index, 1)
+}
+
+// --------暴露方法
+defineExpose({ saveProcess, batchProcessAdd, deleteProcess })
+</script>
+
+<template>
+  <div>
+    <div class="process-container">
+      <draggable v-model="processList" item-key="id" class="process-draggable" handle=".handle" :move="checkMove">
+        <!-- eslint-disable-next-line vue/no-unused-vars -->
+        <template #item="{ process, index }">
+          <process-node v-model="processList[index]" :step="index + 1" :detail="props.detail" @delete="deleteProcess(index)" />
+        </template>
+        <template #footer>
+          <process-node-add v-if="!props.detail" @click="processAdd" />
+        </template>
+      </draggable>
+    </div>
+    <choose-lab ref="chooseLabDialog" @confirm-checkout="batchChooseOver" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.process-container {
+  .process-draggable {
+    display: flex;
+    flex-wrap: wrap;
+  }
+}
+</style>
diff --git a/src/views/business/lab/myMeasure/components/processNode.vue b/src/views/business/lab/myMeasure/components/processNode.vue
new file mode 100644
index 0000000..fad76ab
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/processNode.vue
@@ -0,0 +1,215 @@
+<script lang="ts" setup name="ProcessNode">
+import {
+  Aim, Rank, Remove,
+} from '@element-plus/icons-vue'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
+// 逻辑代码
+const props = defineProps({
+  // 默认数据
+  modelValue: {
+    type: Object,
+    default: () => {
+      return {
+        measurePersonId: '', // 执行人
+        measurePerson: '', // 执行人名称
+        measureSegmentId: '', // 执行部门
+        measureSegment: '', // 执行部门名称
+        executiveItem: '', // 检定项目
+        alreadyCertifications: 0, // 已出具证书总数
+        requireCertifications: 0, // 应出具证书总数
+        measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        updateTime: '', // 流程更新时间
+      }
+    },
+  },
+  // 是否为详情展示页面
+  detail: {
+    type: Boolean,
+    default: false,
+  },
+  // 步骤
+  step: {
+    type: Number,
+    default: 1,
+  },
+})
+const emit = defineEmits(['update:modelValue', 'delete'])
+
+// ------------定义props参数----------
+const processNodeData = computed({
+  get() {
+    return props.modelValue
+  },
+  set(value) {
+    emit('update:modelValue', value)
+  },
+})
+// 检定环节可编辑-只有待分发状态可编辑
+const deptEdit = computed(() => {
+  const editStates = ['']
+  return editStates.includes(processNodeData.value.measureStatus)
+})
+// 检定人可编辑-待分配状态可编辑
+const personEdit = computed(() => {
+  const editStates = ['', '1', '2']
+  return editStates.includes(processNodeData.value.measureStatus)
+})
+// 证书可编辑-待分发、待分配、待检测状态可编辑
+const certificationEdit = computed(() => {
+  const editStates = ['', '1', '2', '3']
+  return editStates.includes(processNodeData.value.measureStatus)
+})
+// 节点可移动
+const canMove = computed(() => {
+  const editStates = ['', '1']
+  return editStates.includes(processNodeData.value.measureStatus)
+})
+
+// 选择人员
+const choosePersonShow = ref(false)
+const choosePerson = () => {
+  choosePersonShow.value = true
+}
+// 人员选择完毕
+const choosePersonOver = (person: { id: string; name: string }) => {
+  processNodeData.value.measurePersonId = person.id
+  processNodeData.value.measurePerson = person.name
+  choosePersonShow.value = false
+}
+
+// 选择实验室
+const chooseLabDialog = ref()
+const clickChoose = () => {
+  chooseLabDialog.value.initDialog(false)
+}
+const _selectStaffDialog = ref()
+// 实验室选择完毕
+const chooseOver = (lab: ILabList) => {
+  console.log(lab)
+  processNodeData.value.measureSegmentId = lab.deptId
+  processNodeData.value.measureSegment = lab.organizeName
+  // 定义一个对象关联上子组件的 ref 值（注意：这里的属性名必须跟子组件定义的 ref 值一模一样，否者会关联失效）
+  // 延迟使用，因为还没挂载
+  nextTick(() => {
+    _selectStaffDialog.value.fetchData()
+  })
+}
+
+// 移除该节点
+const deleteNode = () => {
+  emit('delete')
+}
+</script>
+
+<template>
+  <div class="process-node">
+    <div class="header">
+      <div class="step">
+        {{ props.step }}
+      </div>
+      <div class="buttons">
+        <el-icon v-show="canMove && !props.detail" class="icon-button" title="移除" @click="deleteNode">
+          <remove />
+        </el-icon>
+        <el-icon v-show="canMove && !props.detail" class="icon-button handle" title="移动">
+          <rank />
+        </el-icon>
+      </div>
+    </div>
+    <div>
+      <div class="line">
+        <span class="label">检定环节</span>
+        <el-input v-model="processNodeData.measureSegment" class="process-input" readonly size="small" :disabled="!deptEdit || props.detail">
+          <template v-if="deptEdit && !props.detail" #append>
+            <el-button :icon="Aim" size="small" link @click="clickChoose" />
+          </template>
+        </el-input>
+      </div>
+      <div class="line">
+        <span class="label">检定人员</span>
+        <el-input v-model="processNodeData.measurePerson" readonly class="process-input" size="small" :disabled="!personEdit || props.detail">
+          <template v-if="personEdit && !props.detail" #append>
+            <el-button :icon="Aim" size="small" link :disabled="processNodeData.measureSegment === ''" @click="choosePerson" />
+          </template>
+        </el-input>
+      </div>
+      <div class="line">
+        <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit || props.detail" /><span class="unit"> 份</span>
+      </div>
+      <div class="line">
+        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStatusName }}</span>
+      </div>
+      <div class="line">
+        <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
+      </div>
+    </div>
+    <!-- 选择实验室弹窗 -->
+    <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
+    <!-- 成员弹框 -->
+    <select-staff-dialog ref="_selectStaffDialog" v-model:visible="choosePersonShow" :data="[processNodeData.measurePersonId]" :dept-id="processNodeData.measureSegmentId" :dept-name="processNodeData.measureSegment" :multi="false" @change="choosePersonOver" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.process-node {
+  // display: inline-block;
+  margin-right: 10px;
+  width: 280px;
+  height: 215px;
+  border: 1px solid #e0e0e0;
+  padding: 5px 15px;
+  border-radius: 5px;
+  background-color: #fafafa;
+  margin-bottom: 10px;
+
+  .header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+    .step {
+      line-height: 28px;
+      font-size: 16px;
+      color: #3d7eff;
+      font-weight: bold;
+      margin-bottom: 5px;
+    }
+
+    .icon-button {
+      color: #999;
+      margin-left: 5px;
+      font-size: 16px;
+
+      &:hover {
+        cursor: pointer;
+      }
+    }
+  }
+
+  .line {
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 4px 0;
+
+    .label {
+      width: 80px;
+      font-size: 14px;
+    }
+
+    .process-input {
+      flex: 1;
+      font-size: 14px;
+    }
+
+    .unit {
+      margin-left: 5px;
+      font-size: 14px;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/lab/myMeasure/components/processNodeAdd.vue b/src/views/business/lab/myMeasure/components/processNodeAdd.vue
new file mode 100644
index 0000000..d7aeea0
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/processNodeAdd.vue
@@ -0,0 +1,46 @@
+<script lang="ts" setup name="ProcessNodeAdd">
+const emit = defineEmits(['click'])
+const add = () => {
+  emit('click')
+}
+</script>
+
+<template>
+  <div class="process-node" @click="add">
+    <div class="add">
+      <el-icon class="add-icon">
+        <plus />
+      </el-icon>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.process-node {
+  // display: inline-block;
+  width: 280px;
+  height: 215px;
+  border: 1px dashed #e0e0e0;
+  padding: 5px 15px;
+  border-radius: 5px;
+  background-color: #fbfbfb;
+
+  &:hover {
+    cursor: pointer;
+    background-color: #f5f5f5;
+  }
+
+  .add {
+    height: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    .add-icon {
+      vertical-align: middle;
+      font-size: 100px;
+      color: #999;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/lab/myMeasure/measureDetail.vue b/src/views/business/lab/myMeasure/measureDetail.vue
new file mode 100644
index 0000000..1a88be8
--- /dev/null
+++ b/src/views/business/lab/myMeasure/measureDetail.vue
@@ -0,0 +1,601 @@
+<!-- 任务分发 -->
+<script lang="ts" setup name="TaskEdit">
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance } from 'element-plus'
+import { ref } from 'vue'
+import ProcessConfig from './components/processConfig.vue'
+import type { ISampleMeasure, ITaskDetail } from './task-interface'
+import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { getTaskDetail } from '@/api/business/schedule/task'
+import countries from '@/components/AddressSelect/country-code.json'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+interface dictType {
+  id: string
+  name: string
+  value: string
+}
+const roleType = ref('distribute') // 角色类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员),
+const countryList = ref(countries) // 国家列表
+const loading = ref(false) // 表单加载状态
+const sampleId = ref('') // 样品详情id
+const orderId = ref('') // 委托书id
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const mesureTypeList = ref<dictType[]>([]) // 检定方式
+const $route = useRoute()
+
+// 获取字典值
+function getDict() {
+  // 获取样品属性
+  getDictByCode('measureCategory').then((response) => {
+    mesureCategoryList.value = response.data
+  })
+  // 获取样品属性
+  getDictByCode('measureType').then((response) => {
+    mesureTypeList.value = response.data
+  })
+}
+getDict()
+
+// 基本信息表单
+const sampleForm = ref<ISampleMeasure>({
+  id: '', // 样品id
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 样品型号
+  manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  phone: '', // 委托方电话
+  postalCode: '', // 委托方邮编
+  customerAddress: '', // 委托方地址
+  measureCategory: '', // 检校类别
+  manufacturer: '', // 生产厂家
+  manufacturerCountry: '', // 厂家国别
+  manufacturingDate: '', // 出厂年月
+  abc: '', // ABC
+  measurePeriod: '', // 检定周期
+  remark: '', // 备注
+  minioFileName: '', // 说明书
+  labelBind: '', // 标签绑定
+  measureType: '1', // 检定方式  1自检、2外包、3外检
+  measureTypeName: '', // 检定方式
+  measureLastTime: '', // 检定日期
+  validDeadline: '', // 有效日期
+  powerVoltage: '', // 电源电压
+  sampleBelong: '', // 样品所属
+  sampleBelongName: '', // 样品所属
+})
+const taskForm = ref <ITaskDetail> ({
+  measureContent: '', // 检定项目
+  specialRequire: '', // 客户特殊要求
+  orderId: '', // 委托单id
+  orderCode: '', // 委托单编号
+  certifications: '', // 证书类别
+  planDeliverTime: '', // 预约送达时间
+  requireOverTime: '', // 要求检完时间
+  measureProcessList: [], // 检定流程
+  measureSendBackList: [], // 退回信息
+  remark: '', // 备注
+  deliverer: '', // 送检人
+  delivererTel: '', // 送检人联系方式
+})
+const ruleFormRef = ref<FormInstance>()
+
+// 自定义校验规则--检定周期为正整数
+const validateMesurePeriod = (rule: any, value: any, callback: any) => {
+  if (value === '') {
+    callback()
+  }
+  else if (!(/(^[1-9]\d*$)/.test(value))) {
+    callback(new Error('请输入一个正整数'))
+  }
+  else {
+    callback()
+  }
+}
+
+// 校验规则
+const rules = ref({
+  mesurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
+}) // 表单验证规则
+
+// 其他关联数据列表
+const dataList = ref({
+  measureRecords: [] as SimpleMeasureRecord[],
+  certificationRecords: [] as SimpleCertification[],
+})
+
+// 获取检定记录
+const fetchMeasureRecords = function (query = null) {
+  dataList.value.measureRecords = []
+}
+// 获取检定证书
+const fetchCertifications = function (query = null) {
+  dataList.value.certificationRecords = []
+}
+interface Menu {
+  name: string
+  columns: TableColumn[]
+  pagination: boolean
+  list: 'measureRecords' | 'certificationRecords'
+  searchFunc: Function
+}
+// 菜单
+const menu: Menu[] = [
+  {
+    name: '检定记录',
+    columns: [
+      { text: '委托单编号', value: 'orderCode' },
+      { text: '委托单日期', value: 'orderTime' },
+      { text: '委托方代码', value: 'customerCode' },
+      { text: '委托方名称', value: 'customerName' },
+      { text: '送检人', value: 'deliverer' },
+      { text: '送检日期', value: 'deliverTime' },
+    ],
+    list: 'measureRecords',
+    pagination: true,
+    searchFunc: fetchMeasureRecords,
+  },
+  {
+    name: '检定证书',
+    columns: [
+      { text: '证书编号', value: 'certificationCode' },
+      { text: '证书名称', value: 'certificationName' },
+      { text: '证书类型', value: 'certificationType' },
+      { text: '证书出具日期', value: 'effectiveDate' },
+      { text: '证书有效期', value: 'expirationDate' },
+    ],
+    list: 'certificationRecords',
+    pagination: true,
+    searchFunc: fetchCertifications,
+  },
+]
+
+const currentMenu = ref('证书监控')
+const currentMenuObj = computed(() => {
+  return menu.find(item => item.name === currentMenu.value)
+})
+
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 打印表单
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '样品详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>样品详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+// 保存样品信息
+function saveForm(formEl: FormInstance | undefined) {
+  if (!formEl) { return }
+  formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认修改样品信息吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (sampleForm.value.id) {
+          updateSample(sampleForm.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+      })
+    }
+  })
+}
+// 获取详情
+const getSampleInfo = () => {
+  getSapmleDetail({ id: sampleId.value }).then((res) => {
+    sampleForm.value = res.data
+  })
+}
+// 获取分发详情
+const getInfo = () => {
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    taskForm.value.specialRequire = res.data.specialRequire // 客户特殊要求
+    taskForm.value.deliverer = res.data.deliverer // 送检人
+    taskForm.value.delivererTel = res.data.delivererTel // 送检人联系方式
+    taskForm.value.measureContent = res.data.measureContent // 检定项目
+    taskForm.value.measureProcessList = res.data.measureProcessList // 检定流程
+    taskForm.value.measureSendBackList = res.data.measureSendBackList // 退回流程
+    console.log('pppppp')
+    console.log(taskForm.value.measureProcessList)
+
+    // 改用一个接口获取
+    sampleForm.value = res.data
+  })
+}
+
+// 点击标签绑定的扫描
+const startScan = () => {
+  // TODO
+}
+
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
+}
+// 保存流程按钮点击
+const saveProcess = () => {
+  processConfigRef.value.saveProcess()
+}
+
+// 文件上传
+const fileRef = ref()
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    // UploadFile(fd).then((res) => {
+    //   if (res.code === 200) {
+    //     sampleForm.value.minioFileName = res.data[0]
+    //     // 重置当前验证
+    //     ElMessage.success('文件上传成功')
+    //   }
+    //   else {
+    //     ElMessage.error(res.message)
+    //   }
+    // })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+onMounted(() => {
+  console.log($route)
+  // 从路由中获取页面类型参数
+  if ($route.params && $route.params.role) {
+    roleType.value = $route.params.role as string // 使用角色
+  }
+  if ($route.params.id) {
+    sampleId.value = $route.params.id as string
+    orderId.value = $route.query.order as string
+    // 获取分发详情
+    getInfo()
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="样品详情">
+      <template #btns>
+        <el-button v-if="roleType === 'detail'" v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <!-- <el-button v-if="roleType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button> -->
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <div id="form">
+        <el-form
+          ref="ruleFormRef"
+          :model="sampleForm"
+          :label-width="120"
+          label-position="right"
+          :rules="rules"
+        >
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="样品编号:" prop="sampleNo">
+                <el-input
+                  v-model="sampleForm.sampleNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品名称:" prop="sampleName">
+                <el-input
+                  v-model="sampleForm.sampleName"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品型号:" prop="sampleModel">
+                <el-input
+                  v-model="sampleForm.sampleModel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂编号:" prop="manufacturingNo">
+                <el-input
+                  v-model="sampleForm.manufacturingNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方代码" prop="customerNo">
+                <el-input
+                  v-model="sampleForm.customerNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方名称" prop="customerName">
+                <el-input
+                  v-model="sampleForm.customerName"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方电话" prop="phone">
+                <el-input
+                  v-model="sampleForm.phone"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方电话'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方邮编" prop="postalCode">
+                <el-input
+                  v-model="sampleForm.postalCode"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方邮编'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="18">
+              <el-form-item label="委托方地址:" prop="companyAddress">
+                <el-input
+                  v-model="sampleForm.customerAddress"
+                  type="textarea"
+                  autosize
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方地址'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="校检类别:">
+                <el-select
+                  v-model="sampleForm.measureCategory"
+                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :disabled="roleType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="生产厂家:">
+                <el-input
+                  v-model="sampleForm.manufacturer"
+                  :placeholder="roleType === 'detail' ? '' : '请输入生产厂家'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="厂家国别:">
+                <el-select
+                  v-model="sampleForm.manufacturerCountry"
+                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :disabled="roleType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂年月:">
+                <el-date-picker
+                  v-model="sampleForm.manufacturingDate"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="roleType === 'detail' ? '' : '请输入出厂年月'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="ABC:">
+                <el-select
+                  v-model="sampleForm.abc"
+                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :disabled="roleType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="送检人:">
+                <el-input
+                  v-model="taskForm.deliverer"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="联系方式:">
+                <el-input
+                  v-model="taskForm.delivererTel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="检定项目:" prop="mesureContent">
+                <el-input
+                  v-model="taskForm.measureContent"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  disabled
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检定周期（月）:">
+                <el-input
+                  v-model="sampleForm.measurePeriod"
+                  :placeholder="roleType === 'detail' ? '' : '请输入检定周期'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="备注:">
+                <el-input
+                  v-model="sampleForm.remark"
+                  type="textarea"
+                  :rows="2"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  disabled
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检定方式:">
+                <el-select
+                  v-model="sampleForm.measureType"
+                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :disabled="roleType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of mesureTypeList" :key="item.value" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="标签绑定:">
+                <el-input
+                  v-model="sampleForm.labelBind"
+                  :placeholder="roleType === 'detail' ? '' : '标签绑定'"
+                  :disabled="roleType === 'detail'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                >
+                  <template v-if="roleType !== 'detail'" #append>
+                    <el-button>
+                      扫描
+                    </el-button>
+                  </template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="14">
+              <el-form-item label="说明书:">
+                <show-photo v-if="sampleForm.minioFileName" :minio-file-name="sampleForm.minioFileName" />
+                <span v-else-if="roleType === 'detail'">无</span>
+                <input v-show="roleType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="roleType !== 'detail'" id="file" type="primary" :disabled="roleType === 'detail'" :style="{ 'margin-left': sampleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ sampleForm.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </detail-page>
+    <detail-block v-if="taskForm.measureProcessList && taskForm.measureProcessList.length >= 1" title="检定流程">
+      <!-- <template #btns>
+        <el-button type="primary" style="margin-bottom: 10px;" @click="batchProcessAdd">
+          批量添加
+        </el-button>
+        <el-button type="primary" style="margin-bottom: 10px;" @click="saveProcess">
+          保存
+        </el-button>
+      </template> -->
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" :detail="true" />
+    </detail-block>
+    <!-- 退回流程 -->
+    <detail-block v-if="taskForm.measureSendBackList && taskForm.measureSendBackList.length >= 1" title="退回流程">
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureSendBackList" :sample-id="sampleId" :detail="true" />
+    </detail-block>
+    <!-- 检定记录、检定证书 -->
+    <detail-block-switch :title="currentMenu">
+      <template #menu>
+        <el-radio-group v-model="currentMenu">
+          <el-radio-button label="证书监控">
+            证书监控
+          </el-radio-button>
+          <el-radio-button label="检定记录">
+            检定记录
+          </el-radio-button>
+          <el-radio-button label="检定证书">
+            检定证书
+          </el-radio-button>
+        </el-radio-group>
+      </template>
+      <!-- 证书监控 -->
+      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" />
+      <!-- 检定记录 -->
+      <measure-records v-if="currentMenu === '检定记录'" :sample-id="sampleId" />
+      <!-- 证书记录 -->
+      <certification-records v-if="currentMenu === '检定证书'" :sample-id="sampleId" />
+    </detail-block-switch>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
+
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 62f8830..e4a4637 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -13,7 +13,6 @@
 import { getMyMeasureList, myExecutiveDone, myExecutiveReceive } from '@/api/business/schedule/task'
 import type { dictType } from '@/global'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
-
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
@@ -128,7 +127,7 @@
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`myMeasureDetail/detail/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
diff --git a/src/views/business/lab/myMeasure/task-interface.ts b/src/views/business/lab/myMeasure/task-interface.ts
new file mode 100644
index 0000000..6503a12
--- /dev/null
+++ b/src/views/business/lab/myMeasure/task-interface.ts
@@ -0,0 +1,169 @@
+// 任务列表查询条件
+export interface ITaskQuery {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  orderNo: string // 委托书编号
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  isUrgent: string // 是否加急
+  sampleBelong: string // 样品属性
+  sampleStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
+  limit: number
+  offset: number
+}
+
+// 我的检测/部门检测查询条件
+export interface ILabQuery {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  orderNo: string // 委托书编号
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  isUrgent: string // 是否加急
+  sampleBelong: string // 样品属性
+  measureStatus: string // 分发状态
+  startTime: string | number //	应检定开始时间
+  endTime: string | number //	应检定结束时间
+  limit: number
+  offset: number
+}
+// 任务列表-返回值
+export interface ITaskList {
+  orderId: string // 委托书编号
+  sampleId: string // 样品唯一标识
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderNo: string // 委托书编号
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  isUrgent: number // 是否加急
+  isUrgentName?: string // 是否加急
+  requireOverTime: string // 应检完时间
+  sampleBelong: string // 样品属性
+  sampleBelongName: string // 样品属性
+  currentMeasureState: string // 当前检定环节
+  currentMeasureStateName: string // 当前检定环节
+  alreadyCertifications: number // 已出具证书总数
+  requireCertifications: number // 应出具证书总数
+  distributeState: string // 分发性质-初次分发、退回分发
+  handOutProperty: string // 分发性质-初次分发、退回分发
+  id?: string // 实验室id
+}
+
+// 实验室检测/我的检测列表
+export interface IlabMeasureList extends ITaskList {
+  id: string // 实验室检测id
+  measurePersonId: string // 检测人id
+  measureSegmentId: string // 检测部门id
+  currentSegmentId: string // 检测部门id (新)
+}
+
+// 全部检测流程节点
+export interface ISchedule {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications: number // 应出具证书总数
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: string // 流程更新时间
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
+  distributePerson: string // 分配人
+  distributeTime: string // 分配时间
+  startTime: string // 检定开始时间
+  overTime: string // 检定完成时间
+}
+// 检测流程节点
+export interface IScheduleSet {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications: number // 应出具证书总数
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: string // 流程更新时间
+  measureSequence?: string // 检测顺序
+}
+// 退回流程节点
+export interface IScheduleBack {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications?: number // 应出具证书总数
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
+}
+
+// 样品检测信息
+export interface ISampleMeasure {
+  id: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  manufacturingNo: string // 出厂编号
+  customerNo: string // 委托方代码
+  customerId: string // 委托方id
+  customerName: string // 委托方名称
+  phone: string // 委托方电话
+  postalCode: string // 委托方邮编
+  customerAddress: string // 委托方地址
+  measureCategory: string // 检校类别
+  manufacturer: string // 生产厂家
+  manufacturerCountry: string // 厂家国别
+  manufacturingDate: string // 出厂年月
+  abc: string // ABC
+  measurePeriod: string // 检定周期
+  minioFileName: string // 说明书
+  labelBind: string // 标签绑定
+  measureType: string // 检定方式
+  measureTypeName: string // 检定方式
+  measureLastTime?: string // 检定日期
+  validDeadline: string // 有效日期
+  powerVoltage: string // 电源电压
+  sampleBelong: string // 样品所属
+  sampleBelongName: string // 样品所属
+  remark: string // 备注
+}
+
+export interface ITaskDetail {
+  measureContent: string // 检定项目
+  measureProcessList: ISchedule[] // 检定流程
+  measureSendBackList: ISchedule[] // 退回信息
+  remark: string // 备注
+  orderId: string // 委托单id
+  orderCode: string // 委托单编号
+  certifications: string // 证书类别
+  planDeliverTime: string // 预约送达时间
+  requireOverTime: string // 要求检完时间
+  specialRequire: string // 客户特殊要求
+  deliverer: string // 送检人
+  delivererTel: string // 送检人联系方式
+}
+
+// 退回
+export interface ISendBack {
+  id: string // 实验室检测id
+  measurePersonId: string // 检定人员id
+  measureSegmentId: string //	检定环节，实验室id
+  operateReason: string // 退回原因
+  orderId: string // 委托书id
+  sampleId: string //	样品id
+}
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index 0efec98..99a6852 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -141,7 +141,6 @@
 // 点击详情
 const handleDetail = (row: ITaskList) => {
   console.log('跳转任务分发详情')
-
   $router.push(`/schedule/task/distribute/${row.sampleId}?order=${row.orderId}`)
 }
 
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 6ad9900..dbaa437 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -83,11 +83,7 @@
     text: '申请时间',
     value: 'time',
     align: 'center',
-  },
-  {
-    text: '审批状态',
-    value: 'approvalStatusName',
-    align: 'center',
+    width: 160,
   },
 ]) // 表格
 // 数据查询
@@ -456,6 +452,16 @@
           </el-table-column>
         </template>
         <template #columns>
+          <el-table-column v-if="activeTitle === '已归还'" label="归还时间" width="160" align="center">
+            <template #default="scope">
+              {{ scope.row.backTime }}
+            </template>
+          </el-table-column>
+          <el-table-column label="审批状态" width="120" align="center">
+            <template #default="scope">
+              {{ scope.row.approvalStatusName }}
+            </template>
+          </el-table-column>
           <el-table-column label="操作" align="center" :width="activeTitle === '待借用' ? '130' : activeTitle === '已借用' ? '110' : '80'">
             <template #default="{ row }">
               <el-button size="small" type="primary" link @click="detail(row)">

diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index b21ad07..cf4a5b9 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -260,6 +260,19 @@
         },
       },
       {
+        path: 'myMeasureDetail/:role/:id',
+        name: 'MyMeasureDetail',
+        component: () => import('@/views/business/lab/myMeasure/measureDetail.vue'),
+        meta: {
+          title: '我的检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          auth: '/lab/myMeasure',
+          activeMenu: '/lab/myMeasureList',
+        },
+      },
+      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -270,6 +283,19 @@
         },
       },
       {
+        path: 'myMeasureDetail/:role/:id',
+        name: 'MyMeasureDetail',
+        component: () => import('@/views/business/lab/myMeasure/measureDetail.vue'),
+        meta: {
+          title: '部门检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          auth: '/lab/deptMeasureList',
+          activeMenu: '/lab/deptMeasureList',
+        },
+      },
+      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 066f192..7a6ebea 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -102,8 +102,9 @@
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
-          localStorage.removeItem('name')
           localStorage.removeItem('token')
+          localStorage.removeItem('nameId')
+          localStorage.removeItem('depId')
           this.username = ''
           this.token = ''
           this.roleList = []
@@ -121,7 +122,8 @@
               this.roleList = res.data.roleIds
               this.roleNames = res.data.roleNames
               this.roleTips = res.data.roleTips
-              localStorage.setItem('name', res.data.name)
+              localStorage.setItem('nameId', res.data.id)
+              localStorage.setItem('depId', res.data.deptId)
             }
             else {
               reject('该用户无角色')
diff --git a/src/views/business/board/overdueReminder/detail.vue b/src/views/business/board/overdueReminder/detail.vue
index 92987d1..0239b71 100644
--- a/src/views/business/board/overdueReminder/detail.vue
+++ b/src/views/business/board/overdueReminder/detail.vue
@@ -5,7 +5,7 @@
 import { ref } from 'vue'
 import dayjs from 'dayjs'
 import ProcessConfig from '@/views/business/schedule/task/components/processConfig.vue'
-import type { ISampleMeasure, ITaskDetail } from '@/views/business/schedule/task/task-interface'
+import type { ISampleMeasure, ITaskDetail } from '@/views/business/schedule/task/task-interface.js'
 import type { Menu, SimpleCertification, SimpleMeasureRecord, dictType } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getTaskDetail } from '@/api/business/schedule/task'
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index d6cc168..05fd811 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -4,8 +4,8 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import DistributeDialog from '../../schedule/task/components/distributeDialog.vue'
 import RollbackDialog from './../components/rollbackDialog.vue'
-import DistributeDialog from './../components/distributeDialog.vue'
 import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
@@ -131,7 +131,8 @@
 const depId = ref('')
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
+  $router.push(`myMeasureDetail/detail/${row.sampleId}?order=${row.orderId}`)
+  // $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
diff --git a/src/views/business/lab/myMeasure/components/chooseLab.vue b/src/views/business/lab/myMeasure/components/chooseLab.vue
new file mode 100644
index 0000000..0dcebfc
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/chooseLab.vue
@@ -0,0 +1,203 @@
+<script setup lang="ts" name="ChooseLab">
+// 选择实验室
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { ILabList, ILabSearchQuery } from '@/views/business/schedule/task/components/lab-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getOrganizeList } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
+const emits = defineEmits(['confirmCheckout'])
+// 是否多选
+const multi = ref(false)
+const dialogVisible = ref(false)
+
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
+// 查询条件
+const listQuery = ref<ILabSearchQuery>({
+  organizeNo: '', // 实验室编号
+  organizeName: '', // 实验室名称
+  meterMajor: '', // 专业
+  organizeType: '3', // 组织类型
+  director: '', // 负责人
+  isLab: '1', // 是否是实验室
+  createStartTime: '',
+  createEndTime: '',
+})
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '实验室名称', value: 'organizeName', width: '160', align: 'center' },
+  // { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
+  { text: '负责人', value: 'director', align: 'center', width: '120' },
+  { text: '计量专业', value: 'meterMajorName', align: 'center' },
+  { text: '实验室能力', value: 'labCapacityName', align: 'center' },
+])
+// 表格数据
+const list = ref<ILabList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 多选的内容
+const checkoutList = ref<ILabList[]>([])
+// 单选
+const singleChecked = ref()
+// 数据查询
+function fetchData(isNowPage = false) {
+  getOrganizeList(listQuery.value).then((response) => {
+    list.value = response.data
+    total.value = parseInt(response.data.length)
+    loadingTable.value = false
+  })
+  loadingTable.value = false
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    organizeNo: '', // 实验室编号
+    organizeName: '', // 实验室名称
+    meterMajor: '', // 专业
+    organizeType: '3', // 组织类型
+    director: '', // 负责人
+    isLab: '1', // 是否是实验室
+    createStartTime: '',
+    createEndTime: '',
+  }
+}
+
+// 点击取消
+const cancle = () => {
+  dialogVisible.value = false
+}
+// 点击确定
+const clickConfirm = () => {
+  // 如果多选
+  if (multi.value) {
+    if (!checkoutList.value.length) {
+      ElMessage({
+        message: '请选择至少一个实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      emits('confirmCheckout', checkoutList.value)
+    }
+  }
+  else {
+    if (!singleChecked.value) {
+      ElMessage({
+        message: '请选择检定实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      const checkValue = list.value.find(item => item.id == singleChecked.value)
+      emits('confirmCheckout', checkValue)
+    }
+  }
+
+  cancle()
+}
+
+// 初始化弹窗
+const initDialog = (multiSelect: boolean) => {
+  multi.value = multiSelect
+  dialogVisible.value = true
+  fetchData()
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <div class="choose-lab-dialog">
+    <el-dialog v-model="dialogVisible" :title="`选择检定实验室${(checkoutList.length > 0 && multi) ? `(已选择${checkoutList.length}个实验室)` : ''}`" width="1000" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.organizeName"
+            placeholder="实验室名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-select
+            v-model.trim="listQuery.meterMajor"
+            clearable
+            placeholder="计量专业"
+          >
+            <el-option
+              v-for="item in measureMajorList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <div style="padding: 5px 10px;">
+        <normal-table
+          :data="list"
+          :total="total"
+          :columns="columns"
+          :query="listQuery"
+          :list-loading="loadingTable"
+          :pagination="false"
+          size="small"
+          @multi-select="handleSelectionChange"
+        >
+          <!-- :is-showmulti-select="multi" -->
+          <!-- :is-multi="multi" -->
+          <template v-if="!multi" #preColumns>
+            <el-table-column label="#" width="55" align="center" fixed="left">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="" width="40" align="center" fixed>
+              <template #default="scope">
+                <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </div>
+
+      <template #footer>
+        <el-button type="primary" @click="clickConfirm">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.choose-lab-dialog {
+  :deep(.el-radio__label) {
+    display: none;
+  }
+}
+</style>
diff --git a/src/views/business/lab/myMeasure/components/lab-interface.ts b/src/views/business/lab/myMeasure/components/lab-interface.ts
new file mode 100644
index 0000000..02b0d1d
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/lab-interface.ts
@@ -0,0 +1,29 @@
+// 查询参数类型
+export interface ILabSearchQuery {
+  organizeNo: string // 组织编号
+  organizeName: string // 名称
+  organizeType: string // 类型-3科室
+  isLab: '1' // 是否是实验室
+  director: string // 负责人
+  meterMajor: string // 专业
+  createStartTime: '' // 创建开始时间
+  createEndTime: '' // 创建结束事假
+}
+
+// 部门返回值对象类型
+export interface ILabList {
+  id: string
+  deptId: string // 部门id
+  director: string // 负责人名称
+  phone: string // 负责人电话
+  meterMajor: string // 计量专业
+  organizeNo: string // 实验室编号
+  organizeName: string // 实验室名称
+  measureItems: string // 全部检测能力
+  pDeptId: string // 所属部门
+  pDeptName: string // 所属部门
+  organizeType: string // 组织类型
+  remark?: string // 备注
+  createTime?: string // 创建时间
+  updateTime?: string // 更新时间
+}
diff --git a/src/views/business/lab/myMeasure/components/processConfig.vue b/src/views/business/lab/myMeasure/components/processConfig.vue
new file mode 100644
index 0000000..bb66076
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/processConfig.vue
@@ -0,0 +1,161 @@
+<script setup lang="ts" name="ProcessConfig">
+import { ref } from 'vue'
+import draggable from 'vuedraggable'
+import { ElMessage } from 'element-plus'
+import type { ISchedule, IScheduleSet } from '../task-interface'
+import ProcessNode from './processNode.vue'
+import ProcessNodeAdd from './processNodeAdd.vue'
+import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
+import { setMeasureProcess, setMeasureProcessByFfy } from '@/api/business/schedule/task'
+const props = defineProps({
+  type: {
+    type: String,
+    default: 'distribute',
+  }, // 类型，决定调用哪个接口
+  // 是否为详情展示页面
+  detail: {
+    type: Boolean,
+    default: false,
+  },
+  // 样品id
+  sampleId: {
+    type: String,
+    required: true,
+  },
+  // 委托单id
+  orderId: {
+    type: String,
+    required: true,
+  },
+  list: {
+    type: Array,
+    default: () => [],
+  },
+})
+const emits = defineEmits(['saveOver'])
+// 默认流程节点
+const defaultProcess: IScheduleSet = {
+  measurePersonId: '', // 执行人
+  measurePerson: '', // 执行人名称
+  measureSegmentId: '', // 执行部门
+  measureSegment: '', // 执行部门名称
+  executiveItem: '', // 检定项目
+  // alreadyCertifications: 0, // 已出具证书总数
+  requireCertifications: 1, // 应出具证书总数
+  measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: '', // 流程更新时间
+}
+// 检定流程列表
+const processList = ref<IScheduleSet[]>([
+  { ...defaultProcess },
+])
+
+watch(() => props.list, (val) => {
+  if (props.list.length > 0) {
+    processList.value = props.list as ISchedule[]
+  }
+},
+{ deep: true, immediate: true })
+
+// 点击添加流程
+const processAdd = () => {
+  processList.value.push({ ...defaultProcess })
+}
+// 检查是否允许移动
+const checkMove = (evt: any) => {
+  // 目的位置元素evt.relatedContext.element
+  // 当前拖动元素evt.draggedContext.element
+  if (evt.relatedContext.element.measureState !== '0') {
+    return false
+  }
+  return true
+}
+
+// 选择实验室弹窗
+const chooseLabDialog = ref()
+// 批量添加流程
+const batchProcessAdd = () => {
+  chooseLabDialog.value.initDialog(true)
+}
+
+// 批量添加实验室
+const batchChooseOver = (labs: ILabList[]) => {
+  for (const item of labs) {
+    const processTemp: IScheduleSet = {
+      measurePersonId: '', // 执行人
+      measurePerson: '', // 执行人名称
+      measureSegmentId: item.deptId, // 执行部门
+      measureSegment: item.organizeName, // 执行部门名称
+      executiveItem: '', // 检定项目
+      measureSequence: '', // 监测顺序
+      // alreadyCertifications: 0, // 已出具证书总数
+      requireCertifications: 1, // 应出具证书总数
+      measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      updateTime: '', // 流程更新时间
+    }
+    processList.value.push(processTemp)
+  }
+}
+
+// 保存流程
+const saveProcess = () => {
+  const form = {
+    measureProcessList: processList.value,
+    executiveList: processList.value,
+    orderId: props.orderId,
+    sampleId: props.sampleId,
+  }
+  // 处理顺序
+  for (const key in form.measureProcessList) {
+    form.measureProcessList[key].measureSequence = (parseInt(key) + 1).toString()
+  }
+  if (props.type == 'distribute') {
+    setMeasureProcess(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
+  else {
+    setMeasureProcessByFfy(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
+}
+// 删除流程
+const deleteProcess = (index: number) => {
+  processList.value.splice(index, 1)
+}
+
+// --------暴露方法
+defineExpose({ saveProcess, batchProcessAdd, deleteProcess })
+</script>
+
+<template>
+  <div>
+    <div class="process-container">
+      <draggable v-model="processList" item-key="id" class="process-draggable" handle=".handle" :move="checkMove">
+        <!-- eslint-disable-next-line vue/no-unused-vars -->
+        <template #item="{ process, index }">
+          <process-node v-model="processList[index]" :step="index + 1" :detail="props.detail" @delete="deleteProcess(index)" />
+        </template>
+        <template #footer>
+          <process-node-add v-if="!props.detail" @click="processAdd" />
+        </template>
+      </draggable>
+    </div>
+    <choose-lab ref="chooseLabDialog" @confirm-checkout="batchChooseOver" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.process-container {
+  .process-draggable {
+    display: flex;
+    flex-wrap: wrap;
+  }
+}
+</style>
diff --git a/src/views/business/lab/myMeasure/components/processNode.vue b/src/views/business/lab/myMeasure/components/processNode.vue
new file mode 100644
index 0000000..fad76ab
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/processNode.vue
@@ -0,0 +1,215 @@
+<script lang="ts" setup name="ProcessNode">
+import {
+  Aim, Rank, Remove,
+} from '@element-plus/icons-vue'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
+// 逻辑代码
+const props = defineProps({
+  // 默认数据
+  modelValue: {
+    type: Object,
+    default: () => {
+      return {
+        measurePersonId: '', // 执行人
+        measurePerson: '', // 执行人名称
+        measureSegmentId: '', // 执行部门
+        measureSegment: '', // 执行部门名称
+        executiveItem: '', // 检定项目
+        alreadyCertifications: 0, // 已出具证书总数
+        requireCertifications: 0, // 应出具证书总数
+        measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        updateTime: '', // 流程更新时间
+      }
+    },
+  },
+  // 是否为详情展示页面
+  detail: {
+    type: Boolean,
+    default: false,
+  },
+  // 步骤
+  step: {
+    type: Number,
+    default: 1,
+  },
+})
+const emit = defineEmits(['update:modelValue', 'delete'])
+
+// ------------定义props参数----------
+const processNodeData = computed({
+  get() {
+    return props.modelValue
+  },
+  set(value) {
+    emit('update:modelValue', value)
+  },
+})
+// 检定环节可编辑-只有待分发状态可编辑
+const deptEdit = computed(() => {
+  const editStates = ['']
+  return editStates.includes(processNodeData.value.measureStatus)
+})
+// 检定人可编辑-待分配状态可编辑
+const personEdit = computed(() => {
+  const editStates = ['', '1', '2']
+  return editStates.includes(processNodeData.value.measureStatus)
+})
+// 证书可编辑-待分发、待分配、待检测状态可编辑
+const certificationEdit = computed(() => {
+  const editStates = ['', '1', '2', '3']
+  return editStates.includes(processNodeData.value.measureStatus)
+})
+// 节点可移动
+const canMove = computed(() => {
+  const editStates = ['', '1']
+  return editStates.includes(processNodeData.value.measureStatus)
+})
+
+// 选择人员
+const choosePersonShow = ref(false)
+const choosePerson = () => {
+  choosePersonShow.value = true
+}
+// 人员选择完毕
+const choosePersonOver = (person: { id: string; name: string }) => {
+  processNodeData.value.measurePersonId = person.id
+  processNodeData.value.measurePerson = person.name
+  choosePersonShow.value = false
+}
+
+// 选择实验室
+const chooseLabDialog = ref()
+const clickChoose = () => {
+  chooseLabDialog.value.initDialog(false)
+}
+const _selectStaffDialog = ref()
+// 实验室选择完毕
+const chooseOver = (lab: ILabList) => {
+  console.log(lab)
+  processNodeData.value.measureSegmentId = lab.deptId
+  processNodeData.value.measureSegment = lab.organizeName
+  // 定义一个对象关联上子组件的 ref 值（注意：这里的属性名必须跟子组件定义的 ref 值一模一样，否者会关联失效）
+  // 延迟使用，因为还没挂载
+  nextTick(() => {
+    _selectStaffDialog.value.fetchData()
+  })
+}
+
+// 移除该节点
+const deleteNode = () => {
+  emit('delete')
+}
+</script>
+
+<template>
+  <div class="process-node">
+    <div class="header">
+      <div class="step">
+        {{ props.step }}
+      </div>
+      <div class="buttons">
+        <el-icon v-show="canMove && !props.detail" class="icon-button" title="移除" @click="deleteNode">
+          <remove />
+        </el-icon>
+        <el-icon v-show="canMove && !props.detail" class="icon-button handle" title="移动">
+          <rank />
+        </el-icon>
+      </div>
+    </div>
+    <div>
+      <div class="line">
+        <span class="label">检定环节</span>
+        <el-input v-model="processNodeData.measureSegment" class="process-input" readonly size="small" :disabled="!deptEdit || props.detail">
+          <template v-if="deptEdit && !props.detail" #append>
+            <el-button :icon="Aim" size="small" link @click="clickChoose" />
+          </template>
+        </el-input>
+      </div>
+      <div class="line">
+        <span class="label">检定人员</span>
+        <el-input v-model="processNodeData.measurePerson" readonly class="process-input" size="small" :disabled="!personEdit || props.detail">
+          <template v-if="personEdit && !props.detail" #append>
+            <el-button :icon="Aim" size="small" link :disabled="processNodeData.measureSegment === ''" @click="choosePerson" />
+          </template>
+        </el-input>
+      </div>
+      <div class="line">
+        <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit || props.detail" /><span class="unit"> 份</span>
+      </div>
+      <div class="line">
+        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStatusName }}</span>
+      </div>
+      <div class="line">
+        <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
+      </div>
+    </div>
+    <!-- 选择实验室弹窗 -->
+    <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
+    <!-- 成员弹框 -->
+    <select-staff-dialog ref="_selectStaffDialog" v-model:visible="choosePersonShow" :data="[processNodeData.measurePersonId]" :dept-id="processNodeData.measureSegmentId" :dept-name="processNodeData.measureSegment" :multi="false" @change="choosePersonOver" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.process-node {
+  // display: inline-block;
+  margin-right: 10px;
+  width: 280px;
+  height: 215px;
+  border: 1px solid #e0e0e0;
+  padding: 5px 15px;
+  border-radius: 5px;
+  background-color: #fafafa;
+  margin-bottom: 10px;
+
+  .header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+    .step {
+      line-height: 28px;
+      font-size: 16px;
+      color: #3d7eff;
+      font-weight: bold;
+      margin-bottom: 5px;
+    }
+
+    .icon-button {
+      color: #999;
+      margin-left: 5px;
+      font-size: 16px;
+
+      &:hover {
+        cursor: pointer;
+      }
+    }
+  }
+
+  .line {
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 4px 0;
+
+    .label {
+      width: 80px;
+      font-size: 14px;
+    }
+
+    .process-input {
+      flex: 1;
+      font-size: 14px;
+    }
+
+    .unit {
+      margin-left: 5px;
+      font-size: 14px;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/lab/myMeasure/components/processNodeAdd.vue b/src/views/business/lab/myMeasure/components/processNodeAdd.vue
new file mode 100644
index 0000000..d7aeea0
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/processNodeAdd.vue
@@ -0,0 +1,46 @@
+<script lang="ts" setup name="ProcessNodeAdd">
+const emit = defineEmits(['click'])
+const add = () => {
+  emit('click')
+}
+</script>
+
+<template>
+  <div class="process-node" @click="add">
+    <div class="add">
+      <el-icon class="add-icon">
+        <plus />
+      </el-icon>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.process-node {
+  // display: inline-block;
+  width: 280px;
+  height: 215px;
+  border: 1px dashed #e0e0e0;
+  padding: 5px 15px;
+  border-radius: 5px;
+  background-color: #fbfbfb;
+
+  &:hover {
+    cursor: pointer;
+    background-color: #f5f5f5;
+  }
+
+  .add {
+    height: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    .add-icon {
+      vertical-align: middle;
+      font-size: 100px;
+      color: #999;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/lab/myMeasure/measureDetail.vue b/src/views/business/lab/myMeasure/measureDetail.vue
new file mode 100644
index 0000000..1a88be8
--- /dev/null
+++ b/src/views/business/lab/myMeasure/measureDetail.vue
@@ -0,0 +1,601 @@
+<!-- 任务分发 -->
+<script lang="ts" setup name="TaskEdit">
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance } from 'element-plus'
+import { ref } from 'vue'
+import ProcessConfig from './components/processConfig.vue'
+import type { ISampleMeasure, ITaskDetail } from './task-interface'
+import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { getTaskDetail } from '@/api/business/schedule/task'
+import countries from '@/components/AddressSelect/country-code.json'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+interface dictType {
+  id: string
+  name: string
+  value: string
+}
+const roleType = ref('distribute') // 角色类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员),
+const countryList = ref(countries) // 国家列表
+const loading = ref(false) // 表单加载状态
+const sampleId = ref('') // 样品详情id
+const orderId = ref('') // 委托书id
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const mesureTypeList = ref<dictType[]>([]) // 检定方式
+const $route = useRoute()
+
+// 获取字典值
+function getDict() {
+  // 获取样品属性
+  getDictByCode('measureCategory').then((response) => {
+    mesureCategoryList.value = response.data
+  })
+  // 获取样品属性
+  getDictByCode('measureType').then((response) => {
+    mesureTypeList.value = response.data
+  })
+}
+getDict()
+
+// 基本信息表单
+const sampleForm = ref<ISampleMeasure>({
+  id: '', // 样品id
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 样品型号
+  manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  phone: '', // 委托方电话
+  postalCode: '', // 委托方邮编
+  customerAddress: '', // 委托方地址
+  measureCategory: '', // 检校类别
+  manufacturer: '', // 生产厂家
+  manufacturerCountry: '', // 厂家国别
+  manufacturingDate: '', // 出厂年月
+  abc: '', // ABC
+  measurePeriod: '', // 检定周期
+  remark: '', // 备注
+  minioFileName: '', // 说明书
+  labelBind: '', // 标签绑定
+  measureType: '1', // 检定方式  1自检、2外包、3外检
+  measureTypeName: '', // 检定方式
+  measureLastTime: '', // 检定日期
+  validDeadline: '', // 有效日期
+  powerVoltage: '', // 电源电压
+  sampleBelong: '', // 样品所属
+  sampleBelongName: '', // 样品所属
+})
+const taskForm = ref <ITaskDetail> ({
+  measureContent: '', // 检定项目
+  specialRequire: '', // 客户特殊要求
+  orderId: '', // 委托单id
+  orderCode: '', // 委托单编号
+  certifications: '', // 证书类别
+  planDeliverTime: '', // 预约送达时间
+  requireOverTime: '', // 要求检完时间
+  measureProcessList: [], // 检定流程
+  measureSendBackList: [], // 退回信息
+  remark: '', // 备注
+  deliverer: '', // 送检人
+  delivererTel: '', // 送检人联系方式
+})
+const ruleFormRef = ref<FormInstance>()
+
+// 自定义校验规则--检定周期为正整数
+const validateMesurePeriod = (rule: any, value: any, callback: any) => {
+  if (value === '') {
+    callback()
+  }
+  else if (!(/(^[1-9]\d*$)/.test(value))) {
+    callback(new Error('请输入一个正整数'))
+  }
+  else {
+    callback()
+  }
+}
+
+// 校验规则
+const rules = ref({
+  mesurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
+}) // 表单验证规则
+
+// 其他关联数据列表
+const dataList = ref({
+  measureRecords: [] as SimpleMeasureRecord[],
+  certificationRecords: [] as SimpleCertification[],
+})
+
+// 获取检定记录
+const fetchMeasureRecords = function (query = null) {
+  dataList.value.measureRecords = []
+}
+// 获取检定证书
+const fetchCertifications = function (query = null) {
+  dataList.value.certificationRecords = []
+}
+interface Menu {
+  name: string
+  columns: TableColumn[]
+  pagination: boolean
+  list: 'measureRecords' | 'certificationRecords'
+  searchFunc: Function
+}
+// 菜单
+const menu: Menu[] = [
+  {
+    name: '检定记录',
+    columns: [
+      { text: '委托单编号', value: 'orderCode' },
+      { text: '委托单日期', value: 'orderTime' },
+      { text: '委托方代码', value: 'customerCode' },
+      { text: '委托方名称', value: 'customerName' },
+      { text: '送检人', value: 'deliverer' },
+      { text: '送检日期', value: 'deliverTime' },
+    ],
+    list: 'measureRecords',
+    pagination: true,
+    searchFunc: fetchMeasureRecords,
+  },
+  {
+    name: '检定证书',
+    columns: [
+      { text: '证书编号', value: 'certificationCode' },
+      { text: '证书名称', value: 'certificationName' },
+      { text: '证书类型', value: 'certificationType' },
+      { text: '证书出具日期', value: 'effectiveDate' },
+      { text: '证书有效期', value: 'expirationDate' },
+    ],
+    list: 'certificationRecords',
+    pagination: true,
+    searchFunc: fetchCertifications,
+  },
+]
+
+const currentMenu = ref('证书监控')
+const currentMenuObj = computed(() => {
+  return menu.find(item => item.name === currentMenu.value)
+})
+
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 打印表单
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '样品详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>样品详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+// 保存样品信息
+function saveForm(formEl: FormInstance | undefined) {
+  if (!formEl) { return }
+  formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认修改样品信息吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (sampleForm.value.id) {
+          updateSample(sampleForm.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+      })
+    }
+  })
+}
+// 获取详情
+const getSampleInfo = () => {
+  getSapmleDetail({ id: sampleId.value }).then((res) => {
+    sampleForm.value = res.data
+  })
+}
+// 获取分发详情
+const getInfo = () => {
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    taskForm.value.specialRequire = res.data.specialRequire // 客户特殊要求
+    taskForm.value.deliverer = res.data.deliverer // 送检人
+    taskForm.value.delivererTel = res.data.delivererTel // 送检人联系方式
+    taskForm.value.measureContent = res.data.measureContent // 检定项目
+    taskForm.value.measureProcessList = res.data.measureProcessList // 检定流程
+    taskForm.value.measureSendBackList = res.data.measureSendBackList // 退回流程
+    console.log('pppppp')
+    console.log(taskForm.value.measureProcessList)
+
+    // 改用一个接口获取
+    sampleForm.value = res.data
+  })
+}
+
+// 点击标签绑定的扫描
+const startScan = () => {
+  // TODO
+}
+
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
+}
+// 保存流程按钮点击
+const saveProcess = () => {
+  processConfigRef.value.saveProcess()
+}
+
+// 文件上传
+const fileRef = ref()
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    // UploadFile(fd).then((res) => {
+    //   if (res.code === 200) {
+    //     sampleForm.value.minioFileName = res.data[0]
+    //     // 重置当前验证
+    //     ElMessage.success('文件上传成功')
+    //   }
+    //   else {
+    //     ElMessage.error(res.message)
+    //   }
+    // })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+onMounted(() => {
+  console.log($route)
+  // 从路由中获取页面类型参数
+  if ($route.params && $route.params.role) {
+    roleType.value = $route.params.role as string // 使用角色
+  }
+  if ($route.params.id) {
+    sampleId.value = $route.params.id as string
+    orderId.value = $route.query.order as string
+    // 获取分发详情
+    getInfo()
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="样品详情">
+      <template #btns>
+        <el-button v-if="roleType === 'detail'" v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <!-- <el-button v-if="roleType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button> -->
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <div id="form">
+        <el-form
+          ref="ruleFormRef"
+          :model="sampleForm"
+          :label-width="120"
+          label-position="right"
+          :rules="rules"
+        >
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="样品编号:" prop="sampleNo">
+                <el-input
+                  v-model="sampleForm.sampleNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品名称:" prop="sampleName">
+                <el-input
+                  v-model="sampleForm.sampleName"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品型号:" prop="sampleModel">
+                <el-input
+                  v-model="sampleForm.sampleModel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂编号:" prop="manufacturingNo">
+                <el-input
+                  v-model="sampleForm.manufacturingNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方代码" prop="customerNo">
+                <el-input
+                  v-model="sampleForm.customerNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方名称" prop="customerName">
+                <el-input
+                  v-model="sampleForm.customerName"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方电话" prop="phone">
+                <el-input
+                  v-model="sampleForm.phone"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方电话'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方邮编" prop="postalCode">
+                <el-input
+                  v-model="sampleForm.postalCode"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方邮编'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="18">
+              <el-form-item label="委托方地址:" prop="companyAddress">
+                <el-input
+                  v-model="sampleForm.customerAddress"
+                  type="textarea"
+                  autosize
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方地址'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="校检类别:">
+                <el-select
+                  v-model="sampleForm.measureCategory"
+                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :disabled="roleType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="生产厂家:">
+                <el-input
+                  v-model="sampleForm.manufacturer"
+                  :placeholder="roleType === 'detail' ? '' : '请输入生产厂家'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="厂家国别:">
+                <el-select
+                  v-model="sampleForm.manufacturerCountry"
+                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :disabled="roleType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂年月:">
+                <el-date-picker
+                  v-model="sampleForm.manufacturingDate"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="roleType === 'detail' ? '' : '请输入出厂年月'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="ABC:">
+                <el-select
+                  v-model="sampleForm.abc"
+                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :disabled="roleType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="送检人:">
+                <el-input
+                  v-model="taskForm.deliverer"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="联系方式:">
+                <el-input
+                  v-model="taskForm.delivererTel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="检定项目:" prop="mesureContent">
+                <el-input
+                  v-model="taskForm.measureContent"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  disabled
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检定周期（月）:">
+                <el-input
+                  v-model="sampleForm.measurePeriod"
+                  :placeholder="roleType === 'detail' ? '' : '请输入检定周期'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="备注:">
+                <el-input
+                  v-model="sampleForm.remark"
+                  type="textarea"
+                  :rows="2"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  disabled
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检定方式:">
+                <el-select
+                  v-model="sampleForm.measureType"
+                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :disabled="roleType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of mesureTypeList" :key="item.value" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="标签绑定:">
+                <el-input
+                  v-model="sampleForm.labelBind"
+                  :placeholder="roleType === 'detail' ? '' : '标签绑定'"
+                  :disabled="roleType === 'detail'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                >
+                  <template v-if="roleType !== 'detail'" #append>
+                    <el-button>
+                      扫描
+                    </el-button>
+                  </template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="14">
+              <el-form-item label="说明书:">
+                <show-photo v-if="sampleForm.minioFileName" :minio-file-name="sampleForm.minioFileName" />
+                <span v-else-if="roleType === 'detail'">无</span>
+                <input v-show="roleType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="roleType !== 'detail'" id="file" type="primary" :disabled="roleType === 'detail'" :style="{ 'margin-left': sampleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ sampleForm.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </detail-page>
+    <detail-block v-if="taskForm.measureProcessList && taskForm.measureProcessList.length >= 1" title="检定流程">
+      <!-- <template #btns>
+        <el-button type="primary" style="margin-bottom: 10px;" @click="batchProcessAdd">
+          批量添加
+        </el-button>
+        <el-button type="primary" style="margin-bottom: 10px;" @click="saveProcess">
+          保存
+        </el-button>
+      </template> -->
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" :detail="true" />
+    </detail-block>
+    <!-- 退回流程 -->
+    <detail-block v-if="taskForm.measureSendBackList && taskForm.measureSendBackList.length >= 1" title="退回流程">
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureSendBackList" :sample-id="sampleId" :detail="true" />
+    </detail-block>
+    <!-- 检定记录、检定证书 -->
+    <detail-block-switch :title="currentMenu">
+      <template #menu>
+        <el-radio-group v-model="currentMenu">
+          <el-radio-button label="证书监控">
+            证书监控
+          </el-radio-button>
+          <el-radio-button label="检定记录">
+            检定记录
+          </el-radio-button>
+          <el-radio-button label="检定证书">
+            检定证书
+          </el-radio-button>
+        </el-radio-group>
+      </template>
+      <!-- 证书监控 -->
+      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" />
+      <!-- 检定记录 -->
+      <measure-records v-if="currentMenu === '检定记录'" :sample-id="sampleId" />
+      <!-- 证书记录 -->
+      <certification-records v-if="currentMenu === '检定证书'" :sample-id="sampleId" />
+    </detail-block-switch>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
+
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 62f8830..e4a4637 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -13,7 +13,6 @@
 import { getMyMeasureList, myExecutiveDone, myExecutiveReceive } from '@/api/business/schedule/task'
 import type { dictType } from '@/global'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
-
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
@@ -128,7 +127,7 @@
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`myMeasureDetail/detail/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
diff --git a/src/views/business/lab/myMeasure/task-interface.ts b/src/views/business/lab/myMeasure/task-interface.ts
new file mode 100644
index 0000000..6503a12
--- /dev/null
+++ b/src/views/business/lab/myMeasure/task-interface.ts
@@ -0,0 +1,169 @@
+// 任务列表查询条件
+export interface ITaskQuery {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  orderNo: string // 委托书编号
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  isUrgent: string // 是否加急
+  sampleBelong: string // 样品属性
+  sampleStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
+  limit: number
+  offset: number
+}
+
+// 我的检测/部门检测查询条件
+export interface ILabQuery {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  orderNo: string // 委托书编号
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  isUrgent: string // 是否加急
+  sampleBelong: string // 样品属性
+  measureStatus: string // 分发状态
+  startTime: string | number //	应检定开始时间
+  endTime: string | number //	应检定结束时间
+  limit: number
+  offset: number
+}
+// 任务列表-返回值
+export interface ITaskList {
+  orderId: string // 委托书编号
+  sampleId: string // 样品唯一标识
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderNo: string // 委托书编号
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  isUrgent: number // 是否加急
+  isUrgentName?: string // 是否加急
+  requireOverTime: string // 应检完时间
+  sampleBelong: string // 样品属性
+  sampleBelongName: string // 样品属性
+  currentMeasureState: string // 当前检定环节
+  currentMeasureStateName: string // 当前检定环节
+  alreadyCertifications: number // 已出具证书总数
+  requireCertifications: number // 应出具证书总数
+  distributeState: string // 分发性质-初次分发、退回分发
+  handOutProperty: string // 分发性质-初次分发、退回分发
+  id?: string // 实验室id
+}
+
+// 实验室检测/我的检测列表
+export interface IlabMeasureList extends ITaskList {
+  id: string // 实验室检测id
+  measurePersonId: string // 检测人id
+  measureSegmentId: string // 检测部门id
+  currentSegmentId: string // 检测部门id (新)
+}
+
+// 全部检测流程节点
+export interface ISchedule {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications: number // 应出具证书总数
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: string // 流程更新时间
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
+  distributePerson: string // 分配人
+  distributeTime: string // 分配时间
+  startTime: string // 检定开始时间
+  overTime: string // 检定完成时间
+}
+// 检测流程节点
+export interface IScheduleSet {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications: number // 应出具证书总数
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: string // 流程更新时间
+  measureSequence?: string // 检测顺序
+}
+// 退回流程节点
+export interface IScheduleBack {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications?: number // 应出具证书总数
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
+}
+
+// 样品检测信息
+export interface ISampleMeasure {
+  id: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  manufacturingNo: string // 出厂编号
+  customerNo: string // 委托方代码
+  customerId: string // 委托方id
+  customerName: string // 委托方名称
+  phone: string // 委托方电话
+  postalCode: string // 委托方邮编
+  customerAddress: string // 委托方地址
+  measureCategory: string // 检校类别
+  manufacturer: string // 生产厂家
+  manufacturerCountry: string // 厂家国别
+  manufacturingDate: string // 出厂年月
+  abc: string // ABC
+  measurePeriod: string // 检定周期
+  minioFileName: string // 说明书
+  labelBind: string // 标签绑定
+  measureType: string // 检定方式
+  measureTypeName: string // 检定方式
+  measureLastTime?: string // 检定日期
+  validDeadline: string // 有效日期
+  powerVoltage: string // 电源电压
+  sampleBelong: string // 样品所属
+  sampleBelongName: string // 样品所属
+  remark: string // 备注
+}
+
+export interface ITaskDetail {
+  measureContent: string // 检定项目
+  measureProcessList: ISchedule[] // 检定流程
+  measureSendBackList: ISchedule[] // 退回信息
+  remark: string // 备注
+  orderId: string // 委托单id
+  orderCode: string // 委托单编号
+  certifications: string // 证书类别
+  planDeliverTime: string // 预约送达时间
+  requireOverTime: string // 要求检完时间
+  specialRequire: string // 客户特殊要求
+  deliverer: string // 送检人
+  delivererTel: string // 送检人联系方式
+}
+
+// 退回
+export interface ISendBack {
+  id: string // 实验室检测id
+  measurePersonId: string // 检定人员id
+  measureSegmentId: string //	检定环节，实验室id
+  operateReason: string // 退回原因
+  orderId: string // 委托书id
+  sampleId: string //	样品id
+}
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index 0efec98..99a6852 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -141,7 +141,6 @@
 // 点击详情
 const handleDetail = (row: ITaskList) => {
   console.log('跳转任务分发详情')
-
   $router.push(`/schedule/task/distribute/${row.sampleId}?order=${row.orderId}`)
 }
 
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 6ad9900..dbaa437 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -83,11 +83,7 @@
     text: '申请时间',
     value: 'time',
     align: 'center',
-  },
-  {
-    text: '审批状态',
-    value: 'approvalStatusName',
-    align: 'center',
+    width: 160,
   },
 ]) // 表格
 // 数据查询
@@ -456,6 +452,16 @@
           </el-table-column>
         </template>
         <template #columns>
+          <el-table-column v-if="activeTitle === '已归还'" label="归还时间" width="160" align="center">
+            <template #default="scope">
+              {{ scope.row.backTime }}
+            </template>
+          </el-table-column>
+          <el-table-column label="审批状态" width="120" align="center">
+            <template #default="scope">
+              {{ scope.row.approvalStatusName }}
+            </template>
+          </el-table-column>
           <el-table-column label="操作" align="center" :width="activeTitle === '待借用' ? '130' : activeTitle === '已借用' ? '110' : '80'">
             <template #default="{ row }">
               <el-button size="small" type="primary" link @click="detail(row)">
diff --git a/src/views/device/borrow/editHandle.vue b/src/views/device/borrow/editHandle.vue
index 9a5b2a6..4e0bc5c 100644
--- a/src/views/device/borrow/editHandle.vue
+++ b/src/views/device/borrow/editHandle.vue
@@ -26,6 +26,7 @@
   applyUnit: '', // 申请单位
   applyPerson: '', // 申请人
   time: '', // 借用时间
+  backTime: '', // 归还时间
   applyDesc: '', // 申请说明
 })
 const list = ref<IdeviceList[]>([])// 表格数据
@@ -163,7 +164,18 @@
                     />
                   </el-form-item>
                 </el-col>
-                <el-col :span="12">
+                <el-col :span="6">
+                  <el-form-item label="归还时间" prop="backTime">
+                    <el-date-picker
+                      v-model="form.backTime"
+                      type="datetime"
+                      format="YYYY-MM-DD hh:mm"
+                      value-format="YYYY-MM-DD hh:mm"
+                      disabled
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="18">
                   <el-form-item label="申请说明" prop="applyDesc">
                     <el-input v-model="form.applyDesc" type="textarea" disabled autosize />
                   </el-form-item>

diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index b21ad07..cf4a5b9 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -260,6 +260,19 @@
         },
       },
       {
+        path: 'myMeasureDetail/:role/:id',
+        name: 'MyMeasureDetail',
+        component: () => import('@/views/business/lab/myMeasure/measureDetail.vue'),
+        meta: {
+          title: '我的检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          auth: '/lab/myMeasure',
+          activeMenu: '/lab/myMeasureList',
+        },
+      },
+      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -270,6 +283,19 @@
         },
       },
       {
+        path: 'myMeasureDetail/:role/:id',
+        name: 'MyMeasureDetail',
+        component: () => import('@/views/business/lab/myMeasure/measureDetail.vue'),
+        meta: {
+          title: '部门检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          auth: '/lab/deptMeasureList',
+          activeMenu: '/lab/deptMeasureList',
+        },
+      },
+      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 066f192..7a6ebea 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -102,8 +102,9 @@
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
-          localStorage.removeItem('name')
           localStorage.removeItem('token')
+          localStorage.removeItem('nameId')
+          localStorage.removeItem('depId')
           this.username = ''
           this.token = ''
           this.roleList = []
@@ -121,7 +122,8 @@
               this.roleList = res.data.roleIds
               this.roleNames = res.data.roleNames
               this.roleTips = res.data.roleTips
-              localStorage.setItem('name', res.data.name)
+              localStorage.setItem('nameId', res.data.id)
+              localStorage.setItem('depId', res.data.deptId)
             }
             else {
               reject('该用户无角色')
diff --git a/src/views/business/board/overdueReminder/detail.vue b/src/views/business/board/overdueReminder/detail.vue
index 92987d1..0239b71 100644
--- a/src/views/business/board/overdueReminder/detail.vue
+++ b/src/views/business/board/overdueReminder/detail.vue
@@ -5,7 +5,7 @@
 import { ref } from 'vue'
 import dayjs from 'dayjs'
 import ProcessConfig from '@/views/business/schedule/task/components/processConfig.vue'
-import type { ISampleMeasure, ITaskDetail } from '@/views/business/schedule/task/task-interface'
+import type { ISampleMeasure, ITaskDetail } from '@/views/business/schedule/task/task-interface.js'
 import type { Menu, SimpleCertification, SimpleMeasureRecord, dictType } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getTaskDetail } from '@/api/business/schedule/task'
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index d6cc168..05fd811 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -4,8 +4,8 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import DistributeDialog from '../../schedule/task/components/distributeDialog.vue'
 import RollbackDialog from './../components/rollbackDialog.vue'
-import DistributeDialog from './../components/distributeDialog.vue'
 import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
@@ -131,7 +131,8 @@
 const depId = ref('')
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
+  $router.push(`myMeasureDetail/detail/${row.sampleId}?order=${row.orderId}`)
+  // $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
diff --git a/src/views/business/lab/myMeasure/components/chooseLab.vue b/src/views/business/lab/myMeasure/components/chooseLab.vue
new file mode 100644
index 0000000..0dcebfc
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/chooseLab.vue
@@ -0,0 +1,203 @@
+<script setup lang="ts" name="ChooseLab">
+// 选择实验室
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { ILabList, ILabSearchQuery } from '@/views/business/schedule/task/components/lab-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getOrganizeList } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
+const emits = defineEmits(['confirmCheckout'])
+// 是否多选
+const multi = ref(false)
+const dialogVisible = ref(false)
+
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
+// 查询条件
+const listQuery = ref<ILabSearchQuery>({
+  organizeNo: '', // 实验室编号
+  organizeName: '', // 实验室名称
+  meterMajor: '', // 专业
+  organizeType: '3', // 组织类型
+  director: '', // 负责人
+  isLab: '1', // 是否是实验室
+  createStartTime: '',
+  createEndTime: '',
+})
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '实验室名称', value: 'organizeName', width: '160', align: 'center' },
+  // { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
+  { text: '负责人', value: 'director', align: 'center', width: '120' },
+  { text: '计量专业', value: 'meterMajorName', align: 'center' },
+  { text: '实验室能力', value: 'labCapacityName', align: 'center' },
+])
+// 表格数据
+const list = ref<ILabList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 多选的内容
+const checkoutList = ref<ILabList[]>([])
+// 单选
+const singleChecked = ref()
+// 数据查询
+function fetchData(isNowPage = false) {
+  getOrganizeList(listQuery.value).then((response) => {
+    list.value = response.data
+    total.value = parseInt(response.data.length)
+    loadingTable.value = false
+  })
+  loadingTable.value = false
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    organizeNo: '', // 实验室编号
+    organizeName: '', // 实验室名称
+    meterMajor: '', // 专业
+    organizeType: '3', // 组织类型
+    director: '', // 负责人
+    isLab: '1', // 是否是实验室
+    createStartTime: '',
+    createEndTime: '',
+  }
+}
+
+// 点击取消
+const cancle = () => {
+  dialogVisible.value = false
+}
+// 点击确定
+const clickConfirm = () => {
+  // 如果多选
+  if (multi.value) {
+    if (!checkoutList.value.length) {
+      ElMessage({
+        message: '请选择至少一个实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      emits('confirmCheckout', checkoutList.value)
+    }
+  }
+  else {
+    if (!singleChecked.value) {
+      ElMessage({
+        message: '请选择检定实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      const checkValue = list.value.find(item => item.id == singleChecked.value)
+      emits('confirmCheckout', checkValue)
+    }
+  }
+
+  cancle()
+}
+
+// 初始化弹窗
+const initDialog = (multiSelect: boolean) => {
+  multi.value = multiSelect
+  dialogVisible.value = true
+  fetchData()
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <div class="choose-lab-dialog">
+    <el-dialog v-model="dialogVisible" :title="`选择检定实验室${(checkoutList.length > 0 && multi) ? `(已选择${checkoutList.length}个实验室)` : ''}`" width="1000" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.organizeName"
+            placeholder="实验室名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-select
+            v-model.trim="listQuery.meterMajor"
+            clearable
+            placeholder="计量专业"
+          >
+            <el-option
+              v-for="item in measureMajorList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <div style="padding: 5px 10px;">
+        <normal-table
+          :data="list"
+          :total="total"
+          :columns="columns"
+          :query="listQuery"
+          :list-loading="loadingTable"
+          :pagination="false"
+          size="small"
+          @multi-select="handleSelectionChange"
+        >
+          <!-- :is-showmulti-select="multi" -->
+          <!-- :is-multi="multi" -->
+          <template v-if="!multi" #preColumns>
+            <el-table-column label="#" width="55" align="center" fixed="left">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="" width="40" align="center" fixed>
+              <template #default="scope">
+                <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </div>
+
+      <template #footer>
+        <el-button type="primary" @click="clickConfirm">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.choose-lab-dialog {
+  :deep(.el-radio__label) {
+    display: none;
+  }
+}
+</style>
diff --git a/src/views/business/lab/myMeasure/components/lab-interface.ts b/src/views/business/lab/myMeasure/components/lab-interface.ts
new file mode 100644
index 0000000..02b0d1d
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/lab-interface.ts
@@ -0,0 +1,29 @@
+// 查询参数类型
+export interface ILabSearchQuery {
+  organizeNo: string // 组织编号
+  organizeName: string // 名称
+  organizeType: string // 类型-3科室
+  isLab: '1' // 是否是实验室
+  director: string // 负责人
+  meterMajor: string // 专业
+  createStartTime: '' // 创建开始时间
+  createEndTime: '' // 创建结束事假
+}
+
+// 部门返回值对象类型
+export interface ILabList {
+  id: string
+  deptId: string // 部门id
+  director: string // 负责人名称
+  phone: string // 负责人电话
+  meterMajor: string // 计量专业
+  organizeNo: string // 实验室编号
+  organizeName: string // 实验室名称
+  measureItems: string // 全部检测能力
+  pDeptId: string // 所属部门
+  pDeptName: string // 所属部门
+  organizeType: string // 组织类型
+  remark?: string // 备注
+  createTime?: string // 创建时间
+  updateTime?: string // 更新时间
+}
diff --git a/src/views/business/lab/myMeasure/components/processConfig.vue b/src/views/business/lab/myMeasure/components/processConfig.vue
new file mode 100644
index 0000000..bb66076
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/processConfig.vue
@@ -0,0 +1,161 @@
+<script setup lang="ts" name="ProcessConfig">
+import { ref } from 'vue'
+import draggable from 'vuedraggable'
+import { ElMessage } from 'element-plus'
+import type { ISchedule, IScheduleSet } from '../task-interface'
+import ProcessNode from './processNode.vue'
+import ProcessNodeAdd from './processNodeAdd.vue'
+import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
+import { setMeasureProcess, setMeasureProcessByFfy } from '@/api/business/schedule/task'
+const props = defineProps({
+  type: {
+    type: String,
+    default: 'distribute',
+  }, // 类型，决定调用哪个接口
+  // 是否为详情展示页面
+  detail: {
+    type: Boolean,
+    default: false,
+  },
+  // 样品id
+  sampleId: {
+    type: String,
+    required: true,
+  },
+  // 委托单id
+  orderId: {
+    type: String,
+    required: true,
+  },
+  list: {
+    type: Array,
+    default: () => [],
+  },
+})
+const emits = defineEmits(['saveOver'])
+// 默认流程节点
+const defaultProcess: IScheduleSet = {
+  measurePersonId: '', // 执行人
+  measurePerson: '', // 执行人名称
+  measureSegmentId: '', // 执行部门
+  measureSegment: '', // 执行部门名称
+  executiveItem: '', // 检定项目
+  // alreadyCertifications: 0, // 已出具证书总数
+  requireCertifications: 1, // 应出具证书总数
+  measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: '', // 流程更新时间
+}
+// 检定流程列表
+const processList = ref<IScheduleSet[]>([
+  { ...defaultProcess },
+])
+
+watch(() => props.list, (val) => {
+  if (props.list.length > 0) {
+    processList.value = props.list as ISchedule[]
+  }
+},
+{ deep: true, immediate: true })
+
+// 点击添加流程
+const processAdd = () => {
+  processList.value.push({ ...defaultProcess })
+}
+// 检查是否允许移动
+const checkMove = (evt: any) => {
+  // 目的位置元素evt.relatedContext.element
+  // 当前拖动元素evt.draggedContext.element
+  if (evt.relatedContext.element.measureState !== '0') {
+    return false
+  }
+  return true
+}
+
+// 选择实验室弹窗
+const chooseLabDialog = ref()
+// 批量添加流程
+const batchProcessAdd = () => {
+  chooseLabDialog.value.initDialog(true)
+}
+
+// 批量添加实验室
+const batchChooseOver = (labs: ILabList[]) => {
+  for (const item of labs) {
+    const processTemp: IScheduleSet = {
+      measurePersonId: '', // 执行人
+      measurePerson: '', // 执行人名称
+      measureSegmentId: item.deptId, // 执行部门
+      measureSegment: item.organizeName, // 执行部门名称
+      executiveItem: '', // 检定项目
+      measureSequence: '', // 监测顺序
+      // alreadyCertifications: 0, // 已出具证书总数
+      requireCertifications: 1, // 应出具证书总数
+      measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      updateTime: '', // 流程更新时间
+    }
+    processList.value.push(processTemp)
+  }
+}
+
+// 保存流程
+const saveProcess = () => {
+  const form = {
+    measureProcessList: processList.value,
+    executiveList: processList.value,
+    orderId: props.orderId,
+    sampleId: props.sampleId,
+  }
+  // 处理顺序
+  for (const key in form.measureProcessList) {
+    form.measureProcessList[key].measureSequence = (parseInt(key) + 1).toString()
+  }
+  if (props.type == 'distribute') {
+    setMeasureProcess(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
+  else {
+    setMeasureProcessByFfy(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
+}
+// 删除流程
+const deleteProcess = (index: number) => {
+  processList.value.splice(index, 1)
+}
+
+// --------暴露方法
+defineExpose({ saveProcess, batchProcessAdd, deleteProcess })
+</script>
+
+<template>
+  <div>
+    <div class="process-container">
+      <draggable v-model="processList" item-key="id" class="process-draggable" handle=".handle" :move="checkMove">
+        <!-- eslint-disable-next-line vue/no-unused-vars -->
+        <template #item="{ process, index }">
+          <process-node v-model="processList[index]" :step="index + 1" :detail="props.detail" @delete="deleteProcess(index)" />
+        </template>
+        <template #footer>
+          <process-node-add v-if="!props.detail" @click="processAdd" />
+        </template>
+      </draggable>
+    </div>
+    <choose-lab ref="chooseLabDialog" @confirm-checkout="batchChooseOver" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.process-container {
+  .process-draggable {
+    display: flex;
+    flex-wrap: wrap;
+  }
+}
+</style>
diff --git a/src/views/business/lab/myMeasure/components/processNode.vue b/src/views/business/lab/myMeasure/components/processNode.vue
new file mode 100644
index 0000000..fad76ab
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/processNode.vue
@@ -0,0 +1,215 @@
+<script lang="ts" setup name="ProcessNode">
+import {
+  Aim, Rank, Remove,
+} from '@element-plus/icons-vue'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
+// 逻辑代码
+const props = defineProps({
+  // 默认数据
+  modelValue: {
+    type: Object,
+    default: () => {
+      return {
+        measurePersonId: '', // 执行人
+        measurePerson: '', // 执行人名称
+        measureSegmentId: '', // 执行部门
+        measureSegment: '', // 执行部门名称
+        executiveItem: '', // 检定项目
+        alreadyCertifications: 0, // 已出具证书总数
+        requireCertifications: 0, // 应出具证书总数
+        measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        updateTime: '', // 流程更新时间
+      }
+    },
+  },
+  // 是否为详情展示页面
+  detail: {
+    type: Boolean,
+    default: false,
+  },
+  // 步骤
+  step: {
+    type: Number,
+    default: 1,
+  },
+})
+const emit = defineEmits(['update:modelValue', 'delete'])
+
+// ------------定义props参数----------
+const processNodeData = computed({
+  get() {
+    return props.modelValue
+  },
+  set(value) {
+    emit('update:modelValue', value)
+  },
+})
+// 检定环节可编辑-只有待分发状态可编辑
+const deptEdit = computed(() => {
+  const editStates = ['']
+  return editStates.includes(processNodeData.value.measureStatus)
+})
+// 检定人可编辑-待分配状态可编辑
+const personEdit = computed(() => {
+  const editStates = ['', '1', '2']
+  return editStates.includes(processNodeData.value.measureStatus)
+})
+// 证书可编辑-待分发、待分配、待检测状态可编辑
+const certificationEdit = computed(() => {
+  const editStates = ['', '1', '2', '3']
+  return editStates.includes(processNodeData.value.measureStatus)
+})
+// 节点可移动
+const canMove = computed(() => {
+  const editStates = ['', '1']
+  return editStates.includes(processNodeData.value.measureStatus)
+})
+
+// 选择人员
+const choosePersonShow = ref(false)
+const choosePerson = () => {
+  choosePersonShow.value = true
+}
+// 人员选择完毕
+const choosePersonOver = (person: { id: string; name: string }) => {
+  processNodeData.value.measurePersonId = person.id
+  processNodeData.value.measurePerson = person.name
+  choosePersonShow.value = false
+}
+
+// 选择实验室
+const chooseLabDialog = ref()
+const clickChoose = () => {
+  chooseLabDialog.value.initDialog(false)
+}
+const _selectStaffDialog = ref()
+// 实验室选择完毕
+const chooseOver = (lab: ILabList) => {
+  console.log(lab)
+  processNodeData.value.measureSegmentId = lab.deptId
+  processNodeData.value.measureSegment = lab.organizeName
+  // 定义一个对象关联上子组件的 ref 值（注意：这里的属性名必须跟子组件定义的 ref 值一模一样，否者会关联失效）
+  // 延迟使用，因为还没挂载
+  nextTick(() => {
+    _selectStaffDialog.value.fetchData()
+  })
+}
+
+// 移除该节点
+const deleteNode = () => {
+  emit('delete')
+}
+</script>
+
+<template>
+  <div class="process-node">
+    <div class="header">
+      <div class="step">
+        {{ props.step }}
+      </div>
+      <div class="buttons">
+        <el-icon v-show="canMove && !props.detail" class="icon-button" title="移除" @click="deleteNode">
+          <remove />
+        </el-icon>
+        <el-icon v-show="canMove && !props.detail" class="icon-button handle" title="移动">
+          <rank />
+        </el-icon>
+      </div>
+    </div>
+    <div>
+      <div class="line">
+        <span class="label">检定环节</span>
+        <el-input v-model="processNodeData.measureSegment" class="process-input" readonly size="small" :disabled="!deptEdit || props.detail">
+          <template v-if="deptEdit && !props.detail" #append>
+            <el-button :icon="Aim" size="small" link @click="clickChoose" />
+          </template>
+        </el-input>
+      </div>
+      <div class="line">
+        <span class="label">检定人员</span>
+        <el-input v-model="processNodeData.measurePerson" readonly class="process-input" size="small" :disabled="!personEdit || props.detail">
+          <template v-if="personEdit && !props.detail" #append>
+            <el-button :icon="Aim" size="small" link :disabled="processNodeData.measureSegment === ''" @click="choosePerson" />
+          </template>
+        </el-input>
+      </div>
+      <div class="line">
+        <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit || props.detail" /><span class="unit"> 份</span>
+      </div>
+      <div class="line">
+        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStatusName }}</span>
+      </div>
+      <div class="line">
+        <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
+      </div>
+    </div>
+    <!-- 选择实验室弹窗 -->
+    <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
+    <!-- 成员弹框 -->
+    <select-staff-dialog ref="_selectStaffDialog" v-model:visible="choosePersonShow" :data="[processNodeData.measurePersonId]" :dept-id="processNodeData.measureSegmentId" :dept-name="processNodeData.measureSegment" :multi="false" @change="choosePersonOver" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.process-node {
+  // display: inline-block;
+  margin-right: 10px;
+  width: 280px;
+  height: 215px;
+  border: 1px solid #e0e0e0;
+  padding: 5px 15px;
+  border-radius: 5px;
+  background-color: #fafafa;
+  margin-bottom: 10px;
+
+  .header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+    .step {
+      line-height: 28px;
+      font-size: 16px;
+      color: #3d7eff;
+      font-weight: bold;
+      margin-bottom: 5px;
+    }
+
+    .icon-button {
+      color: #999;
+      margin-left: 5px;
+      font-size: 16px;
+
+      &:hover {
+        cursor: pointer;
+      }
+    }
+  }
+
+  .line {
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 4px 0;
+
+    .label {
+      width: 80px;
+      font-size: 14px;
+    }
+
+    .process-input {
+      flex: 1;
+      font-size: 14px;
+    }
+
+    .unit {
+      margin-left: 5px;
+      font-size: 14px;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/lab/myMeasure/components/processNodeAdd.vue b/src/views/business/lab/myMeasure/components/processNodeAdd.vue
new file mode 100644
index 0000000..d7aeea0
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/processNodeAdd.vue
@@ -0,0 +1,46 @@
+<script lang="ts" setup name="ProcessNodeAdd">
+const emit = defineEmits(['click'])
+const add = () => {
+  emit('click')
+}
+</script>
+
+<template>
+  <div class="process-node" @click="add">
+    <div class="add">
+      <el-icon class="add-icon">
+        <plus />
+      </el-icon>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.process-node {
+  // display: inline-block;
+  width: 280px;
+  height: 215px;
+  border: 1px dashed #e0e0e0;
+  padding: 5px 15px;
+  border-radius: 5px;
+  background-color: #fbfbfb;
+
+  &:hover {
+    cursor: pointer;
+    background-color: #f5f5f5;
+  }
+
+  .add {
+    height: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    .add-icon {
+      vertical-align: middle;
+      font-size: 100px;
+      color: #999;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/lab/myMeasure/measureDetail.vue b/src/views/business/lab/myMeasure/measureDetail.vue
new file mode 100644
index 0000000..1a88be8
--- /dev/null
+++ b/src/views/business/lab/myMeasure/measureDetail.vue
@@ -0,0 +1,601 @@
+<!-- 任务分发 -->
+<script lang="ts" setup name="TaskEdit">
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance } from 'element-plus'
+import { ref } from 'vue'
+import ProcessConfig from './components/processConfig.vue'
+import type { ISampleMeasure, ITaskDetail } from './task-interface'
+import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { getTaskDetail } from '@/api/business/schedule/task'
+import countries from '@/components/AddressSelect/country-code.json'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+interface dictType {
+  id: string
+  name: string
+  value: string
+}
+const roleType = ref('distribute') // 角色类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员),
+const countryList = ref(countries) // 国家列表
+const loading = ref(false) // 表单加载状态
+const sampleId = ref('') // 样品详情id
+const orderId = ref('') // 委托书id
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const mesureTypeList = ref<dictType[]>([]) // 检定方式
+const $route = useRoute()
+
+// 获取字典值
+function getDict() {
+  // 获取样品属性
+  getDictByCode('measureCategory').then((response) => {
+    mesureCategoryList.value = response.data
+  })
+  // 获取样品属性
+  getDictByCode('measureType').then((response) => {
+    mesureTypeList.value = response.data
+  })
+}
+getDict()
+
+// 基本信息表单
+const sampleForm = ref<ISampleMeasure>({
+  id: '', // 样品id
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 样品型号
+  manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  phone: '', // 委托方电话
+  postalCode: '', // 委托方邮编
+  customerAddress: '', // 委托方地址
+  measureCategory: '', // 检校类别
+  manufacturer: '', // 生产厂家
+  manufacturerCountry: '', // 厂家国别
+  manufacturingDate: '', // 出厂年月
+  abc: '', // ABC
+  measurePeriod: '', // 检定周期
+  remark: '', // 备注
+  minioFileName: '', // 说明书
+  labelBind: '', // 标签绑定
+  measureType: '1', // 检定方式  1自检、2外包、3外检
+  measureTypeName: '', // 检定方式
+  measureLastTime: '', // 检定日期
+  validDeadline: '', // 有效日期
+  powerVoltage: '', // 电源电压
+  sampleBelong: '', // 样品所属
+  sampleBelongName: '', // 样品所属
+})
+const taskForm = ref <ITaskDetail> ({
+  measureContent: '', // 检定项目
+  specialRequire: '', // 客户特殊要求
+  orderId: '', // 委托单id
+  orderCode: '', // 委托单编号
+  certifications: '', // 证书类别
+  planDeliverTime: '', // 预约送达时间
+  requireOverTime: '', // 要求检完时间
+  measureProcessList: [], // 检定流程
+  measureSendBackList: [], // 退回信息
+  remark: '', // 备注
+  deliverer: '', // 送检人
+  delivererTel: '', // 送检人联系方式
+})
+const ruleFormRef = ref<FormInstance>()
+
+// 自定义校验规则--检定周期为正整数
+const validateMesurePeriod = (rule: any, value: any, callback: any) => {
+  if (value === '') {
+    callback()
+  }
+  else if (!(/(^[1-9]\d*$)/.test(value))) {
+    callback(new Error('请输入一个正整数'))
+  }
+  else {
+    callback()
+  }
+}
+
+// 校验规则
+const rules = ref({
+  mesurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
+}) // 表单验证规则
+
+// 其他关联数据列表
+const dataList = ref({
+  measureRecords: [] as SimpleMeasureRecord[],
+  certificationRecords: [] as SimpleCertification[],
+})
+
+// 获取检定记录
+const fetchMeasureRecords = function (query = null) {
+  dataList.value.measureRecords = []
+}
+// 获取检定证书
+const fetchCertifications = function (query = null) {
+  dataList.value.certificationRecords = []
+}
+interface Menu {
+  name: string
+  columns: TableColumn[]
+  pagination: boolean
+  list: 'measureRecords' | 'certificationRecords'
+  searchFunc: Function
+}
+// 菜单
+const menu: Menu[] = [
+  {
+    name: '检定记录',
+    columns: [
+      { text: '委托单编号', value: 'orderCode' },
+      { text: '委托单日期', value: 'orderTime' },
+      { text: '委托方代码', value: 'customerCode' },
+      { text: '委托方名称', value: 'customerName' },
+      { text: '送检人', value: 'deliverer' },
+      { text: '送检日期', value: 'deliverTime' },
+    ],
+    list: 'measureRecords',
+    pagination: true,
+    searchFunc: fetchMeasureRecords,
+  },
+  {
+    name: '检定证书',
+    columns: [
+      { text: '证书编号', value: 'certificationCode' },
+      { text: '证书名称', value: 'certificationName' },
+      { text: '证书类型', value: 'certificationType' },
+      { text: '证书出具日期', value: 'effectiveDate' },
+      { text: '证书有效期', value: 'expirationDate' },
+    ],
+    list: 'certificationRecords',
+    pagination: true,
+    searchFunc: fetchCertifications,
+  },
+]
+
+const currentMenu = ref('证书监控')
+const currentMenuObj = computed(() => {
+  return menu.find(item => item.name === currentMenu.value)
+})
+
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 打印表单
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '样品详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>样品详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+// 保存样品信息
+function saveForm(formEl: FormInstance | undefined) {
+  if (!formEl) { return }
+  formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认修改样品信息吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (sampleForm.value.id) {
+          updateSample(sampleForm.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+      })
+    }
+  })
+}
+// 获取详情
+const getSampleInfo = () => {
+  getSapmleDetail({ id: sampleId.value }).then((res) => {
+    sampleForm.value = res.data
+  })
+}
+// 获取分发详情
+const getInfo = () => {
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    taskForm.value.specialRequire = res.data.specialRequire // 客户特殊要求
+    taskForm.value.deliverer = res.data.deliverer // 送检人
+    taskForm.value.delivererTel = res.data.delivererTel // 送检人联系方式
+    taskForm.value.measureContent = res.data.measureContent // 检定项目
+    taskForm.value.measureProcessList = res.data.measureProcessList // 检定流程
+    taskForm.value.measureSendBackList = res.data.measureSendBackList // 退回流程
+    console.log('pppppp')
+    console.log(taskForm.value.measureProcessList)
+
+    // 改用一个接口获取
+    sampleForm.value = res.data
+  })
+}
+
+// 点击标签绑定的扫描
+const startScan = () => {
+  // TODO
+}
+
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
+}
+// 保存流程按钮点击
+const saveProcess = () => {
+  processConfigRef.value.saveProcess()
+}
+
+// 文件上传
+const fileRef = ref()
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    // UploadFile(fd).then((res) => {
+    //   if (res.code === 200) {
+    //     sampleForm.value.minioFileName = res.data[0]
+    //     // 重置当前验证
+    //     ElMessage.success('文件上传成功')
+    //   }
+    //   else {
+    //     ElMessage.error(res.message)
+    //   }
+    // })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+onMounted(() => {
+  console.log($route)
+  // 从路由中获取页面类型参数
+  if ($route.params && $route.params.role) {
+    roleType.value = $route.params.role as string // 使用角色
+  }
+  if ($route.params.id) {
+    sampleId.value = $route.params.id as string
+    orderId.value = $route.query.order as string
+    // 获取分发详情
+    getInfo()
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="样品详情">
+      <template #btns>
+        <el-button v-if="roleType === 'detail'" v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <!-- <el-button v-if="roleType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button> -->
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <div id="form">
+        <el-form
+          ref="ruleFormRef"
+          :model="sampleForm"
+          :label-width="120"
+          label-position="right"
+          :rules="rules"
+        >
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="样品编号:" prop="sampleNo">
+                <el-input
+                  v-model="sampleForm.sampleNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品名称:" prop="sampleName">
+                <el-input
+                  v-model="sampleForm.sampleName"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品型号:" prop="sampleModel">
+                <el-input
+                  v-model="sampleForm.sampleModel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂编号:" prop="manufacturingNo">
+                <el-input
+                  v-model="sampleForm.manufacturingNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方代码" prop="customerNo">
+                <el-input
+                  v-model="sampleForm.customerNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方名称" prop="customerName">
+                <el-input
+                  v-model="sampleForm.customerName"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方电话" prop="phone">
+                <el-input
+                  v-model="sampleForm.phone"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方电话'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方邮编" prop="postalCode">
+                <el-input
+                  v-model="sampleForm.postalCode"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方邮编'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="18">
+              <el-form-item label="委托方地址:" prop="companyAddress">
+                <el-input
+                  v-model="sampleForm.customerAddress"
+                  type="textarea"
+                  autosize
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方地址'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="校检类别:">
+                <el-select
+                  v-model="sampleForm.measureCategory"
+                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :disabled="roleType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="生产厂家:">
+                <el-input
+                  v-model="sampleForm.manufacturer"
+                  :placeholder="roleType === 'detail' ? '' : '请输入生产厂家'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="厂家国别:">
+                <el-select
+                  v-model="sampleForm.manufacturerCountry"
+                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :disabled="roleType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂年月:">
+                <el-date-picker
+                  v-model="sampleForm.manufacturingDate"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="roleType === 'detail' ? '' : '请输入出厂年月'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="ABC:">
+                <el-select
+                  v-model="sampleForm.abc"
+                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :disabled="roleType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="送检人:">
+                <el-input
+                  v-model="taskForm.deliverer"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="联系方式:">
+                <el-input
+                  v-model="taskForm.delivererTel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="检定项目:" prop="mesureContent">
+                <el-input
+                  v-model="taskForm.measureContent"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  disabled
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检定周期（月）:">
+                <el-input
+                  v-model="sampleForm.measurePeriod"
+                  :placeholder="roleType === 'detail' ? '' : '请输入检定周期'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="备注:">
+                <el-input
+                  v-model="sampleForm.remark"
+                  type="textarea"
+                  :rows="2"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  disabled
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检定方式:">
+                <el-select
+                  v-model="sampleForm.measureType"
+                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :disabled="roleType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of mesureTypeList" :key="item.value" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="标签绑定:">
+                <el-input
+                  v-model="sampleForm.labelBind"
+                  :placeholder="roleType === 'detail' ? '' : '标签绑定'"
+                  :disabled="roleType === 'detail'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                >
+                  <template v-if="roleType !== 'detail'" #append>
+                    <el-button>
+                      扫描
+                    </el-button>
+                  </template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="14">
+              <el-form-item label="说明书:">
+                <show-photo v-if="sampleForm.minioFileName" :minio-file-name="sampleForm.minioFileName" />
+                <span v-else-if="roleType === 'detail'">无</span>
+                <input v-show="roleType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="roleType !== 'detail'" id="file" type="primary" :disabled="roleType === 'detail'" :style="{ 'margin-left': sampleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ sampleForm.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </detail-page>
+    <detail-block v-if="taskForm.measureProcessList && taskForm.measureProcessList.length >= 1" title="检定流程">
+      <!-- <template #btns>
+        <el-button type="primary" style="margin-bottom: 10px;" @click="batchProcessAdd">
+          批量添加
+        </el-button>
+        <el-button type="primary" style="margin-bottom: 10px;" @click="saveProcess">
+          保存
+        </el-button>
+      </template> -->
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" :detail="true" />
+    </detail-block>
+    <!-- 退回流程 -->
+    <detail-block v-if="taskForm.measureSendBackList && taskForm.measureSendBackList.length >= 1" title="退回流程">
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureSendBackList" :sample-id="sampleId" :detail="true" />
+    </detail-block>
+    <!-- 检定记录、检定证书 -->
+    <detail-block-switch :title="currentMenu">
+      <template #menu>
+        <el-radio-group v-model="currentMenu">
+          <el-radio-button label="证书监控">
+            证书监控
+          </el-radio-button>
+          <el-radio-button label="检定记录">
+            检定记录
+          </el-radio-button>
+          <el-radio-button label="检定证书">
+            检定证书
+          </el-radio-button>
+        </el-radio-group>
+      </template>
+      <!-- 证书监控 -->
+      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" />
+      <!-- 检定记录 -->
+      <measure-records v-if="currentMenu === '检定记录'" :sample-id="sampleId" />
+      <!-- 证书记录 -->
+      <certification-records v-if="currentMenu === '检定证书'" :sample-id="sampleId" />
+    </detail-block-switch>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
+
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 62f8830..e4a4637 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -13,7 +13,6 @@
 import { getMyMeasureList, myExecutiveDone, myExecutiveReceive } from '@/api/business/schedule/task'
 import type { dictType } from '@/global'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
-
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
@@ -128,7 +127,7 @@
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`myMeasureDetail/detail/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
diff --git a/src/views/business/lab/myMeasure/task-interface.ts b/src/views/business/lab/myMeasure/task-interface.ts
new file mode 100644
index 0000000..6503a12
--- /dev/null
+++ b/src/views/business/lab/myMeasure/task-interface.ts
@@ -0,0 +1,169 @@
+// 任务列表查询条件
+export interface ITaskQuery {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  orderNo: string // 委托书编号
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  isUrgent: string // 是否加急
+  sampleBelong: string // 样品属性
+  sampleStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
+  limit: number
+  offset: number
+}
+
+// 我的检测/部门检测查询条件
+export interface ILabQuery {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  orderNo: string // 委托书编号
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  isUrgent: string // 是否加急
+  sampleBelong: string // 样品属性
+  measureStatus: string // 分发状态
+  startTime: string | number //	应检定开始时间
+  endTime: string | number //	应检定结束时间
+  limit: number
+  offset: number
+}
+// 任务列表-返回值
+export interface ITaskList {
+  orderId: string // 委托书编号
+  sampleId: string // 样品唯一标识
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderNo: string // 委托书编号
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  isUrgent: number // 是否加急
+  isUrgentName?: string // 是否加急
+  requireOverTime: string // 应检完时间
+  sampleBelong: string // 样品属性
+  sampleBelongName: string // 样品属性
+  currentMeasureState: string // 当前检定环节
+  currentMeasureStateName: string // 当前检定环节
+  alreadyCertifications: number // 已出具证书总数
+  requireCertifications: number // 应出具证书总数
+  distributeState: string // 分发性质-初次分发、退回分发
+  handOutProperty: string // 分发性质-初次分发、退回分发
+  id?: string // 实验室id
+}
+
+// 实验室检测/我的检测列表
+export interface IlabMeasureList extends ITaskList {
+  id: string // 实验室检测id
+  measurePersonId: string // 检测人id
+  measureSegmentId: string // 检测部门id
+  currentSegmentId: string // 检测部门id (新)
+}
+
+// 全部检测流程节点
+export interface ISchedule {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications: number // 应出具证书总数
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: string // 流程更新时间
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
+  distributePerson: string // 分配人
+  distributeTime: string // 分配时间
+  startTime: string // 检定开始时间
+  overTime: string // 检定完成时间
+}
+// 检测流程节点
+export interface IScheduleSet {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications: number // 应出具证书总数
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: string // 流程更新时间
+  measureSequence?: string // 检测顺序
+}
+// 退回流程节点
+export interface IScheduleBack {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications?: number // 应出具证书总数
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
+}
+
+// 样品检测信息
+export interface ISampleMeasure {
+  id: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  manufacturingNo: string // 出厂编号
+  customerNo: string // 委托方代码
+  customerId: string // 委托方id
+  customerName: string // 委托方名称
+  phone: string // 委托方电话
+  postalCode: string // 委托方邮编
+  customerAddress: string // 委托方地址
+  measureCategory: string // 检校类别
+  manufacturer: string // 生产厂家
+  manufacturerCountry: string // 厂家国别
+  manufacturingDate: string // 出厂年月
+  abc: string // ABC
+  measurePeriod: string // 检定周期
+  minioFileName: string // 说明书
+  labelBind: string // 标签绑定
+  measureType: string // 检定方式
+  measureTypeName: string // 检定方式
+  measureLastTime?: string // 检定日期
+  validDeadline: string // 有效日期
+  powerVoltage: string // 电源电压
+  sampleBelong: string // 样品所属
+  sampleBelongName: string // 样品所属
+  remark: string // 备注
+}
+
+export interface ITaskDetail {
+  measureContent: string // 检定项目
+  measureProcessList: ISchedule[] // 检定流程
+  measureSendBackList: ISchedule[] // 退回信息
+  remark: string // 备注
+  orderId: string // 委托单id
+  orderCode: string // 委托单编号
+  certifications: string // 证书类别
+  planDeliverTime: string // 预约送达时间
+  requireOverTime: string // 要求检完时间
+  specialRequire: string // 客户特殊要求
+  deliverer: string // 送检人
+  delivererTel: string // 送检人联系方式
+}
+
+// 退回
+export interface ISendBack {
+  id: string // 实验室检测id
+  measurePersonId: string // 检定人员id
+  measureSegmentId: string //	检定环节，实验室id
+  operateReason: string // 退回原因
+  orderId: string // 委托书id
+  sampleId: string //	样品id
+}
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index 0efec98..99a6852 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -141,7 +141,6 @@
 // 点击详情
 const handleDetail = (row: ITaskList) => {
   console.log('跳转任务分发详情')
-
   $router.push(`/schedule/task/distribute/${row.sampleId}?order=${row.orderId}`)
 }
 
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 6ad9900..dbaa437 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -83,11 +83,7 @@
     text: '申请时间',
     value: 'time',
     align: 'center',
-  },
-  {
-    text: '审批状态',
-    value: 'approvalStatusName',
-    align: 'center',
+    width: 160,
   },
 ]) // 表格
 // 数据查询
@@ -456,6 +452,16 @@
           </el-table-column>
         </template>
         <template #columns>
+          <el-table-column v-if="activeTitle === '已归还'" label="归还时间" width="160" align="center">
+            <template #default="scope">
+              {{ scope.row.backTime }}
+            </template>
+          </el-table-column>
+          <el-table-column label="审批状态" width="120" align="center">
+            <template #default="scope">
+              {{ scope.row.approvalStatusName }}
+            </template>
+          </el-table-column>
           <el-table-column label="操作" align="center" :width="activeTitle === '待借用' ? '130' : activeTitle === '已借用' ? '110' : '80'">
             <template #default="{ row }">
               <el-button size="small" type="primary" link @click="detail(row)">
diff --git a/src/views/device/borrow/editHandle.vue b/src/views/device/borrow/editHandle.vue
index 9a5b2a6..4e0bc5c 100644
--- a/src/views/device/borrow/editHandle.vue
+++ b/src/views/device/borrow/editHandle.vue
@@ -26,6 +26,7 @@
   applyUnit: '', // 申请单位
   applyPerson: '', // 申请人
   time: '', // 借用时间
+  backTime: '', // 归还时间
   applyDesc: '', // 申请说明
 })
 const list = ref<IdeviceList[]>([])// 表格数据
@@ -163,7 +164,18 @@
                     />
                   </el-form-item>
                 </el-col>
-                <el-col :span="12">
+                <el-col :span="6">
+                  <el-form-item label="归还时间" prop="backTime">
+                    <el-date-picker
+                      v-model="form.backTime"
+                      type="datetime"
+                      format="YYYY-MM-DD hh:mm"
+                      value-format="YYYY-MM-DD hh:mm"
+                      disabled
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="18">
                   <el-form-item label="申请说明" prop="applyDesc">
                     <el-input v-model="form.applyDesc" type="textarea" disabled autosize />
                   </el-form-item>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 2ab77ef..3f90519 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -38,6 +38,7 @@
 const isDetail = ref(false)
 const ruleForm = ref<fixedAssetsType>({
   assetNo: '', // 资产编号
+  compulsoryVerification: '', // 强制检定
   assetType: '', // 资产类型
   assetSource: '', // 资产来源
   equipmentNo: '', // 设备编号
@@ -486,6 +487,14 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
+          <el-form-item label="强制检定" prop="compulsoryVerification">
+            <el-select v-model="ruleForm.compulsoryVerification" :placeholder="title === 'detail' ? '' : '强制检定'" :disabled="title === 'detail'" style="width: 100%;">
+              <el-option label="是" value="1" />
+              <el-option label="否" value="0" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
           <el-form-item label="检定周期(月)" prop="mesureCycle">
             <el-input-number v-model="ruleForm.mesureCycle" :min="12" :max="60" :step="12" :disabled="title === 'detail'" />
             <!-- <el-select v-model="ruleForm.mesureCycle" :placeholder="title === 'detail' ? '' : '检定周期'" clearable style="width: 100%;">
@@ -509,7 +518,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="使用人" prop="usePerson">
-            <el-select v-model="ruleForm.usePerson" :placeholder="title === 'detail' ? '' : '使用人'" :disabled="title === 'detail'" style="width: 100%;">
+            <el-select v-model="ruleForm.usePerson" filterable :placeholder="title === 'detail' ? '' : '使用人'" :disabled="title === 'detail'" style="width: 100%;">
               <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
             </el-select>
           </el-form-item>

diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index b21ad07..cf4a5b9 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -260,6 +260,19 @@
         },
       },
       {
+        path: 'myMeasureDetail/:role/:id',
+        name: 'MyMeasureDetail',
+        component: () => import('@/views/business/lab/myMeasure/measureDetail.vue'),
+        meta: {
+          title: '我的检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          auth: '/lab/myMeasure',
+          activeMenu: '/lab/myMeasureList',
+        },
+      },
+      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -270,6 +283,19 @@
         },
       },
       {
+        path: 'myMeasureDetail/:role/:id',
+        name: 'MyMeasureDetail',
+        component: () => import('@/views/business/lab/myMeasure/measureDetail.vue'),
+        meta: {
+          title: '部门检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          auth: '/lab/deptMeasureList',
+          activeMenu: '/lab/deptMeasureList',
+        },
+      },
+      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 066f192..7a6ebea 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -102,8 +102,9 @@
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
-          localStorage.removeItem('name')
           localStorage.removeItem('token')
+          localStorage.removeItem('nameId')
+          localStorage.removeItem('depId')
           this.username = ''
           this.token = ''
           this.roleList = []
@@ -121,7 +122,8 @@
               this.roleList = res.data.roleIds
               this.roleNames = res.data.roleNames
               this.roleTips = res.data.roleTips
-              localStorage.setItem('name', res.data.name)
+              localStorage.setItem('nameId', res.data.id)
+              localStorage.setItem('depId', res.data.deptId)
             }
             else {
               reject('该用户无角色')
diff --git a/src/views/business/board/overdueReminder/detail.vue b/src/views/business/board/overdueReminder/detail.vue
index 92987d1..0239b71 100644
--- a/src/views/business/board/overdueReminder/detail.vue
+++ b/src/views/business/board/overdueReminder/detail.vue
@@ -5,7 +5,7 @@
 import { ref } from 'vue'
 import dayjs from 'dayjs'
 import ProcessConfig from '@/views/business/schedule/task/components/processConfig.vue'
-import type { ISampleMeasure, ITaskDetail } from '@/views/business/schedule/task/task-interface'
+import type { ISampleMeasure, ITaskDetail } from '@/views/business/schedule/task/task-interface.js'
 import type { Menu, SimpleCertification, SimpleMeasureRecord, dictType } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getTaskDetail } from '@/api/business/schedule/task'
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index d6cc168..05fd811 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -4,8 +4,8 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import DistributeDialog from '../../schedule/task/components/distributeDialog.vue'
 import RollbackDialog from './../components/rollbackDialog.vue'
-import DistributeDialog from './../components/distributeDialog.vue'
 import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
@@ -131,7 +131,8 @@
 const depId = ref('')
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
+  $router.push(`myMeasureDetail/detail/${row.sampleId}?order=${row.orderId}`)
+  // $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
diff --git a/src/views/business/lab/myMeasure/components/chooseLab.vue b/src/views/business/lab/myMeasure/components/chooseLab.vue
new file mode 100644
index 0000000..0dcebfc
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/chooseLab.vue
@@ -0,0 +1,203 @@
+<script setup lang="ts" name="ChooseLab">
+// 选择实验室
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { ILabList, ILabSearchQuery } from '@/views/business/schedule/task/components/lab-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getOrganizeList } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
+const emits = defineEmits(['confirmCheckout'])
+// 是否多选
+const multi = ref(false)
+const dialogVisible = ref(false)
+
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
+// 查询条件
+const listQuery = ref<ILabSearchQuery>({
+  organizeNo: '', // 实验室编号
+  organizeName: '', // 实验室名称
+  meterMajor: '', // 专业
+  organizeType: '3', // 组织类型
+  director: '', // 负责人
+  isLab: '1', // 是否是实验室
+  createStartTime: '',
+  createEndTime: '',
+})
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '实验室名称', value: 'organizeName', width: '160', align: 'center' },
+  // { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
+  { text: '负责人', value: 'director', align: 'center', width: '120' },
+  { text: '计量专业', value: 'meterMajorName', align: 'center' },
+  { text: '实验室能力', value: 'labCapacityName', align: 'center' },
+])
+// 表格数据
+const list = ref<ILabList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 多选的内容
+const checkoutList = ref<ILabList[]>([])
+// 单选
+const singleChecked = ref()
+// 数据查询
+function fetchData(isNowPage = false) {
+  getOrganizeList(listQuery.value).then((response) => {
+    list.value = response.data
+    total.value = parseInt(response.data.length)
+    loadingTable.value = false
+  })
+  loadingTable.value = false
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    organizeNo: '', // 实验室编号
+    organizeName: '', // 实验室名称
+    meterMajor: '', // 专业
+    organizeType: '3', // 组织类型
+    director: '', // 负责人
+    isLab: '1', // 是否是实验室
+    createStartTime: '',
+    createEndTime: '',
+  }
+}
+
+// 点击取消
+const cancle = () => {
+  dialogVisible.value = false
+}
+// 点击确定
+const clickConfirm = () => {
+  // 如果多选
+  if (multi.value) {
+    if (!checkoutList.value.length) {
+      ElMessage({
+        message: '请选择至少一个实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      emits('confirmCheckout', checkoutList.value)
+    }
+  }
+  else {
+    if (!singleChecked.value) {
+      ElMessage({
+        message: '请选择检定实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      const checkValue = list.value.find(item => item.id == singleChecked.value)
+      emits('confirmCheckout', checkValue)
+    }
+  }
+
+  cancle()
+}
+
+// 初始化弹窗
+const initDialog = (multiSelect: boolean) => {
+  multi.value = multiSelect
+  dialogVisible.value = true
+  fetchData()
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <div class="choose-lab-dialog">
+    <el-dialog v-model="dialogVisible" :title="`选择检定实验室${(checkoutList.length > 0 && multi) ? `(已选择${checkoutList.length}个实验室)` : ''}`" width="1000" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.organizeName"
+            placeholder="实验室名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-select
+            v-model.trim="listQuery.meterMajor"
+            clearable
+            placeholder="计量专业"
+          >
+            <el-option
+              v-for="item in measureMajorList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <div style="padding: 5px 10px;">
+        <normal-table
+          :data="list"
+          :total="total"
+          :columns="columns"
+          :query="listQuery"
+          :list-loading="loadingTable"
+          :pagination="false"
+          size="small"
+          @multi-select="handleSelectionChange"
+        >
+          <!-- :is-showmulti-select="multi" -->
+          <!-- :is-multi="multi" -->
+          <template v-if="!multi" #preColumns>
+            <el-table-column label="#" width="55" align="center" fixed="left">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="" width="40" align="center" fixed>
+              <template #default="scope">
+                <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </div>
+
+      <template #footer>
+        <el-button type="primary" @click="clickConfirm">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.choose-lab-dialog {
+  :deep(.el-radio__label) {
+    display: none;
+  }
+}
+</style>
diff --git a/src/views/business/lab/myMeasure/components/lab-interface.ts b/src/views/business/lab/myMeasure/components/lab-interface.ts
new file mode 100644
index 0000000..02b0d1d
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/lab-interface.ts
@@ -0,0 +1,29 @@
+// 查询参数类型
+export interface ILabSearchQuery {
+  organizeNo: string // 组织编号
+  organizeName: string // 名称
+  organizeType: string // 类型-3科室
+  isLab: '1' // 是否是实验室
+  director: string // 负责人
+  meterMajor: string // 专业
+  createStartTime: '' // 创建开始时间
+  createEndTime: '' // 创建结束事假
+}
+
+// 部门返回值对象类型
+export interface ILabList {
+  id: string
+  deptId: string // 部门id
+  director: string // 负责人名称
+  phone: string // 负责人电话
+  meterMajor: string // 计量专业
+  organizeNo: string // 实验室编号
+  organizeName: string // 实验室名称
+  measureItems: string // 全部检测能力
+  pDeptId: string // 所属部门
+  pDeptName: string // 所属部门
+  organizeType: string // 组织类型
+  remark?: string // 备注
+  createTime?: string // 创建时间
+  updateTime?: string // 更新时间
+}
diff --git a/src/views/business/lab/myMeasure/components/processConfig.vue b/src/views/business/lab/myMeasure/components/processConfig.vue
new file mode 100644
index 0000000..bb66076
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/processConfig.vue
@@ -0,0 +1,161 @@
+<script setup lang="ts" name="ProcessConfig">
+import { ref } from 'vue'
+import draggable from 'vuedraggable'
+import { ElMessage } from 'element-plus'
+import type { ISchedule, IScheduleSet } from '../task-interface'
+import ProcessNode from './processNode.vue'
+import ProcessNodeAdd from './processNodeAdd.vue'
+import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
+import { setMeasureProcess, setMeasureProcessByFfy } from '@/api/business/schedule/task'
+const props = defineProps({
+  type: {
+    type: String,
+    default: 'distribute',
+  }, // 类型，决定调用哪个接口
+  // 是否为详情展示页面
+  detail: {
+    type: Boolean,
+    default: false,
+  },
+  // 样品id
+  sampleId: {
+    type: String,
+    required: true,
+  },
+  // 委托单id
+  orderId: {
+    type: String,
+    required: true,
+  },
+  list: {
+    type: Array,
+    default: () => [],
+  },
+})
+const emits = defineEmits(['saveOver'])
+// 默认流程节点
+const defaultProcess: IScheduleSet = {
+  measurePersonId: '', // 执行人
+  measurePerson: '', // 执行人名称
+  measureSegmentId: '', // 执行部门
+  measureSegment: '', // 执行部门名称
+  executiveItem: '', // 检定项目
+  // alreadyCertifications: 0, // 已出具证书总数
+  requireCertifications: 1, // 应出具证书总数
+  measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: '', // 流程更新时间
+}
+// 检定流程列表
+const processList = ref<IScheduleSet[]>([
+  { ...defaultProcess },
+])
+
+watch(() => props.list, (val) => {
+  if (props.list.length > 0) {
+    processList.value = props.list as ISchedule[]
+  }
+},
+{ deep: true, immediate: true })
+
+// 点击添加流程
+const processAdd = () => {
+  processList.value.push({ ...defaultProcess })
+}
+// 检查是否允许移动
+const checkMove = (evt: any) => {
+  // 目的位置元素evt.relatedContext.element
+  // 当前拖动元素evt.draggedContext.element
+  if (evt.relatedContext.element.measureState !== '0') {
+    return false
+  }
+  return true
+}
+
+// 选择实验室弹窗
+const chooseLabDialog = ref()
+// 批量添加流程
+const batchProcessAdd = () => {
+  chooseLabDialog.value.initDialog(true)
+}
+
+// 批量添加实验室
+const batchChooseOver = (labs: ILabList[]) => {
+  for (const item of labs) {
+    const processTemp: IScheduleSet = {
+      measurePersonId: '', // 执行人
+      measurePerson: '', // 执行人名称
+      measureSegmentId: item.deptId, // 执行部门
+      measureSegment: item.organizeName, // 执行部门名称
+      executiveItem: '', // 检定项目
+      measureSequence: '', // 监测顺序
+      // alreadyCertifications: 0, // 已出具证书总数
+      requireCertifications: 1, // 应出具证书总数
+      measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      updateTime: '', // 流程更新时间
+    }
+    processList.value.push(processTemp)
+  }
+}
+
+// 保存流程
+const saveProcess = () => {
+  const form = {
+    measureProcessList: processList.value,
+    executiveList: processList.value,
+    orderId: props.orderId,
+    sampleId: props.sampleId,
+  }
+  // 处理顺序
+  for (const key in form.measureProcessList) {
+    form.measureProcessList[key].measureSequence = (parseInt(key) + 1).toString()
+  }
+  if (props.type == 'distribute') {
+    setMeasureProcess(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
+  else {
+    setMeasureProcessByFfy(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
+}
+// 删除流程
+const deleteProcess = (index: number) => {
+  processList.value.splice(index, 1)
+}
+
+// --------暴露方法
+defineExpose({ saveProcess, batchProcessAdd, deleteProcess })
+</script>
+
+<template>
+  <div>
+    <div class="process-container">
+      <draggable v-model="processList" item-key="id" class="process-draggable" handle=".handle" :move="checkMove">
+        <!-- eslint-disable-next-line vue/no-unused-vars -->
+        <template #item="{ process, index }">
+          <process-node v-model="processList[index]" :step="index + 1" :detail="props.detail" @delete="deleteProcess(index)" />
+        </template>
+        <template #footer>
+          <process-node-add v-if="!props.detail" @click="processAdd" />
+        </template>
+      </draggable>
+    </div>
+    <choose-lab ref="chooseLabDialog" @confirm-checkout="batchChooseOver" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.process-container {
+  .process-draggable {
+    display: flex;
+    flex-wrap: wrap;
+  }
+}
+</style>
diff --git a/src/views/business/lab/myMeasure/components/processNode.vue b/src/views/business/lab/myMeasure/components/processNode.vue
new file mode 100644
index 0000000..fad76ab
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/processNode.vue
@@ -0,0 +1,215 @@
+<script lang="ts" setup name="ProcessNode">
+import {
+  Aim, Rank, Remove,
+} from '@element-plus/icons-vue'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
+// 逻辑代码
+const props = defineProps({
+  // 默认数据
+  modelValue: {
+    type: Object,
+    default: () => {
+      return {
+        measurePersonId: '', // 执行人
+        measurePerson: '', // 执行人名称
+        measureSegmentId: '', // 执行部门
+        measureSegment: '', // 执行部门名称
+        executiveItem: '', // 检定项目
+        alreadyCertifications: 0, // 已出具证书总数
+        requireCertifications: 0, // 应出具证书总数
+        measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        updateTime: '', // 流程更新时间
+      }
+    },
+  },
+  // 是否为详情展示页面
+  detail: {
+    type: Boolean,
+    default: false,
+  },
+  // 步骤
+  step: {
+    type: Number,
+    default: 1,
+  },
+})
+const emit = defineEmits(['update:modelValue', 'delete'])
+
+// ------------定义props参数----------
+const processNodeData = computed({
+  get() {
+    return props.modelValue
+  },
+  set(value) {
+    emit('update:modelValue', value)
+  },
+})
+// 检定环节可编辑-只有待分发状态可编辑
+const deptEdit = computed(() => {
+  const editStates = ['']
+  return editStates.includes(processNodeData.value.measureStatus)
+})
+// 检定人可编辑-待分配状态可编辑
+const personEdit = computed(() => {
+  const editStates = ['', '1', '2']
+  return editStates.includes(processNodeData.value.measureStatus)
+})
+// 证书可编辑-待分发、待分配、待检测状态可编辑
+const certificationEdit = computed(() => {
+  const editStates = ['', '1', '2', '3']
+  return editStates.includes(processNodeData.value.measureStatus)
+})
+// 节点可移动
+const canMove = computed(() => {
+  const editStates = ['', '1']
+  return editStates.includes(processNodeData.value.measureStatus)
+})
+
+// 选择人员
+const choosePersonShow = ref(false)
+const choosePerson = () => {
+  choosePersonShow.value = true
+}
+// 人员选择完毕
+const choosePersonOver = (person: { id: string; name: string }) => {
+  processNodeData.value.measurePersonId = person.id
+  processNodeData.value.measurePerson = person.name
+  choosePersonShow.value = false
+}
+
+// 选择实验室
+const chooseLabDialog = ref()
+const clickChoose = () => {
+  chooseLabDialog.value.initDialog(false)
+}
+const _selectStaffDialog = ref()
+// 实验室选择完毕
+const chooseOver = (lab: ILabList) => {
+  console.log(lab)
+  processNodeData.value.measureSegmentId = lab.deptId
+  processNodeData.value.measureSegment = lab.organizeName
+  // 定义一个对象关联上子组件的 ref 值（注意：这里的属性名必须跟子组件定义的 ref 值一模一样，否者会关联失效）
+  // 延迟使用，因为还没挂载
+  nextTick(() => {
+    _selectStaffDialog.value.fetchData()
+  })
+}
+
+// 移除该节点
+const deleteNode = () => {
+  emit('delete')
+}
+</script>
+
+<template>
+  <div class="process-node">
+    <div class="header">
+      <div class="step">
+        {{ props.step }}
+      </div>
+      <div class="buttons">
+        <el-icon v-show="canMove && !props.detail" class="icon-button" title="移除" @click="deleteNode">
+          <remove />
+        </el-icon>
+        <el-icon v-show="canMove && !props.detail" class="icon-button handle" title="移动">
+          <rank />
+        </el-icon>
+      </div>
+    </div>
+    <div>
+      <div class="line">
+        <span class="label">检定环节</span>
+        <el-input v-model="processNodeData.measureSegment" class="process-input" readonly size="small" :disabled="!deptEdit || props.detail">
+          <template v-if="deptEdit && !props.detail" #append>
+            <el-button :icon="Aim" size="small" link @click="clickChoose" />
+          </template>
+        </el-input>
+      </div>
+      <div class="line">
+        <span class="label">检定人员</span>
+        <el-input v-model="processNodeData.measurePerson" readonly class="process-input" size="small" :disabled="!personEdit || props.detail">
+          <template v-if="personEdit && !props.detail" #append>
+            <el-button :icon="Aim" size="small" link :disabled="processNodeData.measureSegment === ''" @click="choosePerson" />
+          </template>
+        </el-input>
+      </div>
+      <div class="line">
+        <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit || props.detail" /><span class="unit"> 份</span>
+      </div>
+      <div class="line">
+        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStatusName }}</span>
+      </div>
+      <div class="line">
+        <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
+      </div>
+    </div>
+    <!-- 选择实验室弹窗 -->
+    <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
+    <!-- 成员弹框 -->
+    <select-staff-dialog ref="_selectStaffDialog" v-model:visible="choosePersonShow" :data="[processNodeData.measurePersonId]" :dept-id="processNodeData.measureSegmentId" :dept-name="processNodeData.measureSegment" :multi="false" @change="choosePersonOver" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.process-node {
+  // display: inline-block;
+  margin-right: 10px;
+  width: 280px;
+  height: 215px;
+  border: 1px solid #e0e0e0;
+  padding: 5px 15px;
+  border-radius: 5px;
+  background-color: #fafafa;
+  margin-bottom: 10px;
+
+  .header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+    .step {
+      line-height: 28px;
+      font-size: 16px;
+      color: #3d7eff;
+      font-weight: bold;
+      margin-bottom: 5px;
+    }
+
+    .icon-button {
+      color: #999;
+      margin-left: 5px;
+      font-size: 16px;
+
+      &:hover {
+        cursor: pointer;
+      }
+    }
+  }
+
+  .line {
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 4px 0;
+
+    .label {
+      width: 80px;
+      font-size: 14px;
+    }
+
+    .process-input {
+      flex: 1;
+      font-size: 14px;
+    }
+
+    .unit {
+      margin-left: 5px;
+      font-size: 14px;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/lab/myMeasure/components/processNodeAdd.vue b/src/views/business/lab/myMeasure/components/processNodeAdd.vue
new file mode 100644
index 0000000..d7aeea0
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/processNodeAdd.vue
@@ -0,0 +1,46 @@
+<script lang="ts" setup name="ProcessNodeAdd">
+const emit = defineEmits(['click'])
+const add = () => {
+  emit('click')
+}
+</script>
+
+<template>
+  <div class="process-node" @click="add">
+    <div class="add">
+      <el-icon class="add-icon">
+        <plus />
+      </el-icon>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.process-node {
+  // display: inline-block;
+  width: 280px;
+  height: 215px;
+  border: 1px dashed #e0e0e0;
+  padding: 5px 15px;
+  border-radius: 5px;
+  background-color: #fbfbfb;
+
+  &:hover {
+    cursor: pointer;
+    background-color: #f5f5f5;
+  }
+
+  .add {
+    height: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    .add-icon {
+      vertical-align: middle;
+      font-size: 100px;
+      color: #999;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/lab/myMeasure/measureDetail.vue b/src/views/business/lab/myMeasure/measureDetail.vue
new file mode 100644
index 0000000..1a88be8
--- /dev/null
+++ b/src/views/business/lab/myMeasure/measureDetail.vue
@@ -0,0 +1,601 @@
+<!-- 任务分发 -->
+<script lang="ts" setup name="TaskEdit">
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance } from 'element-plus'
+import { ref } from 'vue'
+import ProcessConfig from './components/processConfig.vue'
+import type { ISampleMeasure, ITaskDetail } from './task-interface'
+import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { getTaskDetail } from '@/api/business/schedule/task'
+import countries from '@/components/AddressSelect/country-code.json'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+interface dictType {
+  id: string
+  name: string
+  value: string
+}
+const roleType = ref('distribute') // 角色类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员),
+const countryList = ref(countries) // 国家列表
+const loading = ref(false) // 表单加载状态
+const sampleId = ref('') // 样品详情id
+const orderId = ref('') // 委托书id
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const mesureTypeList = ref<dictType[]>([]) // 检定方式
+const $route = useRoute()
+
+// 获取字典值
+function getDict() {
+  // 获取样品属性
+  getDictByCode('measureCategory').then((response) => {
+    mesureCategoryList.value = response.data
+  })
+  // 获取样品属性
+  getDictByCode('measureType').then((response) => {
+    mesureTypeList.value = response.data
+  })
+}
+getDict()
+
+// 基本信息表单
+const sampleForm = ref<ISampleMeasure>({
+  id: '', // 样品id
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 样品型号
+  manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  phone: '', // 委托方电话
+  postalCode: '', // 委托方邮编
+  customerAddress: '', // 委托方地址
+  measureCategory: '', // 检校类别
+  manufacturer: '', // 生产厂家
+  manufacturerCountry: '', // 厂家国别
+  manufacturingDate: '', // 出厂年月
+  abc: '', // ABC
+  measurePeriod: '', // 检定周期
+  remark: '', // 备注
+  minioFileName: '', // 说明书
+  labelBind: '', // 标签绑定
+  measureType: '1', // 检定方式  1自检、2外包、3外检
+  measureTypeName: '', // 检定方式
+  measureLastTime: '', // 检定日期
+  validDeadline: '', // 有效日期
+  powerVoltage: '', // 电源电压
+  sampleBelong: '', // 样品所属
+  sampleBelongName: '', // 样品所属
+})
+const taskForm = ref <ITaskDetail> ({
+  measureContent: '', // 检定项目
+  specialRequire: '', // 客户特殊要求
+  orderId: '', // 委托单id
+  orderCode: '', // 委托单编号
+  certifications: '', // 证书类别
+  planDeliverTime: '', // 预约送达时间
+  requireOverTime: '', // 要求检完时间
+  measureProcessList: [], // 检定流程
+  measureSendBackList: [], // 退回信息
+  remark: '', // 备注
+  deliverer: '', // 送检人
+  delivererTel: '', // 送检人联系方式
+})
+const ruleFormRef = ref<FormInstance>()
+
+// 自定义校验规则--检定周期为正整数
+const validateMesurePeriod = (rule: any, value: any, callback: any) => {
+  if (value === '') {
+    callback()
+  }
+  else if (!(/(^[1-9]\d*$)/.test(value))) {
+    callback(new Error('请输入一个正整数'))
+  }
+  else {
+    callback()
+  }
+}
+
+// 校验规则
+const rules = ref({
+  mesurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
+}) // 表单验证规则
+
+// 其他关联数据列表
+const dataList = ref({
+  measureRecords: [] as SimpleMeasureRecord[],
+  certificationRecords: [] as SimpleCertification[],
+})
+
+// 获取检定记录
+const fetchMeasureRecords = function (query = null) {
+  dataList.value.measureRecords = []
+}
+// 获取检定证书
+const fetchCertifications = function (query = null) {
+  dataList.value.certificationRecords = []
+}
+interface Menu {
+  name: string
+  columns: TableColumn[]
+  pagination: boolean
+  list: 'measureRecords' | 'certificationRecords'
+  searchFunc: Function
+}
+// 菜单
+const menu: Menu[] = [
+  {
+    name: '检定记录',
+    columns: [
+      { text: '委托单编号', value: 'orderCode' },
+      { text: '委托单日期', value: 'orderTime' },
+      { text: '委托方代码', value: 'customerCode' },
+      { text: '委托方名称', value: 'customerName' },
+      { text: '送检人', value: 'deliverer' },
+      { text: '送检日期', value: 'deliverTime' },
+    ],
+    list: 'measureRecords',
+    pagination: true,
+    searchFunc: fetchMeasureRecords,
+  },
+  {
+    name: '检定证书',
+    columns: [
+      { text: '证书编号', value: 'certificationCode' },
+      { text: '证书名称', value: 'certificationName' },
+      { text: '证书类型', value: 'certificationType' },
+      { text: '证书出具日期', value: 'effectiveDate' },
+      { text: '证书有效期', value: 'expirationDate' },
+    ],
+    list: 'certificationRecords',
+    pagination: true,
+    searchFunc: fetchCertifications,
+  },
+]
+
+const currentMenu = ref('证书监控')
+const currentMenuObj = computed(() => {
+  return menu.find(item => item.name === currentMenu.value)
+})
+
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 打印表单
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '样品详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>样品详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+// 保存样品信息
+function saveForm(formEl: FormInstance | undefined) {
+  if (!formEl) { return }
+  formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认修改样品信息吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (sampleForm.value.id) {
+          updateSample(sampleForm.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+      })
+    }
+  })
+}
+// 获取详情
+const getSampleInfo = () => {
+  getSapmleDetail({ id: sampleId.value }).then((res) => {
+    sampleForm.value = res.data
+  })
+}
+// 获取分发详情
+const getInfo = () => {
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    taskForm.value.specialRequire = res.data.specialRequire // 客户特殊要求
+    taskForm.value.deliverer = res.data.deliverer // 送检人
+    taskForm.value.delivererTel = res.data.delivererTel // 送检人联系方式
+    taskForm.value.measureContent = res.data.measureContent // 检定项目
+    taskForm.value.measureProcessList = res.data.measureProcessList // 检定流程
+    taskForm.value.measureSendBackList = res.data.measureSendBackList // 退回流程
+    console.log('pppppp')
+    console.log(taskForm.value.measureProcessList)
+
+    // 改用一个接口获取
+    sampleForm.value = res.data
+  })
+}
+
+// 点击标签绑定的扫描
+const startScan = () => {
+  // TODO
+}
+
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
+}
+// 保存流程按钮点击
+const saveProcess = () => {
+  processConfigRef.value.saveProcess()
+}
+
+// 文件上传
+const fileRef = ref()
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    // UploadFile(fd).then((res) => {
+    //   if (res.code === 200) {
+    //     sampleForm.value.minioFileName = res.data[0]
+    //     // 重置当前验证
+    //     ElMessage.success('文件上传成功')
+    //   }
+    //   else {
+    //     ElMessage.error(res.message)
+    //   }
+    // })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+onMounted(() => {
+  console.log($route)
+  // 从路由中获取页面类型参数
+  if ($route.params && $route.params.role) {
+    roleType.value = $route.params.role as string // 使用角色
+  }
+  if ($route.params.id) {
+    sampleId.value = $route.params.id as string
+    orderId.value = $route.query.order as string
+    // 获取分发详情
+    getInfo()
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="样品详情">
+      <template #btns>
+        <el-button v-if="roleType === 'detail'" v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <!-- <el-button v-if="roleType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button> -->
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <div id="form">
+        <el-form
+          ref="ruleFormRef"
+          :model="sampleForm"
+          :label-width="120"
+          label-position="right"
+          :rules="rules"
+        >
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="样品编号:" prop="sampleNo">
+                <el-input
+                  v-model="sampleForm.sampleNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品名称:" prop="sampleName">
+                <el-input
+                  v-model="sampleForm.sampleName"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品型号:" prop="sampleModel">
+                <el-input
+                  v-model="sampleForm.sampleModel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂编号:" prop="manufacturingNo">
+                <el-input
+                  v-model="sampleForm.manufacturingNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方代码" prop="customerNo">
+                <el-input
+                  v-model="sampleForm.customerNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方名称" prop="customerName">
+                <el-input
+                  v-model="sampleForm.customerName"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方电话" prop="phone">
+                <el-input
+                  v-model="sampleForm.phone"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方电话'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方邮编" prop="postalCode">
+                <el-input
+                  v-model="sampleForm.postalCode"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方邮编'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="18">
+              <el-form-item label="委托方地址:" prop="companyAddress">
+                <el-input
+                  v-model="sampleForm.customerAddress"
+                  type="textarea"
+                  autosize
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方地址'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="校检类别:">
+                <el-select
+                  v-model="sampleForm.measureCategory"
+                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :disabled="roleType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="生产厂家:">
+                <el-input
+                  v-model="sampleForm.manufacturer"
+                  :placeholder="roleType === 'detail' ? '' : '请输入生产厂家'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="厂家国别:">
+                <el-select
+                  v-model="sampleForm.manufacturerCountry"
+                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :disabled="roleType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂年月:">
+                <el-date-picker
+                  v-model="sampleForm.manufacturingDate"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="roleType === 'detail' ? '' : '请输入出厂年月'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="ABC:">
+                <el-select
+                  v-model="sampleForm.abc"
+                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :disabled="roleType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="送检人:">
+                <el-input
+                  v-model="taskForm.deliverer"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="联系方式:">
+                <el-input
+                  v-model="taskForm.delivererTel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="检定项目:" prop="mesureContent">
+                <el-input
+                  v-model="taskForm.measureContent"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  disabled
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检定周期（月）:">
+                <el-input
+                  v-model="sampleForm.measurePeriod"
+                  :placeholder="roleType === 'detail' ? '' : '请输入检定周期'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="备注:">
+                <el-input
+                  v-model="sampleForm.remark"
+                  type="textarea"
+                  :rows="2"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  disabled
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检定方式:">
+                <el-select
+                  v-model="sampleForm.measureType"
+                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :disabled="roleType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of mesureTypeList" :key="item.value" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="标签绑定:">
+                <el-input
+                  v-model="sampleForm.labelBind"
+                  :placeholder="roleType === 'detail' ? '' : '标签绑定'"
+                  :disabled="roleType === 'detail'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                >
+                  <template v-if="roleType !== 'detail'" #append>
+                    <el-button>
+                      扫描
+                    </el-button>
+                  </template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="14">
+              <el-form-item label="说明书:">
+                <show-photo v-if="sampleForm.minioFileName" :minio-file-name="sampleForm.minioFileName" />
+                <span v-else-if="roleType === 'detail'">无</span>
+                <input v-show="roleType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="roleType !== 'detail'" id="file" type="primary" :disabled="roleType === 'detail'" :style="{ 'margin-left': sampleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ sampleForm.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </detail-page>
+    <detail-block v-if="taskForm.measureProcessList && taskForm.measureProcessList.length >= 1" title="检定流程">
+      <!-- <template #btns>
+        <el-button type="primary" style="margin-bottom: 10px;" @click="batchProcessAdd">
+          批量添加
+        </el-button>
+        <el-button type="primary" style="margin-bottom: 10px;" @click="saveProcess">
+          保存
+        </el-button>
+      </template> -->
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" :detail="true" />
+    </detail-block>
+    <!-- 退回流程 -->
+    <detail-block v-if="taskForm.measureSendBackList && taskForm.measureSendBackList.length >= 1" title="退回流程">
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureSendBackList" :sample-id="sampleId" :detail="true" />
+    </detail-block>
+    <!-- 检定记录、检定证书 -->
+    <detail-block-switch :title="currentMenu">
+      <template #menu>
+        <el-radio-group v-model="currentMenu">
+          <el-radio-button label="证书监控">
+            证书监控
+          </el-radio-button>
+          <el-radio-button label="检定记录">
+            检定记录
+          </el-radio-button>
+          <el-radio-button label="检定证书">
+            检定证书
+          </el-radio-button>
+        </el-radio-group>
+      </template>
+      <!-- 证书监控 -->
+      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" />
+      <!-- 检定记录 -->
+      <measure-records v-if="currentMenu === '检定记录'" :sample-id="sampleId" />
+      <!-- 证书记录 -->
+      <certification-records v-if="currentMenu === '检定证书'" :sample-id="sampleId" />
+    </detail-block-switch>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
+
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 62f8830..e4a4637 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -13,7 +13,6 @@
 import { getMyMeasureList, myExecutiveDone, myExecutiveReceive } from '@/api/business/schedule/task'
 import type { dictType } from '@/global'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
-
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
@@ -128,7 +127,7 @@
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`myMeasureDetail/detail/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
diff --git a/src/views/business/lab/myMeasure/task-interface.ts b/src/views/business/lab/myMeasure/task-interface.ts
new file mode 100644
index 0000000..6503a12
--- /dev/null
+++ b/src/views/business/lab/myMeasure/task-interface.ts
@@ -0,0 +1,169 @@
+// 任务列表查询条件
+export interface ITaskQuery {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  orderNo: string // 委托书编号
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  isUrgent: string // 是否加急
+  sampleBelong: string // 样品属性
+  sampleStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
+  limit: number
+  offset: number
+}
+
+// 我的检测/部门检测查询条件
+export interface ILabQuery {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  orderNo: string // 委托书编号
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  isUrgent: string // 是否加急
+  sampleBelong: string // 样品属性
+  measureStatus: string // 分发状态
+  startTime: string | number //	应检定开始时间
+  endTime: string | number //	应检定结束时间
+  limit: number
+  offset: number
+}
+// 任务列表-返回值
+export interface ITaskList {
+  orderId: string // 委托书编号
+  sampleId: string // 样品唯一标识
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderNo: string // 委托书编号
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  isUrgent: number // 是否加急
+  isUrgentName?: string // 是否加急
+  requireOverTime: string // 应检完时间
+  sampleBelong: string // 样品属性
+  sampleBelongName: string // 样品属性
+  currentMeasureState: string // 当前检定环节
+  currentMeasureStateName: string // 当前检定环节
+  alreadyCertifications: number // 已出具证书总数
+  requireCertifications: number // 应出具证书总数
+  distributeState: string // 分发性质-初次分发、退回分发
+  handOutProperty: string // 分发性质-初次分发、退回分发
+  id?: string // 实验室id
+}
+
+// 实验室检测/我的检测列表
+export interface IlabMeasureList extends ITaskList {
+  id: string // 实验室检测id
+  measurePersonId: string // 检测人id
+  measureSegmentId: string // 检测部门id
+  currentSegmentId: string // 检测部门id (新)
+}
+
+// 全部检测流程节点
+export interface ISchedule {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications: number // 应出具证书总数
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: string // 流程更新时间
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
+  distributePerson: string // 分配人
+  distributeTime: string // 分配时间
+  startTime: string // 检定开始时间
+  overTime: string // 检定完成时间
+}
+// 检测流程节点
+export interface IScheduleSet {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications: number // 应出具证书总数
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: string // 流程更新时间
+  measureSequence?: string // 检测顺序
+}
+// 退回流程节点
+export interface IScheduleBack {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications?: number // 应出具证书总数
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
+}
+
+// 样品检测信息
+export interface ISampleMeasure {
+  id: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  manufacturingNo: string // 出厂编号
+  customerNo: string // 委托方代码
+  customerId: string // 委托方id
+  customerName: string // 委托方名称
+  phone: string // 委托方电话
+  postalCode: string // 委托方邮编
+  customerAddress: string // 委托方地址
+  measureCategory: string // 检校类别
+  manufacturer: string // 生产厂家
+  manufacturerCountry: string // 厂家国别
+  manufacturingDate: string // 出厂年月
+  abc: string // ABC
+  measurePeriod: string // 检定周期
+  minioFileName: string // 说明书
+  labelBind: string // 标签绑定
+  measureType: string // 检定方式
+  measureTypeName: string // 检定方式
+  measureLastTime?: string // 检定日期
+  validDeadline: string // 有效日期
+  powerVoltage: string // 电源电压
+  sampleBelong: string // 样品所属
+  sampleBelongName: string // 样品所属
+  remark: string // 备注
+}
+
+export interface ITaskDetail {
+  measureContent: string // 检定项目
+  measureProcessList: ISchedule[] // 检定流程
+  measureSendBackList: ISchedule[] // 退回信息
+  remark: string // 备注
+  orderId: string // 委托单id
+  orderCode: string // 委托单编号
+  certifications: string // 证书类别
+  planDeliverTime: string // 预约送达时间
+  requireOverTime: string // 要求检完时间
+  specialRequire: string // 客户特殊要求
+  deliverer: string // 送检人
+  delivererTel: string // 送检人联系方式
+}
+
+// 退回
+export interface ISendBack {
+  id: string // 实验室检测id
+  measurePersonId: string // 检定人员id
+  measureSegmentId: string //	检定环节，实验室id
+  operateReason: string // 退回原因
+  orderId: string // 委托书id
+  sampleId: string //	样品id
+}
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index 0efec98..99a6852 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -141,7 +141,6 @@
 // 点击详情
 const handleDetail = (row: ITaskList) => {
   console.log('跳转任务分发详情')
-
   $router.push(`/schedule/task/distribute/${row.sampleId}?order=${row.orderId}`)
 }
 
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 6ad9900..dbaa437 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -83,11 +83,7 @@
     text: '申请时间',
     value: 'time',
     align: 'center',
-  },
-  {
-    text: '审批状态',
-    value: 'approvalStatusName',
-    align: 'center',
+    width: 160,
   },
 ]) // 表格
 // 数据查询
@@ -456,6 +452,16 @@
           </el-table-column>
         </template>
         <template #columns>
+          <el-table-column v-if="activeTitle === '已归还'" label="归还时间" width="160" align="center">
+            <template #default="scope">
+              {{ scope.row.backTime }}
+            </template>
+          </el-table-column>
+          <el-table-column label="审批状态" width="120" align="center">
+            <template #default="scope">
+              {{ scope.row.approvalStatusName }}
+            </template>
+          </el-table-column>
           <el-table-column label="操作" align="center" :width="activeTitle === '待借用' ? '130' : activeTitle === '已借用' ? '110' : '80'">
             <template #default="{ row }">
               <el-button size="small" type="primary" link @click="detail(row)">
diff --git a/src/views/device/borrow/editHandle.vue b/src/views/device/borrow/editHandle.vue
index 9a5b2a6..4e0bc5c 100644
--- a/src/views/device/borrow/editHandle.vue
+++ b/src/views/device/borrow/editHandle.vue
@@ -26,6 +26,7 @@
   applyUnit: '', // 申请单位
   applyPerson: '', // 申请人
   time: '', // 借用时间
+  backTime: '', // 归还时间
   applyDesc: '', // 申请说明
 })
 const list = ref<IdeviceList[]>([])// 表格数据
@@ -163,7 +164,18 @@
                     />
                   </el-form-item>
                 </el-col>
-                <el-col :span="12">
+                <el-col :span="6">
+                  <el-form-item label="归还时间" prop="backTime">
+                    <el-date-picker
+                      v-model="form.backTime"
+                      type="datetime"
+                      format="YYYY-MM-DD hh:mm"
+                      value-format="YYYY-MM-DD hh:mm"
+                      disabled
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="18">
                   <el-form-item label="申请说明" prop="applyDesc">
                     <el-input v-model="form.applyDesc" type="textarea" disabled autosize />
                   </el-form-item>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 2ab77ef..3f90519 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -38,6 +38,7 @@
 const isDetail = ref(false)
 const ruleForm = ref<fixedAssetsType>({
   assetNo: '', // 资产编号
+  compulsoryVerification: '', // 强制检定
   assetType: '', // 资产类型
   assetSource: '', // 资产来源
   equipmentNo: '', // 设备编号
@@ -486,6 +487,14 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
+          <el-form-item label="强制检定" prop="compulsoryVerification">
+            <el-select v-model="ruleForm.compulsoryVerification" :placeholder="title === 'detail' ? '' : '强制检定'" :disabled="title === 'detail'" style="width: 100%;">
+              <el-option label="是" value="1" />
+              <el-option label="否" value="0" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
           <el-form-item label="检定周期(月)" prop="mesureCycle">
             <el-input-number v-model="ruleForm.mesureCycle" :min="12" :max="60" :step="12" :disabled="title === 'detail'" />
             <!-- <el-select v-model="ruleForm.mesureCycle" :placeholder="title === 'detail' ? '' : '检定周期'" clearable style="width: 100%;">
@@ -509,7 +518,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="使用人" prop="usePerson">
-            <el-select v-model="ruleForm.usePerson" :placeholder="title === 'detail' ? '' : '使用人'" :disabled="title === 'detail'" style="width: 100%;">
+            <el-select v-model="ruleForm.usePerson" filterable :placeholder="title === 'detail' ? '' : '使用人'" :disabled="title === 'detail'" style="width: 100%;">
               <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
             </el-select>
           </el-form-item>
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index 479ae05..e46753d 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -94,6 +94,7 @@
   { text: '型号', value: 'modelNo', align: 'center' },
   { text: 'ABC', value: 'abc', align: 'center', width: 58 },
   { text: '检定方式', value: 'mesureTypeName', align: 'center', width: 90 },
+  { text: '强制检定', value: 'compulsoryVerification', align: 'center', width: 90 },
   { text: '管理状态', value: 'managerStateName', align: 'center', width: 100 },
   { text: '使用部门', value: 'useDeptName', align: 'center' },
   { text: '使用人', value: 'usePersonName', align: 'center' },
@@ -139,7 +140,10 @@
   }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows
+      list.value = res.data.rows.map((item: any) => {
+        item.validDate = item.validDate.split(' ')[0]
+        return item
+      })
       total.value = res.data.total
     }
     loadingTable.value = false
@@ -403,7 +407,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="120">
+            <el-table-column label="操作" align="center" width="120" fixed="right">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑

diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index b21ad07..cf4a5b9 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -260,6 +260,19 @@
         },
       },
       {
+        path: 'myMeasureDetail/:role/:id',
+        name: 'MyMeasureDetail',
+        component: () => import('@/views/business/lab/myMeasure/measureDetail.vue'),
+        meta: {
+          title: '我的检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          auth: '/lab/myMeasure',
+          activeMenu: '/lab/myMeasureList',
+        },
+      },
+      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -270,6 +283,19 @@
         },
       },
       {
+        path: 'myMeasureDetail/:role/:id',
+        name: 'MyMeasureDetail',
+        component: () => import('@/views/business/lab/myMeasure/measureDetail.vue'),
+        meta: {
+          title: '部门检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          auth: '/lab/deptMeasureList',
+          activeMenu: '/lab/deptMeasureList',
+        },
+      },
+      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 066f192..7a6ebea 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -102,8 +102,9 @@
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
-          localStorage.removeItem('name')
           localStorage.removeItem('token')
+          localStorage.removeItem('nameId')
+          localStorage.removeItem('depId')
           this.username = ''
           this.token = ''
           this.roleList = []
@@ -121,7 +122,8 @@
               this.roleList = res.data.roleIds
               this.roleNames = res.data.roleNames
               this.roleTips = res.data.roleTips
-              localStorage.setItem('name', res.data.name)
+              localStorage.setItem('nameId', res.data.id)
+              localStorage.setItem('depId', res.data.deptId)
             }
             else {
               reject('该用户无角色')
diff --git a/src/views/business/board/overdueReminder/detail.vue b/src/views/business/board/overdueReminder/detail.vue
index 92987d1..0239b71 100644
--- a/src/views/business/board/overdueReminder/detail.vue
+++ b/src/views/business/board/overdueReminder/detail.vue
@@ -5,7 +5,7 @@
 import { ref } from 'vue'
 import dayjs from 'dayjs'
 import ProcessConfig from '@/views/business/schedule/task/components/processConfig.vue'
-import type { ISampleMeasure, ITaskDetail } from '@/views/business/schedule/task/task-interface'
+import type { ISampleMeasure, ITaskDetail } from '@/views/business/schedule/task/task-interface.js'
 import type { Menu, SimpleCertification, SimpleMeasureRecord, dictType } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getTaskDetail } from '@/api/business/schedule/task'
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index d6cc168..05fd811 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -4,8 +4,8 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import DistributeDialog from '../../schedule/task/components/distributeDialog.vue'
 import RollbackDialog from './../components/rollbackDialog.vue'
-import DistributeDialog from './../components/distributeDialog.vue'
 import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
@@ -131,7 +131,8 @@
 const depId = ref('')
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
+  $router.push(`myMeasureDetail/detail/${row.sampleId}?order=${row.orderId}`)
+  // $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
diff --git a/src/views/business/lab/myMeasure/components/chooseLab.vue b/src/views/business/lab/myMeasure/components/chooseLab.vue
new file mode 100644
index 0000000..0dcebfc
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/chooseLab.vue
@@ -0,0 +1,203 @@
+<script setup lang="ts" name="ChooseLab">
+// 选择实验室
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { ILabList, ILabSearchQuery } from '@/views/business/schedule/task/components/lab-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getOrganizeList } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
+const emits = defineEmits(['confirmCheckout'])
+// 是否多选
+const multi = ref(false)
+const dialogVisible = ref(false)
+
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
+// 查询条件
+const listQuery = ref<ILabSearchQuery>({
+  organizeNo: '', // 实验室编号
+  organizeName: '', // 实验室名称
+  meterMajor: '', // 专业
+  organizeType: '3', // 组织类型
+  director: '', // 负责人
+  isLab: '1', // 是否是实验室
+  createStartTime: '',
+  createEndTime: '',
+})
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '实验室名称', value: 'organizeName', width: '160', align: 'center' },
+  // { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
+  { text: '负责人', value: 'director', align: 'center', width: '120' },
+  { text: '计量专业', value: 'meterMajorName', align: 'center' },
+  { text: '实验室能力', value: 'labCapacityName', align: 'center' },
+])
+// 表格数据
+const list = ref<ILabList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 多选的内容
+const checkoutList = ref<ILabList[]>([])
+// 单选
+const singleChecked = ref()
+// 数据查询
+function fetchData(isNowPage = false) {
+  getOrganizeList(listQuery.value).then((response) => {
+    list.value = response.data
+    total.value = parseInt(response.data.length)
+    loadingTable.value = false
+  })
+  loadingTable.value = false
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    organizeNo: '', // 实验室编号
+    organizeName: '', // 实验室名称
+    meterMajor: '', // 专业
+    organizeType: '3', // 组织类型
+    director: '', // 负责人
+    isLab: '1', // 是否是实验室
+    createStartTime: '',
+    createEndTime: '',
+  }
+}
+
+// 点击取消
+const cancle = () => {
+  dialogVisible.value = false
+}
+// 点击确定
+const clickConfirm = () => {
+  // 如果多选
+  if (multi.value) {
+    if (!checkoutList.value.length) {
+      ElMessage({
+        message: '请选择至少一个实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      emits('confirmCheckout', checkoutList.value)
+    }
+  }
+  else {
+    if (!singleChecked.value) {
+      ElMessage({
+        message: '请选择检定实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      const checkValue = list.value.find(item => item.id == singleChecked.value)
+      emits('confirmCheckout', checkValue)
+    }
+  }
+
+  cancle()
+}
+
+// 初始化弹窗
+const initDialog = (multiSelect: boolean) => {
+  multi.value = multiSelect
+  dialogVisible.value = true
+  fetchData()
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <div class="choose-lab-dialog">
+    <el-dialog v-model="dialogVisible" :title="`选择检定实验室${(checkoutList.length > 0 && multi) ? `(已选择${checkoutList.length}个实验室)` : ''}`" width="1000" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.organizeName"
+            placeholder="实验室名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-select
+            v-model.trim="listQuery.meterMajor"
+            clearable
+            placeholder="计量专业"
+          >
+            <el-option
+              v-for="item in measureMajorList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <div style="padding: 5px 10px;">
+        <normal-table
+          :data="list"
+          :total="total"
+          :columns="columns"
+          :query="listQuery"
+          :list-loading="loadingTable"
+          :pagination="false"
+          size="small"
+          @multi-select="handleSelectionChange"
+        >
+          <!-- :is-showmulti-select="multi" -->
+          <!-- :is-multi="multi" -->
+          <template v-if="!multi" #preColumns>
+            <el-table-column label="#" width="55" align="center" fixed="left">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="" width="40" align="center" fixed>
+              <template #default="scope">
+                <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </div>
+
+      <template #footer>
+        <el-button type="primary" @click="clickConfirm">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.choose-lab-dialog {
+  :deep(.el-radio__label) {
+    display: none;
+  }
+}
+</style>
diff --git a/src/views/business/lab/myMeasure/components/lab-interface.ts b/src/views/business/lab/myMeasure/components/lab-interface.ts
new file mode 100644
index 0000000..02b0d1d
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/lab-interface.ts
@@ -0,0 +1,29 @@
+// 查询参数类型
+export interface ILabSearchQuery {
+  organizeNo: string // 组织编号
+  organizeName: string // 名称
+  organizeType: string // 类型-3科室
+  isLab: '1' // 是否是实验室
+  director: string // 负责人
+  meterMajor: string // 专业
+  createStartTime: '' // 创建开始时间
+  createEndTime: '' // 创建结束事假
+}
+
+// 部门返回值对象类型
+export interface ILabList {
+  id: string
+  deptId: string // 部门id
+  director: string // 负责人名称
+  phone: string // 负责人电话
+  meterMajor: string // 计量专业
+  organizeNo: string // 实验室编号
+  organizeName: string // 实验室名称
+  measureItems: string // 全部检测能力
+  pDeptId: string // 所属部门
+  pDeptName: string // 所属部门
+  organizeType: string // 组织类型
+  remark?: string // 备注
+  createTime?: string // 创建时间
+  updateTime?: string // 更新时间
+}
diff --git a/src/views/business/lab/myMeasure/components/processConfig.vue b/src/views/business/lab/myMeasure/components/processConfig.vue
new file mode 100644
index 0000000..bb66076
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/processConfig.vue
@@ -0,0 +1,161 @@
+<script setup lang="ts" name="ProcessConfig">
+import { ref } from 'vue'
+import draggable from 'vuedraggable'
+import { ElMessage } from 'element-plus'
+import type { ISchedule, IScheduleSet } from '../task-interface'
+import ProcessNode from './processNode.vue'
+import ProcessNodeAdd from './processNodeAdd.vue'
+import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
+import { setMeasureProcess, setMeasureProcessByFfy } from '@/api/business/schedule/task'
+const props = defineProps({
+  type: {
+    type: String,
+    default: 'distribute',
+  }, // 类型，决定调用哪个接口
+  // 是否为详情展示页面
+  detail: {
+    type: Boolean,
+    default: false,
+  },
+  // 样品id
+  sampleId: {
+    type: String,
+    required: true,
+  },
+  // 委托单id
+  orderId: {
+    type: String,
+    required: true,
+  },
+  list: {
+    type: Array,
+    default: () => [],
+  },
+})
+const emits = defineEmits(['saveOver'])
+// 默认流程节点
+const defaultProcess: IScheduleSet = {
+  measurePersonId: '', // 执行人
+  measurePerson: '', // 执行人名称
+  measureSegmentId: '', // 执行部门
+  measureSegment: '', // 执行部门名称
+  executiveItem: '', // 检定项目
+  // alreadyCertifications: 0, // 已出具证书总数
+  requireCertifications: 1, // 应出具证书总数
+  measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: '', // 流程更新时间
+}
+// 检定流程列表
+const processList = ref<IScheduleSet[]>([
+  { ...defaultProcess },
+])
+
+watch(() => props.list, (val) => {
+  if (props.list.length > 0) {
+    processList.value = props.list as ISchedule[]
+  }
+},
+{ deep: true, immediate: true })
+
+// 点击添加流程
+const processAdd = () => {
+  processList.value.push({ ...defaultProcess })
+}
+// 检查是否允许移动
+const checkMove = (evt: any) => {
+  // 目的位置元素evt.relatedContext.element
+  // 当前拖动元素evt.draggedContext.element
+  if (evt.relatedContext.element.measureState !== '0') {
+    return false
+  }
+  return true
+}
+
+// 选择实验室弹窗
+const chooseLabDialog = ref()
+// 批量添加流程
+const batchProcessAdd = () => {
+  chooseLabDialog.value.initDialog(true)
+}
+
+// 批量添加实验室
+const batchChooseOver = (labs: ILabList[]) => {
+  for (const item of labs) {
+    const processTemp: IScheduleSet = {
+      measurePersonId: '', // 执行人
+      measurePerson: '', // 执行人名称
+      measureSegmentId: item.deptId, // 执行部门
+      measureSegment: item.organizeName, // 执行部门名称
+      executiveItem: '', // 检定项目
+      measureSequence: '', // 监测顺序
+      // alreadyCertifications: 0, // 已出具证书总数
+      requireCertifications: 1, // 应出具证书总数
+      measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      updateTime: '', // 流程更新时间
+    }
+    processList.value.push(processTemp)
+  }
+}
+
+// 保存流程
+const saveProcess = () => {
+  const form = {
+    measureProcessList: processList.value,
+    executiveList: processList.value,
+    orderId: props.orderId,
+    sampleId: props.sampleId,
+  }
+  // 处理顺序
+  for (const key in form.measureProcessList) {
+    form.measureProcessList[key].measureSequence = (parseInt(key) + 1).toString()
+  }
+  if (props.type == 'distribute') {
+    setMeasureProcess(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
+  else {
+    setMeasureProcessByFfy(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
+}
+// 删除流程
+const deleteProcess = (index: number) => {
+  processList.value.splice(index, 1)
+}
+
+// --------暴露方法
+defineExpose({ saveProcess, batchProcessAdd, deleteProcess })
+</script>
+
+<template>
+  <div>
+    <div class="process-container">
+      <draggable v-model="processList" item-key="id" class="process-draggable" handle=".handle" :move="checkMove">
+        <!-- eslint-disable-next-line vue/no-unused-vars -->
+        <template #item="{ process, index }">
+          <process-node v-model="processList[index]" :step="index + 1" :detail="props.detail" @delete="deleteProcess(index)" />
+        </template>
+        <template #footer>
+          <process-node-add v-if="!props.detail" @click="processAdd" />
+        </template>
+      </draggable>
+    </div>
+    <choose-lab ref="chooseLabDialog" @confirm-checkout="batchChooseOver" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.process-container {
+  .process-draggable {
+    display: flex;
+    flex-wrap: wrap;
+  }
+}
+</style>
diff --git a/src/views/business/lab/myMeasure/components/processNode.vue b/src/views/business/lab/myMeasure/components/processNode.vue
new file mode 100644
index 0000000..fad76ab
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/processNode.vue
@@ -0,0 +1,215 @@
+<script lang="ts" setup name="ProcessNode">
+import {
+  Aim, Rank, Remove,
+} from '@element-plus/icons-vue'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
+// 逻辑代码
+const props = defineProps({
+  // 默认数据
+  modelValue: {
+    type: Object,
+    default: () => {
+      return {
+        measurePersonId: '', // 执行人
+        measurePerson: '', // 执行人名称
+        measureSegmentId: '', // 执行部门
+        measureSegment: '', // 执行部门名称
+        executiveItem: '', // 检定项目
+        alreadyCertifications: 0, // 已出具证书总数
+        requireCertifications: 0, // 应出具证书总数
+        measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        updateTime: '', // 流程更新时间
+      }
+    },
+  },
+  // 是否为详情展示页面
+  detail: {
+    type: Boolean,
+    default: false,
+  },
+  // 步骤
+  step: {
+    type: Number,
+    default: 1,
+  },
+})
+const emit = defineEmits(['update:modelValue', 'delete'])
+
+// ------------定义props参数----------
+const processNodeData = computed({
+  get() {
+    return props.modelValue
+  },
+  set(value) {
+    emit('update:modelValue', value)
+  },
+})
+// 检定环节可编辑-只有待分发状态可编辑
+const deptEdit = computed(() => {
+  const editStates = ['']
+  return editStates.includes(processNodeData.value.measureStatus)
+})
+// 检定人可编辑-待分配状态可编辑
+const personEdit = computed(() => {
+  const editStates = ['', '1', '2']
+  return editStates.includes(processNodeData.value.measureStatus)
+})
+// 证书可编辑-待分发、待分配、待检测状态可编辑
+const certificationEdit = computed(() => {
+  const editStates = ['', '1', '2', '3']
+  return editStates.includes(processNodeData.value.measureStatus)
+})
+// 节点可移动
+const canMove = computed(() => {
+  const editStates = ['', '1']
+  return editStates.includes(processNodeData.value.measureStatus)
+})
+
+// 选择人员
+const choosePersonShow = ref(false)
+const choosePerson = () => {
+  choosePersonShow.value = true
+}
+// 人员选择完毕
+const choosePersonOver = (person: { id: string; name: string }) => {
+  processNodeData.value.measurePersonId = person.id
+  processNodeData.value.measurePerson = person.name
+  choosePersonShow.value = false
+}
+
+// 选择实验室
+const chooseLabDialog = ref()
+const clickChoose = () => {
+  chooseLabDialog.value.initDialog(false)
+}
+const _selectStaffDialog = ref()
+// 实验室选择完毕
+const chooseOver = (lab: ILabList) => {
+  console.log(lab)
+  processNodeData.value.measureSegmentId = lab.deptId
+  processNodeData.value.measureSegment = lab.organizeName
+  // 定义一个对象关联上子组件的 ref 值（注意：这里的属性名必须跟子组件定义的 ref 值一模一样，否者会关联失效）
+  // 延迟使用，因为还没挂载
+  nextTick(() => {
+    _selectStaffDialog.value.fetchData()
+  })
+}
+
+// 移除该节点
+const deleteNode = () => {
+  emit('delete')
+}
+</script>
+
+<template>
+  <div class="process-node">
+    <div class="header">
+      <div class="step">
+        {{ props.step }}
+      </div>
+      <div class="buttons">
+        <el-icon v-show="canMove && !props.detail" class="icon-button" title="移除" @click="deleteNode">
+          <remove />
+        </el-icon>
+        <el-icon v-show="canMove && !props.detail" class="icon-button handle" title="移动">
+          <rank />
+        </el-icon>
+      </div>
+    </div>
+    <div>
+      <div class="line">
+        <span class="label">检定环节</span>
+        <el-input v-model="processNodeData.measureSegment" class="process-input" readonly size="small" :disabled="!deptEdit || props.detail">
+          <template v-if="deptEdit && !props.detail" #append>
+            <el-button :icon="Aim" size="small" link @click="clickChoose" />
+          </template>
+        </el-input>
+      </div>
+      <div class="line">
+        <span class="label">检定人员</span>
+        <el-input v-model="processNodeData.measurePerson" readonly class="process-input" size="small" :disabled="!personEdit || props.detail">
+          <template v-if="personEdit && !props.detail" #append>
+            <el-button :icon="Aim" size="small" link :disabled="processNodeData.measureSegment === ''" @click="choosePerson" />
+          </template>
+        </el-input>
+      </div>
+      <div class="line">
+        <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit || props.detail" /><span class="unit"> 份</span>
+      </div>
+      <div class="line">
+        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStatusName }}</span>
+      </div>
+      <div class="line">
+        <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
+      </div>
+    </div>
+    <!-- 选择实验室弹窗 -->
+    <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
+    <!-- 成员弹框 -->
+    <select-staff-dialog ref="_selectStaffDialog" v-model:visible="choosePersonShow" :data="[processNodeData.measurePersonId]" :dept-id="processNodeData.measureSegmentId" :dept-name="processNodeData.measureSegment" :multi="false" @change="choosePersonOver" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.process-node {
+  // display: inline-block;
+  margin-right: 10px;
+  width: 280px;
+  height: 215px;
+  border: 1px solid #e0e0e0;
+  padding: 5px 15px;
+  border-radius: 5px;
+  background-color: #fafafa;
+  margin-bottom: 10px;
+
+  .header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+    .step {
+      line-height: 28px;
+      font-size: 16px;
+      color: #3d7eff;
+      font-weight: bold;
+      margin-bottom: 5px;
+    }
+
+    .icon-button {
+      color: #999;
+      margin-left: 5px;
+      font-size: 16px;
+
+      &:hover {
+        cursor: pointer;
+      }
+    }
+  }
+
+  .line {
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 4px 0;
+
+    .label {
+      width: 80px;
+      font-size: 14px;
+    }
+
+    .process-input {
+      flex: 1;
+      font-size: 14px;
+    }
+
+    .unit {
+      margin-left: 5px;
+      font-size: 14px;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/lab/myMeasure/components/processNodeAdd.vue b/src/views/business/lab/myMeasure/components/processNodeAdd.vue
new file mode 100644
index 0000000..d7aeea0
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/processNodeAdd.vue
@@ -0,0 +1,46 @@
+<script lang="ts" setup name="ProcessNodeAdd">
+const emit = defineEmits(['click'])
+const add = () => {
+  emit('click')
+}
+</script>
+
+<template>
+  <div class="process-node" @click="add">
+    <div class="add">
+      <el-icon class="add-icon">
+        <plus />
+      </el-icon>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.process-node {
+  // display: inline-block;
+  width: 280px;
+  height: 215px;
+  border: 1px dashed #e0e0e0;
+  padding: 5px 15px;
+  border-radius: 5px;
+  background-color: #fbfbfb;
+
+  &:hover {
+    cursor: pointer;
+    background-color: #f5f5f5;
+  }
+
+  .add {
+    height: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    .add-icon {
+      vertical-align: middle;
+      font-size: 100px;
+      color: #999;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/lab/myMeasure/measureDetail.vue b/src/views/business/lab/myMeasure/measureDetail.vue
new file mode 100644
index 0000000..1a88be8
--- /dev/null
+++ b/src/views/business/lab/myMeasure/measureDetail.vue
@@ -0,0 +1,601 @@
+<!-- 任务分发 -->
+<script lang="ts" setup name="TaskEdit">
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance } from 'element-plus'
+import { ref } from 'vue'
+import ProcessConfig from './components/processConfig.vue'
+import type { ISampleMeasure, ITaskDetail } from './task-interface'
+import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { getTaskDetail } from '@/api/business/schedule/task'
+import countries from '@/components/AddressSelect/country-code.json'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+interface dictType {
+  id: string
+  name: string
+  value: string
+}
+const roleType = ref('distribute') // 角色类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员),
+const countryList = ref(countries) // 国家列表
+const loading = ref(false) // 表单加载状态
+const sampleId = ref('') // 样品详情id
+const orderId = ref('') // 委托书id
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const mesureTypeList = ref<dictType[]>([]) // 检定方式
+const $route = useRoute()
+
+// 获取字典值
+function getDict() {
+  // 获取样品属性
+  getDictByCode('measureCategory').then((response) => {
+    mesureCategoryList.value = response.data
+  })
+  // 获取样品属性
+  getDictByCode('measureType').then((response) => {
+    mesureTypeList.value = response.data
+  })
+}
+getDict()
+
+// 基本信息表单
+const sampleForm = ref<ISampleMeasure>({
+  id: '', // 样品id
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 样品型号
+  manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  phone: '', // 委托方电话
+  postalCode: '', // 委托方邮编
+  customerAddress: '', // 委托方地址
+  measureCategory: '', // 检校类别
+  manufacturer: '', // 生产厂家
+  manufacturerCountry: '', // 厂家国别
+  manufacturingDate: '', // 出厂年月
+  abc: '', // ABC
+  measurePeriod: '', // 检定周期
+  remark: '', // 备注
+  minioFileName: '', // 说明书
+  labelBind: '', // 标签绑定
+  measureType: '1', // 检定方式  1自检、2外包、3外检
+  measureTypeName: '', // 检定方式
+  measureLastTime: '', // 检定日期
+  validDeadline: '', // 有效日期
+  powerVoltage: '', // 电源电压
+  sampleBelong: '', // 样品所属
+  sampleBelongName: '', // 样品所属
+})
+const taskForm = ref <ITaskDetail> ({
+  measureContent: '', // 检定项目
+  specialRequire: '', // 客户特殊要求
+  orderId: '', // 委托单id
+  orderCode: '', // 委托单编号
+  certifications: '', // 证书类别
+  planDeliverTime: '', // 预约送达时间
+  requireOverTime: '', // 要求检完时间
+  measureProcessList: [], // 检定流程
+  measureSendBackList: [], // 退回信息
+  remark: '', // 备注
+  deliverer: '', // 送检人
+  delivererTel: '', // 送检人联系方式
+})
+const ruleFormRef = ref<FormInstance>()
+
+// 自定义校验规则--检定周期为正整数
+const validateMesurePeriod = (rule: any, value: any, callback: any) => {
+  if (value === '') {
+    callback()
+  }
+  else if (!(/(^[1-9]\d*$)/.test(value))) {
+    callback(new Error('请输入一个正整数'))
+  }
+  else {
+    callback()
+  }
+}
+
+// 校验规则
+const rules = ref({
+  mesurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
+}) // 表单验证规则
+
+// 其他关联数据列表
+const dataList = ref({
+  measureRecords: [] as SimpleMeasureRecord[],
+  certificationRecords: [] as SimpleCertification[],
+})
+
+// 获取检定记录
+const fetchMeasureRecords = function (query = null) {
+  dataList.value.measureRecords = []
+}
+// 获取检定证书
+const fetchCertifications = function (query = null) {
+  dataList.value.certificationRecords = []
+}
+interface Menu {
+  name: string
+  columns: TableColumn[]
+  pagination: boolean
+  list: 'measureRecords' | 'certificationRecords'
+  searchFunc: Function
+}
+// 菜单
+const menu: Menu[] = [
+  {
+    name: '检定记录',
+    columns: [
+      { text: '委托单编号', value: 'orderCode' },
+      { text: '委托单日期', value: 'orderTime' },
+      { text: '委托方代码', value: 'customerCode' },
+      { text: '委托方名称', value: 'customerName' },
+      { text: '送检人', value: 'deliverer' },
+      { text: '送检日期', value: 'deliverTime' },
+    ],
+    list: 'measureRecords',
+    pagination: true,
+    searchFunc: fetchMeasureRecords,
+  },
+  {
+    name: '检定证书',
+    columns: [
+      { text: '证书编号', value: 'certificationCode' },
+      { text: '证书名称', value: 'certificationName' },
+      { text: '证书类型', value: 'certificationType' },
+      { text: '证书出具日期', value: 'effectiveDate' },
+      { text: '证书有效期', value: 'expirationDate' },
+    ],
+    list: 'certificationRecords',
+    pagination: true,
+    searchFunc: fetchCertifications,
+  },
+]
+
+const currentMenu = ref('证书监控')
+const currentMenuObj = computed(() => {
+  return menu.find(item => item.name === currentMenu.value)
+})
+
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 打印表单
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '样品详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>样品详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+// 保存样品信息
+function saveForm(formEl: FormInstance | undefined) {
+  if (!formEl) { return }
+  formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认修改样品信息吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (sampleForm.value.id) {
+          updateSample(sampleForm.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+      })
+    }
+  })
+}
+// 获取详情
+const getSampleInfo = () => {
+  getSapmleDetail({ id: sampleId.value }).then((res) => {
+    sampleForm.value = res.data
+  })
+}
+// 获取分发详情
+const getInfo = () => {
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    taskForm.value.specialRequire = res.data.specialRequire // 客户特殊要求
+    taskForm.value.deliverer = res.data.deliverer // 送检人
+    taskForm.value.delivererTel = res.data.delivererTel // 送检人联系方式
+    taskForm.value.measureContent = res.data.measureContent // 检定项目
+    taskForm.value.measureProcessList = res.data.measureProcessList // 检定流程
+    taskForm.value.measureSendBackList = res.data.measureSendBackList // 退回流程
+    console.log('pppppp')
+    console.log(taskForm.value.measureProcessList)
+
+    // 改用一个接口获取
+    sampleForm.value = res.data
+  })
+}
+
+// 点击标签绑定的扫描
+const startScan = () => {
+  // TODO
+}
+
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
+}
+// 保存流程按钮点击
+const saveProcess = () => {
+  processConfigRef.value.saveProcess()
+}
+
+// 文件上传
+const fileRef = ref()
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    // UploadFile(fd).then((res) => {
+    //   if (res.code === 200) {
+    //     sampleForm.value.minioFileName = res.data[0]
+    //     // 重置当前验证
+    //     ElMessage.success('文件上传成功')
+    //   }
+    //   else {
+    //     ElMessage.error(res.message)
+    //   }
+    // })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+onMounted(() => {
+  console.log($route)
+  // 从路由中获取页面类型参数
+  if ($route.params && $route.params.role) {
+    roleType.value = $route.params.role as string // 使用角色
+  }
+  if ($route.params.id) {
+    sampleId.value = $route.params.id as string
+    orderId.value = $route.query.order as string
+    // 获取分发详情
+    getInfo()
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="样品详情">
+      <template #btns>
+        <el-button v-if="roleType === 'detail'" v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <!-- <el-button v-if="roleType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button> -->
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <div id="form">
+        <el-form
+          ref="ruleFormRef"
+          :model="sampleForm"
+          :label-width="120"
+          label-position="right"
+          :rules="rules"
+        >
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="样品编号:" prop="sampleNo">
+                <el-input
+                  v-model="sampleForm.sampleNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品名称:" prop="sampleName">
+                <el-input
+                  v-model="sampleForm.sampleName"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品型号:" prop="sampleModel">
+                <el-input
+                  v-model="sampleForm.sampleModel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂编号:" prop="manufacturingNo">
+                <el-input
+                  v-model="sampleForm.manufacturingNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方代码" prop="customerNo">
+                <el-input
+                  v-model="sampleForm.customerNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方名称" prop="customerName">
+                <el-input
+                  v-model="sampleForm.customerName"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方电话" prop="phone">
+                <el-input
+                  v-model="sampleForm.phone"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方电话'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方邮编" prop="postalCode">
+                <el-input
+                  v-model="sampleForm.postalCode"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方邮编'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="18">
+              <el-form-item label="委托方地址:" prop="companyAddress">
+                <el-input
+                  v-model="sampleForm.customerAddress"
+                  type="textarea"
+                  autosize
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方地址'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="校检类别:">
+                <el-select
+                  v-model="sampleForm.measureCategory"
+                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :disabled="roleType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="生产厂家:">
+                <el-input
+                  v-model="sampleForm.manufacturer"
+                  :placeholder="roleType === 'detail' ? '' : '请输入生产厂家'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="厂家国别:">
+                <el-select
+                  v-model="sampleForm.manufacturerCountry"
+                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :disabled="roleType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂年月:">
+                <el-date-picker
+                  v-model="sampleForm.manufacturingDate"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="roleType === 'detail' ? '' : '请输入出厂年月'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="ABC:">
+                <el-select
+                  v-model="sampleForm.abc"
+                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :disabled="roleType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="送检人:">
+                <el-input
+                  v-model="taskForm.deliverer"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="联系方式:">
+                <el-input
+                  v-model="taskForm.delivererTel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="检定项目:" prop="mesureContent">
+                <el-input
+                  v-model="taskForm.measureContent"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  disabled
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检定周期（月）:">
+                <el-input
+                  v-model="sampleForm.measurePeriod"
+                  :placeholder="roleType === 'detail' ? '' : '请输入检定周期'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="备注:">
+                <el-input
+                  v-model="sampleForm.remark"
+                  type="textarea"
+                  :rows="2"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  disabled
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检定方式:">
+                <el-select
+                  v-model="sampleForm.measureType"
+                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :disabled="roleType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of mesureTypeList" :key="item.value" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="标签绑定:">
+                <el-input
+                  v-model="sampleForm.labelBind"
+                  :placeholder="roleType === 'detail' ? '' : '标签绑定'"
+                  :disabled="roleType === 'detail'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                >
+                  <template v-if="roleType !== 'detail'" #append>
+                    <el-button>
+                      扫描
+                    </el-button>
+                  </template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="14">
+              <el-form-item label="说明书:">
+                <show-photo v-if="sampleForm.minioFileName" :minio-file-name="sampleForm.minioFileName" />
+                <span v-else-if="roleType === 'detail'">无</span>
+                <input v-show="roleType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="roleType !== 'detail'" id="file" type="primary" :disabled="roleType === 'detail'" :style="{ 'margin-left': sampleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ sampleForm.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </detail-page>
+    <detail-block v-if="taskForm.measureProcessList && taskForm.measureProcessList.length >= 1" title="检定流程">
+      <!-- <template #btns>
+        <el-button type="primary" style="margin-bottom: 10px;" @click="batchProcessAdd">
+          批量添加
+        </el-button>
+        <el-button type="primary" style="margin-bottom: 10px;" @click="saveProcess">
+          保存
+        </el-button>
+      </template> -->
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" :detail="true" />
+    </detail-block>
+    <!-- 退回流程 -->
+    <detail-block v-if="taskForm.measureSendBackList && taskForm.measureSendBackList.length >= 1" title="退回流程">
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureSendBackList" :sample-id="sampleId" :detail="true" />
+    </detail-block>
+    <!-- 检定记录、检定证书 -->
+    <detail-block-switch :title="currentMenu">
+      <template #menu>
+        <el-radio-group v-model="currentMenu">
+          <el-radio-button label="证书监控">
+            证书监控
+          </el-radio-button>
+          <el-radio-button label="检定记录">
+            检定记录
+          </el-radio-button>
+          <el-radio-button label="检定证书">
+            检定证书
+          </el-radio-button>
+        </el-radio-group>
+      </template>
+      <!-- 证书监控 -->
+      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" />
+      <!-- 检定记录 -->
+      <measure-records v-if="currentMenu === '检定记录'" :sample-id="sampleId" />
+      <!-- 证书记录 -->
+      <certification-records v-if="currentMenu === '检定证书'" :sample-id="sampleId" />
+    </detail-block-switch>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
+
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 62f8830..e4a4637 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -13,7 +13,6 @@
 import { getMyMeasureList, myExecutiveDone, myExecutiveReceive } from '@/api/business/schedule/task'
 import type { dictType } from '@/global'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
-
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
@@ -128,7 +127,7 @@
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`myMeasureDetail/detail/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
diff --git a/src/views/business/lab/myMeasure/task-interface.ts b/src/views/business/lab/myMeasure/task-interface.ts
new file mode 100644
index 0000000..6503a12
--- /dev/null
+++ b/src/views/business/lab/myMeasure/task-interface.ts
@@ -0,0 +1,169 @@
+// 任务列表查询条件
+export interface ITaskQuery {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  orderNo: string // 委托书编号
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  isUrgent: string // 是否加急
+  sampleBelong: string // 样品属性
+  sampleStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
+  limit: number
+  offset: number
+}
+
+// 我的检测/部门检测查询条件
+export interface ILabQuery {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  orderNo: string // 委托书编号
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  isUrgent: string // 是否加急
+  sampleBelong: string // 样品属性
+  measureStatus: string // 分发状态
+  startTime: string | number //	应检定开始时间
+  endTime: string | number //	应检定结束时间
+  limit: number
+  offset: number
+}
+// 任务列表-返回值
+export interface ITaskList {
+  orderId: string // 委托书编号
+  sampleId: string // 样品唯一标识
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderNo: string // 委托书编号
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  isUrgent: number // 是否加急
+  isUrgentName?: string // 是否加急
+  requireOverTime: string // 应检完时间
+  sampleBelong: string // 样品属性
+  sampleBelongName: string // 样品属性
+  currentMeasureState: string // 当前检定环节
+  currentMeasureStateName: string // 当前检定环节
+  alreadyCertifications: number // 已出具证书总数
+  requireCertifications: number // 应出具证书总数
+  distributeState: string // 分发性质-初次分发、退回分发
+  handOutProperty: string // 分发性质-初次分发、退回分发
+  id?: string // 实验室id
+}
+
+// 实验室检测/我的检测列表
+export interface IlabMeasureList extends ITaskList {
+  id: string // 实验室检测id
+  measurePersonId: string // 检测人id
+  measureSegmentId: string // 检测部门id
+  currentSegmentId: string // 检测部门id (新)
+}
+
+// 全部检测流程节点
+export interface ISchedule {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications: number // 应出具证书总数
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: string // 流程更新时间
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
+  distributePerson: string // 分配人
+  distributeTime: string // 分配时间
+  startTime: string // 检定开始时间
+  overTime: string // 检定完成时间
+}
+// 检测流程节点
+export interface IScheduleSet {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications: number // 应出具证书总数
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: string // 流程更新时间
+  measureSequence?: string // 检测顺序
+}
+// 退回流程节点
+export interface IScheduleBack {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications?: number // 应出具证书总数
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
+}
+
+// 样品检测信息
+export interface ISampleMeasure {
+  id: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  manufacturingNo: string // 出厂编号
+  customerNo: string // 委托方代码
+  customerId: string // 委托方id
+  customerName: string // 委托方名称
+  phone: string // 委托方电话
+  postalCode: string // 委托方邮编
+  customerAddress: string // 委托方地址
+  measureCategory: string // 检校类别
+  manufacturer: string // 生产厂家
+  manufacturerCountry: string // 厂家国别
+  manufacturingDate: string // 出厂年月
+  abc: string // ABC
+  measurePeriod: string // 检定周期
+  minioFileName: string // 说明书
+  labelBind: string // 标签绑定
+  measureType: string // 检定方式
+  measureTypeName: string // 检定方式
+  measureLastTime?: string // 检定日期
+  validDeadline: string // 有效日期
+  powerVoltage: string // 电源电压
+  sampleBelong: string // 样品所属
+  sampleBelongName: string // 样品所属
+  remark: string // 备注
+}
+
+export interface ITaskDetail {
+  measureContent: string // 检定项目
+  measureProcessList: ISchedule[] // 检定流程
+  measureSendBackList: ISchedule[] // 退回信息
+  remark: string // 备注
+  orderId: string // 委托单id
+  orderCode: string // 委托单编号
+  certifications: string // 证书类别
+  planDeliverTime: string // 预约送达时间
+  requireOverTime: string // 要求检完时间
+  specialRequire: string // 客户特殊要求
+  deliverer: string // 送检人
+  delivererTel: string // 送检人联系方式
+}
+
+// 退回
+export interface ISendBack {
+  id: string // 实验室检测id
+  measurePersonId: string // 检定人员id
+  measureSegmentId: string //	检定环节，实验室id
+  operateReason: string // 退回原因
+  orderId: string // 委托书id
+  sampleId: string //	样品id
+}
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index 0efec98..99a6852 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -141,7 +141,6 @@
 // 点击详情
 const handleDetail = (row: ITaskList) => {
   console.log('跳转任务分发详情')
-
   $router.push(`/schedule/task/distribute/${row.sampleId}?order=${row.orderId}`)
 }
 
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 6ad9900..dbaa437 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -83,11 +83,7 @@
     text: '申请时间',
     value: 'time',
     align: 'center',
-  },
-  {
-    text: '审批状态',
-    value: 'approvalStatusName',
-    align: 'center',
+    width: 160,
   },
 ]) // 表格
 // 数据查询
@@ -456,6 +452,16 @@
           </el-table-column>
         </template>
         <template #columns>
+          <el-table-column v-if="activeTitle === '已归还'" label="归还时间" width="160" align="center">
+            <template #default="scope">
+              {{ scope.row.backTime }}
+            </template>
+          </el-table-column>
+          <el-table-column label="审批状态" width="120" align="center">
+            <template #default="scope">
+              {{ scope.row.approvalStatusName }}
+            </template>
+          </el-table-column>
           <el-table-column label="操作" align="center" :width="activeTitle === '待借用' ? '130' : activeTitle === '已借用' ? '110' : '80'">
             <template #default="{ row }">
               <el-button size="small" type="primary" link @click="detail(row)">
diff --git a/src/views/device/borrow/editHandle.vue b/src/views/device/borrow/editHandle.vue
index 9a5b2a6..4e0bc5c 100644
--- a/src/views/device/borrow/editHandle.vue
+++ b/src/views/device/borrow/editHandle.vue
@@ -26,6 +26,7 @@
   applyUnit: '', // 申请单位
   applyPerson: '', // 申请人
   time: '', // 借用时间
+  backTime: '', // 归还时间
   applyDesc: '', // 申请说明
 })
 const list = ref<IdeviceList[]>([])// 表格数据
@@ -163,7 +164,18 @@
                     />
                   </el-form-item>
                 </el-col>
-                <el-col :span="12">
+                <el-col :span="6">
+                  <el-form-item label="归还时间" prop="backTime">
+                    <el-date-picker
+                      v-model="form.backTime"
+                      type="datetime"
+                      format="YYYY-MM-DD hh:mm"
+                      value-format="YYYY-MM-DD hh:mm"
+                      disabled
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="18">
                   <el-form-item label="申请说明" prop="applyDesc">
                     <el-input v-model="form.applyDesc" type="textarea" disabled autosize />
                   </el-form-item>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 2ab77ef..3f90519 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -38,6 +38,7 @@
 const isDetail = ref(false)
 const ruleForm = ref<fixedAssetsType>({
   assetNo: '', // 资产编号
+  compulsoryVerification: '', // 强制检定
   assetType: '', // 资产类型
   assetSource: '', // 资产来源
   equipmentNo: '', // 设备编号
@@ -486,6 +487,14 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
+          <el-form-item label="强制检定" prop="compulsoryVerification">
+            <el-select v-model="ruleForm.compulsoryVerification" :placeholder="title === 'detail' ? '' : '强制检定'" :disabled="title === 'detail'" style="width: 100%;">
+              <el-option label="是" value="1" />
+              <el-option label="否" value="0" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
           <el-form-item label="检定周期(月)" prop="mesureCycle">
             <el-input-number v-model="ruleForm.mesureCycle" :min="12" :max="60" :step="12" :disabled="title === 'detail'" />
             <!-- <el-select v-model="ruleForm.mesureCycle" :placeholder="title === 'detail' ? '' : '检定周期'" clearable style="width: 100%;">
@@ -509,7 +518,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="使用人" prop="usePerson">
-            <el-select v-model="ruleForm.usePerson" :placeholder="title === 'detail' ? '' : '使用人'" :disabled="title === 'detail'" style="width: 100%;">
+            <el-select v-model="ruleForm.usePerson" filterable :placeholder="title === 'detail' ? '' : '使用人'" :disabled="title === 'detail'" style="width: 100%;">
               <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
             </el-select>
           </el-form-item>
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index 479ae05..e46753d 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -94,6 +94,7 @@
   { text: '型号', value: 'modelNo', align: 'center' },
   { text: 'ABC', value: 'abc', align: 'center', width: 58 },
   { text: '检定方式', value: 'mesureTypeName', align: 'center', width: 90 },
+  { text: '强制检定', value: 'compulsoryVerification', align: 'center', width: 90 },
   { text: '管理状态', value: 'managerStateName', align: 'center', width: 100 },
   { text: '使用部门', value: 'useDeptName', align: 'center' },
   { text: '使用人', value: 'usePersonName', align: 'center' },
@@ -139,7 +140,10 @@
   }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows
+      list.value = res.data.rows.map((item: any) => {
+        item.validDate = item.validDate.split(' ')[0]
+        return item
+      })
       total.value = res.data.total
     }
     loadingTable.value = false
@@ -403,7 +407,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="120">
+            <el-table-column label="操作" align="center" width="120" fixed="right">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/device/standingBook/standingBook-interface.ts b/src/views/device/standingBook/standingBook-interface.ts
index bd55019..ee29254 100644
--- a/src/views/device/standingBook/standingBook-interface.ts
+++ b/src/views/device/standingBook/standingBook-interface.ts
@@ -105,7 +105,7 @@
   validDate: string // 有效日期
   version: string // 版本号
   weight: string // 重量（吨）
-
+  compulsoryVerification?: string | number // 强制检定
 }
 
 // 固定资产-查询用

diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index b21ad07..cf4a5b9 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -260,6 +260,19 @@
         },
       },
       {
+        path: 'myMeasureDetail/:role/:id',
+        name: 'MyMeasureDetail',
+        component: () => import('@/views/business/lab/myMeasure/measureDetail.vue'),
+        meta: {
+          title: '我的检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          auth: '/lab/myMeasure',
+          activeMenu: '/lab/myMeasureList',
+        },
+      },
+      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -270,6 +283,19 @@
         },
       },
       {
+        path: 'myMeasureDetail/:role/:id',
+        name: 'MyMeasureDetail',
+        component: () => import('@/views/business/lab/myMeasure/measureDetail.vue'),
+        meta: {
+          title: '部门检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          auth: '/lab/deptMeasureList',
+          activeMenu: '/lab/deptMeasureList',
+        },
+      },
+      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 066f192..7a6ebea 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -102,8 +102,9 @@
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
-          localStorage.removeItem('name')
           localStorage.removeItem('token')
+          localStorage.removeItem('nameId')
+          localStorage.removeItem('depId')
           this.username = ''
           this.token = ''
           this.roleList = []
@@ -121,7 +122,8 @@
               this.roleList = res.data.roleIds
               this.roleNames = res.data.roleNames
               this.roleTips = res.data.roleTips
-              localStorage.setItem('name', res.data.name)
+              localStorage.setItem('nameId', res.data.id)
+              localStorage.setItem('depId', res.data.deptId)
             }
             else {
               reject('该用户无角色')
diff --git a/src/views/business/board/overdueReminder/detail.vue b/src/views/business/board/overdueReminder/detail.vue
index 92987d1..0239b71 100644
--- a/src/views/business/board/overdueReminder/detail.vue
+++ b/src/views/business/board/overdueReminder/detail.vue
@@ -5,7 +5,7 @@
 import { ref } from 'vue'
 import dayjs from 'dayjs'
 import ProcessConfig from '@/views/business/schedule/task/components/processConfig.vue'
-import type { ISampleMeasure, ITaskDetail } from '@/views/business/schedule/task/task-interface'
+import type { ISampleMeasure, ITaskDetail } from '@/views/business/schedule/task/task-interface.js'
 import type { Menu, SimpleCertification, SimpleMeasureRecord, dictType } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getTaskDetail } from '@/api/business/schedule/task'
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index d6cc168..05fd811 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -4,8 +4,8 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import DistributeDialog from '../../schedule/task/components/distributeDialog.vue'
 import RollbackDialog from './../components/rollbackDialog.vue'
-import DistributeDialog from './../components/distributeDialog.vue'
 import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
@@ -131,7 +131,8 @@
 const depId = ref('')
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
+  $router.push(`myMeasureDetail/detail/${row.sampleId}?order=${row.orderId}`)
+  // $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
diff --git a/src/views/business/lab/myMeasure/components/chooseLab.vue b/src/views/business/lab/myMeasure/components/chooseLab.vue
new file mode 100644
index 0000000..0dcebfc
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/chooseLab.vue
@@ -0,0 +1,203 @@
+<script setup lang="ts" name="ChooseLab">
+// 选择实验室
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { ILabList, ILabSearchQuery } from '@/views/business/schedule/task/components/lab-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getOrganizeList } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
+const emits = defineEmits(['confirmCheckout'])
+// 是否多选
+const multi = ref(false)
+const dialogVisible = ref(false)
+
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
+// 查询条件
+const listQuery = ref<ILabSearchQuery>({
+  organizeNo: '', // 实验室编号
+  organizeName: '', // 实验室名称
+  meterMajor: '', // 专业
+  organizeType: '3', // 组织类型
+  director: '', // 负责人
+  isLab: '1', // 是否是实验室
+  createStartTime: '',
+  createEndTime: '',
+})
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '实验室名称', value: 'organizeName', width: '160', align: 'center' },
+  // { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
+  { text: '负责人', value: 'director', align: 'center', width: '120' },
+  { text: '计量专业', value: 'meterMajorName', align: 'center' },
+  { text: '实验室能力', value: 'labCapacityName', align: 'center' },
+])
+// 表格数据
+const list = ref<ILabList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 多选的内容
+const checkoutList = ref<ILabList[]>([])
+// 单选
+const singleChecked = ref()
+// 数据查询
+function fetchData(isNowPage = false) {
+  getOrganizeList(listQuery.value).then((response) => {
+    list.value = response.data
+    total.value = parseInt(response.data.length)
+    loadingTable.value = false
+  })
+  loadingTable.value = false
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    organizeNo: '', // 实验室编号
+    organizeName: '', // 实验室名称
+    meterMajor: '', // 专业
+    organizeType: '3', // 组织类型
+    director: '', // 负责人
+    isLab: '1', // 是否是实验室
+    createStartTime: '',
+    createEndTime: '',
+  }
+}
+
+// 点击取消
+const cancle = () => {
+  dialogVisible.value = false
+}
+// 点击确定
+const clickConfirm = () => {
+  // 如果多选
+  if (multi.value) {
+    if (!checkoutList.value.length) {
+      ElMessage({
+        message: '请选择至少一个实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      emits('confirmCheckout', checkoutList.value)
+    }
+  }
+  else {
+    if (!singleChecked.value) {
+      ElMessage({
+        message: '请选择检定实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      const checkValue = list.value.find(item => item.id == singleChecked.value)
+      emits('confirmCheckout', checkValue)
+    }
+  }
+
+  cancle()
+}
+
+// 初始化弹窗
+const initDialog = (multiSelect: boolean) => {
+  multi.value = multiSelect
+  dialogVisible.value = true
+  fetchData()
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <div class="choose-lab-dialog">
+    <el-dialog v-model="dialogVisible" :title="`选择检定实验室${(checkoutList.length > 0 && multi) ? `(已选择${checkoutList.length}个实验室)` : ''}`" width="1000" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.organizeName"
+            placeholder="实验室名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-select
+            v-model.trim="listQuery.meterMajor"
+            clearable
+            placeholder="计量专业"
+          >
+            <el-option
+              v-for="item in measureMajorList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <div style="padding: 5px 10px;">
+        <normal-table
+          :data="list"
+          :total="total"
+          :columns="columns"
+          :query="listQuery"
+          :list-loading="loadingTable"
+          :pagination="false"
+          size="small"
+          @multi-select="handleSelectionChange"
+        >
+          <!-- :is-showmulti-select="multi" -->
+          <!-- :is-multi="multi" -->
+          <template v-if="!multi" #preColumns>
+            <el-table-column label="#" width="55" align="center" fixed="left">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="" width="40" align="center" fixed>
+              <template #default="scope">
+                <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </div>
+
+      <template #footer>
+        <el-button type="primary" @click="clickConfirm">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.choose-lab-dialog {
+  :deep(.el-radio__label) {
+    display: none;
+  }
+}
+</style>
diff --git a/src/views/business/lab/myMeasure/components/lab-interface.ts b/src/views/business/lab/myMeasure/components/lab-interface.ts
new file mode 100644
index 0000000..02b0d1d
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/lab-interface.ts
@@ -0,0 +1,29 @@
+// 查询参数类型
+export interface ILabSearchQuery {
+  organizeNo: string // 组织编号
+  organizeName: string // 名称
+  organizeType: string // 类型-3科室
+  isLab: '1' // 是否是实验室
+  director: string // 负责人
+  meterMajor: string // 专业
+  createStartTime: '' // 创建开始时间
+  createEndTime: '' // 创建结束事假
+}
+
+// 部门返回值对象类型
+export interface ILabList {
+  id: string
+  deptId: string // 部门id
+  director: string // 负责人名称
+  phone: string // 负责人电话
+  meterMajor: string // 计量专业
+  organizeNo: string // 实验室编号
+  organizeName: string // 实验室名称
+  measureItems: string // 全部检测能力
+  pDeptId: string // 所属部门
+  pDeptName: string // 所属部门
+  organizeType: string // 组织类型
+  remark?: string // 备注
+  createTime?: string // 创建时间
+  updateTime?: string // 更新时间
+}
diff --git a/src/views/business/lab/myMeasure/components/processConfig.vue b/src/views/business/lab/myMeasure/components/processConfig.vue
new file mode 100644
index 0000000..bb66076
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/processConfig.vue
@@ -0,0 +1,161 @@
+<script setup lang="ts" name="ProcessConfig">
+import { ref } from 'vue'
+import draggable from 'vuedraggable'
+import { ElMessage } from 'element-plus'
+import type { ISchedule, IScheduleSet } from '../task-interface'
+import ProcessNode from './processNode.vue'
+import ProcessNodeAdd from './processNodeAdd.vue'
+import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
+import { setMeasureProcess, setMeasureProcessByFfy } from '@/api/business/schedule/task'
+const props = defineProps({
+  type: {
+    type: String,
+    default: 'distribute',
+  }, // 类型，决定调用哪个接口
+  // 是否为详情展示页面
+  detail: {
+    type: Boolean,
+    default: false,
+  },
+  // 样品id
+  sampleId: {
+    type: String,
+    required: true,
+  },
+  // 委托单id
+  orderId: {
+    type: String,
+    required: true,
+  },
+  list: {
+    type: Array,
+    default: () => [],
+  },
+})
+const emits = defineEmits(['saveOver'])
+// 默认流程节点
+const defaultProcess: IScheduleSet = {
+  measurePersonId: '', // 执行人
+  measurePerson: '', // 执行人名称
+  measureSegmentId: '', // 执行部门
+  measureSegment: '', // 执行部门名称
+  executiveItem: '', // 检定项目
+  // alreadyCertifications: 0, // 已出具证书总数
+  requireCertifications: 1, // 应出具证书总数
+  measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: '', // 流程更新时间
+}
+// 检定流程列表
+const processList = ref<IScheduleSet[]>([
+  { ...defaultProcess },
+])
+
+watch(() => props.list, (val) => {
+  if (props.list.length > 0) {
+    processList.value = props.list as ISchedule[]
+  }
+},
+{ deep: true, immediate: true })
+
+// 点击添加流程
+const processAdd = () => {
+  processList.value.push({ ...defaultProcess })
+}
+// 检查是否允许移动
+const checkMove = (evt: any) => {
+  // 目的位置元素evt.relatedContext.element
+  // 当前拖动元素evt.draggedContext.element
+  if (evt.relatedContext.element.measureState !== '0') {
+    return false
+  }
+  return true
+}
+
+// 选择实验室弹窗
+const chooseLabDialog = ref()
+// 批量添加流程
+const batchProcessAdd = () => {
+  chooseLabDialog.value.initDialog(true)
+}
+
+// 批量添加实验室
+const batchChooseOver = (labs: ILabList[]) => {
+  for (const item of labs) {
+    const processTemp: IScheduleSet = {
+      measurePersonId: '', // 执行人
+      measurePerson: '', // 执行人名称
+      measureSegmentId: item.deptId, // 执行部门
+      measureSegment: item.organizeName, // 执行部门名称
+      executiveItem: '', // 检定项目
+      measureSequence: '', // 监测顺序
+      // alreadyCertifications: 0, // 已出具证书总数
+      requireCertifications: 1, // 应出具证书总数
+      measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      updateTime: '', // 流程更新时间
+    }
+    processList.value.push(processTemp)
+  }
+}
+
+// 保存流程
+const saveProcess = () => {
+  const form = {
+    measureProcessList: processList.value,
+    executiveList: processList.value,
+    orderId: props.orderId,
+    sampleId: props.sampleId,
+  }
+  // 处理顺序
+  for (const key in form.measureProcessList) {
+    form.measureProcessList[key].measureSequence = (parseInt(key) + 1).toString()
+  }
+  if (props.type == 'distribute') {
+    setMeasureProcess(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
+  else {
+    setMeasureProcessByFfy(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
+}
+// 删除流程
+const deleteProcess = (index: number) => {
+  processList.value.splice(index, 1)
+}
+
+// --------暴露方法
+defineExpose({ saveProcess, batchProcessAdd, deleteProcess })
+</script>
+
+<template>
+  <div>
+    <div class="process-container">
+      <draggable v-model="processList" item-key="id" class="process-draggable" handle=".handle" :move="checkMove">
+        <!-- eslint-disable-next-line vue/no-unused-vars -->
+        <template #item="{ process, index }">
+          <process-node v-model="processList[index]" :step="index + 1" :detail="props.detail" @delete="deleteProcess(index)" />
+        </template>
+        <template #footer>
+          <process-node-add v-if="!props.detail" @click="processAdd" />
+        </template>
+      </draggable>
+    </div>
+    <choose-lab ref="chooseLabDialog" @confirm-checkout="batchChooseOver" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.process-container {
+  .process-draggable {
+    display: flex;
+    flex-wrap: wrap;
+  }
+}
+</style>
diff --git a/src/views/business/lab/myMeasure/components/processNode.vue b/src/views/business/lab/myMeasure/components/processNode.vue
new file mode 100644
index 0000000..fad76ab
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/processNode.vue
@@ -0,0 +1,215 @@
+<script lang="ts" setup name="ProcessNode">
+import {
+  Aim, Rank, Remove,
+} from '@element-plus/icons-vue'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
+// 逻辑代码
+const props = defineProps({
+  // 默认数据
+  modelValue: {
+    type: Object,
+    default: () => {
+      return {
+        measurePersonId: '', // 执行人
+        measurePerson: '', // 执行人名称
+        measureSegmentId: '', // 执行部门
+        measureSegment: '', // 执行部门名称
+        executiveItem: '', // 检定项目
+        alreadyCertifications: 0, // 已出具证书总数
+        requireCertifications: 0, // 应出具证书总数
+        measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        updateTime: '', // 流程更新时间
+      }
+    },
+  },
+  // 是否为详情展示页面
+  detail: {
+    type: Boolean,
+    default: false,
+  },
+  // 步骤
+  step: {
+    type: Number,
+    default: 1,
+  },
+})
+const emit = defineEmits(['update:modelValue', 'delete'])
+
+// ------------定义props参数----------
+const processNodeData = computed({
+  get() {
+    return props.modelValue
+  },
+  set(value) {
+    emit('update:modelValue', value)
+  },
+})
+// 检定环节可编辑-只有待分发状态可编辑
+const deptEdit = computed(() => {
+  const editStates = ['']
+  return editStates.includes(processNodeData.value.measureStatus)
+})
+// 检定人可编辑-待分配状态可编辑
+const personEdit = computed(() => {
+  const editStates = ['', '1', '2']
+  return editStates.includes(processNodeData.value.measureStatus)
+})
+// 证书可编辑-待分发、待分配、待检测状态可编辑
+const certificationEdit = computed(() => {
+  const editStates = ['', '1', '2', '3']
+  return editStates.includes(processNodeData.value.measureStatus)
+})
+// 节点可移动
+const canMove = computed(() => {
+  const editStates = ['', '1']
+  return editStates.includes(processNodeData.value.measureStatus)
+})
+
+// 选择人员
+const choosePersonShow = ref(false)
+const choosePerson = () => {
+  choosePersonShow.value = true
+}
+// 人员选择完毕
+const choosePersonOver = (person: { id: string; name: string }) => {
+  processNodeData.value.measurePersonId = person.id
+  processNodeData.value.measurePerson = person.name
+  choosePersonShow.value = false
+}
+
+// 选择实验室
+const chooseLabDialog = ref()
+const clickChoose = () => {
+  chooseLabDialog.value.initDialog(false)
+}
+const _selectStaffDialog = ref()
+// 实验室选择完毕
+const chooseOver = (lab: ILabList) => {
+  console.log(lab)
+  processNodeData.value.measureSegmentId = lab.deptId
+  processNodeData.value.measureSegment = lab.organizeName
+  // 定义一个对象关联上子组件的 ref 值（注意：这里的属性名必须跟子组件定义的 ref 值一模一样，否者会关联失效）
+  // 延迟使用，因为还没挂载
+  nextTick(() => {
+    _selectStaffDialog.value.fetchData()
+  })
+}
+
+// 移除该节点
+const deleteNode = () => {
+  emit('delete')
+}
+</script>
+
+<template>
+  <div class="process-node">
+    <div class="header">
+      <div class="step">
+        {{ props.step }}
+      </div>
+      <div class="buttons">
+        <el-icon v-show="canMove && !props.detail" class="icon-button" title="移除" @click="deleteNode">
+          <remove />
+        </el-icon>
+        <el-icon v-show="canMove && !props.detail" class="icon-button handle" title="移动">
+          <rank />
+        </el-icon>
+      </div>
+    </div>
+    <div>
+      <div class="line">
+        <span class="label">检定环节</span>
+        <el-input v-model="processNodeData.measureSegment" class="process-input" readonly size="small" :disabled="!deptEdit || props.detail">
+          <template v-if="deptEdit && !props.detail" #append>
+            <el-button :icon="Aim" size="small" link @click="clickChoose" />
+          </template>
+        </el-input>
+      </div>
+      <div class="line">
+        <span class="label">检定人员</span>
+        <el-input v-model="processNodeData.measurePerson" readonly class="process-input" size="small" :disabled="!personEdit || props.detail">
+          <template v-if="personEdit && !props.detail" #append>
+            <el-button :icon="Aim" size="small" link :disabled="processNodeData.measureSegment === ''" @click="choosePerson" />
+          </template>
+        </el-input>
+      </div>
+      <div class="line">
+        <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit || props.detail" /><span class="unit"> 份</span>
+      </div>
+      <div class="line">
+        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStatusName }}</span>
+      </div>
+      <div class="line">
+        <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
+      </div>
+    </div>
+    <!-- 选择实验室弹窗 -->
+    <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
+    <!-- 成员弹框 -->
+    <select-staff-dialog ref="_selectStaffDialog" v-model:visible="choosePersonShow" :data="[processNodeData.measurePersonId]" :dept-id="processNodeData.measureSegmentId" :dept-name="processNodeData.measureSegment" :multi="false" @change="choosePersonOver" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.process-node {
+  // display: inline-block;
+  margin-right: 10px;
+  width: 280px;
+  height: 215px;
+  border: 1px solid #e0e0e0;
+  padding: 5px 15px;
+  border-radius: 5px;
+  background-color: #fafafa;
+  margin-bottom: 10px;
+
+  .header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+    .step {
+      line-height: 28px;
+      font-size: 16px;
+      color: #3d7eff;
+      font-weight: bold;
+      margin-bottom: 5px;
+    }
+
+    .icon-button {
+      color: #999;
+      margin-left: 5px;
+      font-size: 16px;
+
+      &:hover {
+        cursor: pointer;
+      }
+    }
+  }
+
+  .line {
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 4px 0;
+
+    .label {
+      width: 80px;
+      font-size: 14px;
+    }
+
+    .process-input {
+      flex: 1;
+      font-size: 14px;
+    }
+
+    .unit {
+      margin-left: 5px;
+      font-size: 14px;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/lab/myMeasure/components/processNodeAdd.vue b/src/views/business/lab/myMeasure/components/processNodeAdd.vue
new file mode 100644
index 0000000..d7aeea0
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/processNodeAdd.vue
@@ -0,0 +1,46 @@
+<script lang="ts" setup name="ProcessNodeAdd">
+const emit = defineEmits(['click'])
+const add = () => {
+  emit('click')
+}
+</script>
+
+<template>
+  <div class="process-node" @click="add">
+    <div class="add">
+      <el-icon class="add-icon">
+        <plus />
+      </el-icon>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.process-node {
+  // display: inline-block;
+  width: 280px;
+  height: 215px;
+  border: 1px dashed #e0e0e0;
+  padding: 5px 15px;
+  border-radius: 5px;
+  background-color: #fbfbfb;
+
+  &:hover {
+    cursor: pointer;
+    background-color: #f5f5f5;
+  }
+
+  .add {
+    height: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    .add-icon {
+      vertical-align: middle;
+      font-size: 100px;
+      color: #999;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/lab/myMeasure/measureDetail.vue b/src/views/business/lab/myMeasure/measureDetail.vue
new file mode 100644
index 0000000..1a88be8
--- /dev/null
+++ b/src/views/business/lab/myMeasure/measureDetail.vue
@@ -0,0 +1,601 @@
+<!-- 任务分发 -->
+<script lang="ts" setup name="TaskEdit">
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance } from 'element-plus'
+import { ref } from 'vue'
+import ProcessConfig from './components/processConfig.vue'
+import type { ISampleMeasure, ITaskDetail } from './task-interface'
+import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { getTaskDetail } from '@/api/business/schedule/task'
+import countries from '@/components/AddressSelect/country-code.json'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+interface dictType {
+  id: string
+  name: string
+  value: string
+}
+const roleType = ref('distribute') // 角色类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员),
+const countryList = ref(countries) // 国家列表
+const loading = ref(false) // 表单加载状态
+const sampleId = ref('') // 样品详情id
+const orderId = ref('') // 委托书id
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const mesureTypeList = ref<dictType[]>([]) // 检定方式
+const $route = useRoute()
+
+// 获取字典值
+function getDict() {
+  // 获取样品属性
+  getDictByCode('measureCategory').then((response) => {
+    mesureCategoryList.value = response.data
+  })
+  // 获取样品属性
+  getDictByCode('measureType').then((response) => {
+    mesureTypeList.value = response.data
+  })
+}
+getDict()
+
+// 基本信息表单
+const sampleForm = ref<ISampleMeasure>({
+  id: '', // 样品id
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 样品型号
+  manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  phone: '', // 委托方电话
+  postalCode: '', // 委托方邮编
+  customerAddress: '', // 委托方地址
+  measureCategory: '', // 检校类别
+  manufacturer: '', // 生产厂家
+  manufacturerCountry: '', // 厂家国别
+  manufacturingDate: '', // 出厂年月
+  abc: '', // ABC
+  measurePeriod: '', // 检定周期
+  remark: '', // 备注
+  minioFileName: '', // 说明书
+  labelBind: '', // 标签绑定
+  measureType: '1', // 检定方式  1自检、2外包、3外检
+  measureTypeName: '', // 检定方式
+  measureLastTime: '', // 检定日期
+  validDeadline: '', // 有效日期
+  powerVoltage: '', // 电源电压
+  sampleBelong: '', // 样品所属
+  sampleBelongName: '', // 样品所属
+})
+const taskForm = ref <ITaskDetail> ({
+  measureContent: '', // 检定项目
+  specialRequire: '', // 客户特殊要求
+  orderId: '', // 委托单id
+  orderCode: '', // 委托单编号
+  certifications: '', // 证书类别
+  planDeliverTime: '', // 预约送达时间
+  requireOverTime: '', // 要求检完时间
+  measureProcessList: [], // 检定流程
+  measureSendBackList: [], // 退回信息
+  remark: '', // 备注
+  deliverer: '', // 送检人
+  delivererTel: '', // 送检人联系方式
+})
+const ruleFormRef = ref<FormInstance>()
+
+// 自定义校验规则--检定周期为正整数
+const validateMesurePeriod = (rule: any, value: any, callback: any) => {
+  if (value === '') {
+    callback()
+  }
+  else if (!(/(^[1-9]\d*$)/.test(value))) {
+    callback(new Error('请输入一个正整数'))
+  }
+  else {
+    callback()
+  }
+}
+
+// 校验规则
+const rules = ref({
+  mesurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
+}) // 表单验证规则
+
+// 其他关联数据列表
+const dataList = ref({
+  measureRecords: [] as SimpleMeasureRecord[],
+  certificationRecords: [] as SimpleCertification[],
+})
+
+// 获取检定记录
+const fetchMeasureRecords = function (query = null) {
+  dataList.value.measureRecords = []
+}
+// 获取检定证书
+const fetchCertifications = function (query = null) {
+  dataList.value.certificationRecords = []
+}
+interface Menu {
+  name: string
+  columns: TableColumn[]
+  pagination: boolean
+  list: 'measureRecords' | 'certificationRecords'
+  searchFunc: Function
+}
+// 菜单
+const menu: Menu[] = [
+  {
+    name: '检定记录',
+    columns: [
+      { text: '委托单编号', value: 'orderCode' },
+      { text: '委托单日期', value: 'orderTime' },
+      { text: '委托方代码', value: 'customerCode' },
+      { text: '委托方名称', value: 'customerName' },
+      { text: '送检人', value: 'deliverer' },
+      { text: '送检日期', value: 'deliverTime' },
+    ],
+    list: 'measureRecords',
+    pagination: true,
+    searchFunc: fetchMeasureRecords,
+  },
+  {
+    name: '检定证书',
+    columns: [
+      { text: '证书编号', value: 'certificationCode' },
+      { text: '证书名称', value: 'certificationName' },
+      { text: '证书类型', value: 'certificationType' },
+      { text: '证书出具日期', value: 'effectiveDate' },
+      { text: '证书有效期', value: 'expirationDate' },
+    ],
+    list: 'certificationRecords',
+    pagination: true,
+    searchFunc: fetchCertifications,
+  },
+]
+
+const currentMenu = ref('证书监控')
+const currentMenuObj = computed(() => {
+  return menu.find(item => item.name === currentMenu.value)
+})
+
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 打印表单
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '样品详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>样品详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+// 保存样品信息
+function saveForm(formEl: FormInstance | undefined) {
+  if (!formEl) { return }
+  formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认修改样品信息吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (sampleForm.value.id) {
+          updateSample(sampleForm.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+      })
+    }
+  })
+}
+// 获取详情
+const getSampleInfo = () => {
+  getSapmleDetail({ id: sampleId.value }).then((res) => {
+    sampleForm.value = res.data
+  })
+}
+// 获取分发详情
+const getInfo = () => {
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    taskForm.value.specialRequire = res.data.specialRequire // 客户特殊要求
+    taskForm.value.deliverer = res.data.deliverer // 送检人
+    taskForm.value.delivererTel = res.data.delivererTel // 送检人联系方式
+    taskForm.value.measureContent = res.data.measureContent // 检定项目
+    taskForm.value.measureProcessList = res.data.measureProcessList // 检定流程
+    taskForm.value.measureSendBackList = res.data.measureSendBackList // 退回流程
+    console.log('pppppp')
+    console.log(taskForm.value.measureProcessList)
+
+    // 改用一个接口获取
+    sampleForm.value = res.data
+  })
+}
+
+// 点击标签绑定的扫描
+const startScan = () => {
+  // TODO
+}
+
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
+}
+// 保存流程按钮点击
+const saveProcess = () => {
+  processConfigRef.value.saveProcess()
+}
+
+// 文件上传
+const fileRef = ref()
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    // UploadFile(fd).then((res) => {
+    //   if (res.code === 200) {
+    //     sampleForm.value.minioFileName = res.data[0]
+    //     // 重置当前验证
+    //     ElMessage.success('文件上传成功')
+    //   }
+    //   else {
+    //     ElMessage.error(res.message)
+    //   }
+    // })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+onMounted(() => {
+  console.log($route)
+  // 从路由中获取页面类型参数
+  if ($route.params && $route.params.role) {
+    roleType.value = $route.params.role as string // 使用角色
+  }
+  if ($route.params.id) {
+    sampleId.value = $route.params.id as string
+    orderId.value = $route.query.order as string
+    // 获取分发详情
+    getInfo()
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="样品详情">
+      <template #btns>
+        <el-button v-if="roleType === 'detail'" v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <!-- <el-button v-if="roleType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button> -->
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <div id="form">
+        <el-form
+          ref="ruleFormRef"
+          :model="sampleForm"
+          :label-width="120"
+          label-position="right"
+          :rules="rules"
+        >
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="样品编号:" prop="sampleNo">
+                <el-input
+                  v-model="sampleForm.sampleNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品名称:" prop="sampleName">
+                <el-input
+                  v-model="sampleForm.sampleName"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品型号:" prop="sampleModel">
+                <el-input
+                  v-model="sampleForm.sampleModel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂编号:" prop="manufacturingNo">
+                <el-input
+                  v-model="sampleForm.manufacturingNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方代码" prop="customerNo">
+                <el-input
+                  v-model="sampleForm.customerNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方名称" prop="customerName">
+                <el-input
+                  v-model="sampleForm.customerName"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方电话" prop="phone">
+                <el-input
+                  v-model="sampleForm.phone"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方电话'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方邮编" prop="postalCode">
+                <el-input
+                  v-model="sampleForm.postalCode"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方邮编'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="18">
+              <el-form-item label="委托方地址:" prop="companyAddress">
+                <el-input
+                  v-model="sampleForm.customerAddress"
+                  type="textarea"
+                  autosize
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方地址'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="校检类别:">
+                <el-select
+                  v-model="sampleForm.measureCategory"
+                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :disabled="roleType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="生产厂家:">
+                <el-input
+                  v-model="sampleForm.manufacturer"
+                  :placeholder="roleType === 'detail' ? '' : '请输入生产厂家'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="厂家国别:">
+                <el-select
+                  v-model="sampleForm.manufacturerCountry"
+                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :disabled="roleType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂年月:">
+                <el-date-picker
+                  v-model="sampleForm.manufacturingDate"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="roleType === 'detail' ? '' : '请输入出厂年月'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="ABC:">
+                <el-select
+                  v-model="sampleForm.abc"
+                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :disabled="roleType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="送检人:">
+                <el-input
+                  v-model="taskForm.deliverer"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="联系方式:">
+                <el-input
+                  v-model="taskForm.delivererTel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="检定项目:" prop="mesureContent">
+                <el-input
+                  v-model="taskForm.measureContent"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  disabled
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检定周期（月）:">
+                <el-input
+                  v-model="sampleForm.measurePeriod"
+                  :placeholder="roleType === 'detail' ? '' : '请输入检定周期'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="备注:">
+                <el-input
+                  v-model="sampleForm.remark"
+                  type="textarea"
+                  :rows="2"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  disabled
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检定方式:">
+                <el-select
+                  v-model="sampleForm.measureType"
+                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :disabled="roleType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of mesureTypeList" :key="item.value" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="标签绑定:">
+                <el-input
+                  v-model="sampleForm.labelBind"
+                  :placeholder="roleType === 'detail' ? '' : '标签绑定'"
+                  :disabled="roleType === 'detail'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                >
+                  <template v-if="roleType !== 'detail'" #append>
+                    <el-button>
+                      扫描
+                    </el-button>
+                  </template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="14">
+              <el-form-item label="说明书:">
+                <show-photo v-if="sampleForm.minioFileName" :minio-file-name="sampleForm.minioFileName" />
+                <span v-else-if="roleType === 'detail'">无</span>
+                <input v-show="roleType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="roleType !== 'detail'" id="file" type="primary" :disabled="roleType === 'detail'" :style="{ 'margin-left': sampleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ sampleForm.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </detail-page>
+    <detail-block v-if="taskForm.measureProcessList && taskForm.measureProcessList.length >= 1" title="检定流程">
+      <!-- <template #btns>
+        <el-button type="primary" style="margin-bottom: 10px;" @click="batchProcessAdd">
+          批量添加
+        </el-button>
+        <el-button type="primary" style="margin-bottom: 10px;" @click="saveProcess">
+          保存
+        </el-button>
+      </template> -->
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" :detail="true" />
+    </detail-block>
+    <!-- 退回流程 -->
+    <detail-block v-if="taskForm.measureSendBackList && taskForm.measureSendBackList.length >= 1" title="退回流程">
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureSendBackList" :sample-id="sampleId" :detail="true" />
+    </detail-block>
+    <!-- 检定记录、检定证书 -->
+    <detail-block-switch :title="currentMenu">
+      <template #menu>
+        <el-radio-group v-model="currentMenu">
+          <el-radio-button label="证书监控">
+            证书监控
+          </el-radio-button>
+          <el-radio-button label="检定记录">
+            检定记录
+          </el-radio-button>
+          <el-radio-button label="检定证书">
+            检定证书
+          </el-radio-button>
+        </el-radio-group>
+      </template>
+      <!-- 证书监控 -->
+      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" />
+      <!-- 检定记录 -->
+      <measure-records v-if="currentMenu === '检定记录'" :sample-id="sampleId" />
+      <!-- 证书记录 -->
+      <certification-records v-if="currentMenu === '检定证书'" :sample-id="sampleId" />
+    </detail-block-switch>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
+
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 62f8830..e4a4637 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -13,7 +13,6 @@
 import { getMyMeasureList, myExecutiveDone, myExecutiveReceive } from '@/api/business/schedule/task'
 import type { dictType } from '@/global'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
-
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
@@ -128,7 +127,7 @@
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`myMeasureDetail/detail/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
diff --git a/src/views/business/lab/myMeasure/task-interface.ts b/src/views/business/lab/myMeasure/task-interface.ts
new file mode 100644
index 0000000..6503a12
--- /dev/null
+++ b/src/views/business/lab/myMeasure/task-interface.ts
@@ -0,0 +1,169 @@
+// 任务列表查询条件
+export interface ITaskQuery {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  orderNo: string // 委托书编号
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  isUrgent: string // 是否加急
+  sampleBelong: string // 样品属性
+  sampleStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
+  limit: number
+  offset: number
+}
+
+// 我的检测/部门检测查询条件
+export interface ILabQuery {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  orderNo: string // 委托书编号
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  isUrgent: string // 是否加急
+  sampleBelong: string // 样品属性
+  measureStatus: string // 分发状态
+  startTime: string | number //	应检定开始时间
+  endTime: string | number //	应检定结束时间
+  limit: number
+  offset: number
+}
+// 任务列表-返回值
+export interface ITaskList {
+  orderId: string // 委托书编号
+  sampleId: string // 样品唯一标识
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderNo: string // 委托书编号
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  isUrgent: number // 是否加急
+  isUrgentName?: string // 是否加急
+  requireOverTime: string // 应检完时间
+  sampleBelong: string // 样品属性
+  sampleBelongName: string // 样品属性
+  currentMeasureState: string // 当前检定环节
+  currentMeasureStateName: string // 当前检定环节
+  alreadyCertifications: number // 已出具证书总数
+  requireCertifications: number // 应出具证书总数
+  distributeState: string // 分发性质-初次分发、退回分发
+  handOutProperty: string // 分发性质-初次分发、退回分发
+  id?: string // 实验室id
+}
+
+// 实验室检测/我的检测列表
+export interface IlabMeasureList extends ITaskList {
+  id: string // 实验室检测id
+  measurePersonId: string // 检测人id
+  measureSegmentId: string // 检测部门id
+  currentSegmentId: string // 检测部门id (新)
+}
+
+// 全部检测流程节点
+export interface ISchedule {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications: number // 应出具证书总数
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: string // 流程更新时间
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
+  distributePerson: string // 分配人
+  distributeTime: string // 分配时间
+  startTime: string // 检定开始时间
+  overTime: string // 检定完成时间
+}
+// 检测流程节点
+export interface IScheduleSet {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications: number // 应出具证书总数
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: string // 流程更新时间
+  measureSequence?: string // 检测顺序
+}
+// 退回流程节点
+export interface IScheduleBack {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications?: number // 应出具证书总数
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
+}
+
+// 样品检测信息
+export interface ISampleMeasure {
+  id: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  manufacturingNo: string // 出厂编号
+  customerNo: string // 委托方代码
+  customerId: string // 委托方id
+  customerName: string // 委托方名称
+  phone: string // 委托方电话
+  postalCode: string // 委托方邮编
+  customerAddress: string // 委托方地址
+  measureCategory: string // 检校类别
+  manufacturer: string // 生产厂家
+  manufacturerCountry: string // 厂家国别
+  manufacturingDate: string // 出厂年月
+  abc: string // ABC
+  measurePeriod: string // 检定周期
+  minioFileName: string // 说明书
+  labelBind: string // 标签绑定
+  measureType: string // 检定方式
+  measureTypeName: string // 检定方式
+  measureLastTime?: string // 检定日期
+  validDeadline: string // 有效日期
+  powerVoltage: string // 电源电压
+  sampleBelong: string // 样品所属
+  sampleBelongName: string // 样品所属
+  remark: string // 备注
+}
+
+export interface ITaskDetail {
+  measureContent: string // 检定项目
+  measureProcessList: ISchedule[] // 检定流程
+  measureSendBackList: ISchedule[] // 退回信息
+  remark: string // 备注
+  orderId: string // 委托单id
+  orderCode: string // 委托单编号
+  certifications: string // 证书类别
+  planDeliverTime: string // 预约送达时间
+  requireOverTime: string // 要求检完时间
+  specialRequire: string // 客户特殊要求
+  deliverer: string // 送检人
+  delivererTel: string // 送检人联系方式
+}
+
+// 退回
+export interface ISendBack {
+  id: string // 实验室检测id
+  measurePersonId: string // 检定人员id
+  measureSegmentId: string //	检定环节，实验室id
+  operateReason: string // 退回原因
+  orderId: string // 委托书id
+  sampleId: string //	样品id
+}
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index 0efec98..99a6852 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -141,7 +141,6 @@
 // 点击详情
 const handleDetail = (row: ITaskList) => {
   console.log('跳转任务分发详情')
-
   $router.push(`/schedule/task/distribute/${row.sampleId}?order=${row.orderId}`)
 }
 
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 6ad9900..dbaa437 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -83,11 +83,7 @@
     text: '申请时间',
     value: 'time',
     align: 'center',
-  },
-  {
-    text: '审批状态',
-    value: 'approvalStatusName',
-    align: 'center',
+    width: 160,
   },
 ]) // 表格
 // 数据查询
@@ -456,6 +452,16 @@
           </el-table-column>
         </template>
         <template #columns>
+          <el-table-column v-if="activeTitle === '已归还'" label="归还时间" width="160" align="center">
+            <template #default="scope">
+              {{ scope.row.backTime }}
+            </template>
+          </el-table-column>
+          <el-table-column label="审批状态" width="120" align="center">
+            <template #default="scope">
+              {{ scope.row.approvalStatusName }}
+            </template>
+          </el-table-column>
           <el-table-column label="操作" align="center" :width="activeTitle === '待借用' ? '130' : activeTitle === '已借用' ? '110' : '80'">
             <template #default="{ row }">
               <el-button size="small" type="primary" link @click="detail(row)">
diff --git a/src/views/device/borrow/editHandle.vue b/src/views/device/borrow/editHandle.vue
index 9a5b2a6..4e0bc5c 100644
--- a/src/views/device/borrow/editHandle.vue
+++ b/src/views/device/borrow/editHandle.vue
@@ -26,6 +26,7 @@
   applyUnit: '', // 申请单位
   applyPerson: '', // 申请人
   time: '', // 借用时间
+  backTime: '', // 归还时间
   applyDesc: '', // 申请说明
 })
 const list = ref<IdeviceList[]>([])// 表格数据
@@ -163,7 +164,18 @@
                     />
                   </el-form-item>
                 </el-col>
-                <el-col :span="12">
+                <el-col :span="6">
+                  <el-form-item label="归还时间" prop="backTime">
+                    <el-date-picker
+                      v-model="form.backTime"
+                      type="datetime"
+                      format="YYYY-MM-DD hh:mm"
+                      value-format="YYYY-MM-DD hh:mm"
+                      disabled
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="18">
                   <el-form-item label="申请说明" prop="applyDesc">
                     <el-input v-model="form.applyDesc" type="textarea" disabled autosize />
                   </el-form-item>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 2ab77ef..3f90519 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -38,6 +38,7 @@
 const isDetail = ref(false)
 const ruleForm = ref<fixedAssetsType>({
   assetNo: '', // 资产编号
+  compulsoryVerification: '', // 强制检定
   assetType: '', // 资产类型
   assetSource: '', // 资产来源
   equipmentNo: '', // 设备编号
@@ -486,6 +487,14 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
+          <el-form-item label="强制检定" prop="compulsoryVerification">
+            <el-select v-model="ruleForm.compulsoryVerification" :placeholder="title === 'detail' ? '' : '强制检定'" :disabled="title === 'detail'" style="width: 100%;">
+              <el-option label="是" value="1" />
+              <el-option label="否" value="0" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
           <el-form-item label="检定周期(月)" prop="mesureCycle">
             <el-input-number v-model="ruleForm.mesureCycle" :min="12" :max="60" :step="12" :disabled="title === 'detail'" />
             <!-- <el-select v-model="ruleForm.mesureCycle" :placeholder="title === 'detail' ? '' : '检定周期'" clearable style="width: 100%;">
@@ -509,7 +518,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="使用人" prop="usePerson">
-            <el-select v-model="ruleForm.usePerson" :placeholder="title === 'detail' ? '' : '使用人'" :disabled="title === 'detail'" style="width: 100%;">
+            <el-select v-model="ruleForm.usePerson" filterable :placeholder="title === 'detail' ? '' : '使用人'" :disabled="title === 'detail'" style="width: 100%;">
               <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
             </el-select>
           </el-form-item>
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index 479ae05..e46753d 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -94,6 +94,7 @@
   { text: '型号', value: 'modelNo', align: 'center' },
   { text: 'ABC', value: 'abc', align: 'center', width: 58 },
   { text: '检定方式', value: 'mesureTypeName', align: 'center', width: 90 },
+  { text: '强制检定', value: 'compulsoryVerification', align: 'center', width: 90 },
   { text: '管理状态', value: 'managerStateName', align: 'center', width: 100 },
   { text: '使用部门', value: 'useDeptName', align: 'center' },
   { text: '使用人', value: 'usePersonName', align: 'center' },
@@ -139,7 +140,10 @@
   }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows
+      list.value = res.data.rows.map((item: any) => {
+        item.validDate = item.validDate.split(' ')[0]
+        return item
+      })
       total.value = res.data.total
     }
     loadingTable.value = false
@@ -403,7 +407,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="120">
+            <el-table-column label="操作" align="center" width="120" fixed="right">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/device/standingBook/standingBook-interface.ts b/src/views/device/standingBook/standingBook-interface.ts
index bd55019..ee29254 100644
--- a/src/views/device/standingBook/standingBook-interface.ts
+++ b/src/views/device/standingBook/standingBook-interface.ts
@@ -105,7 +105,7 @@
   validDate: string // 有效日期
   version: string // 版本号
   weight: string // 重量（吨）
-
+  compulsoryVerification?: string | number // 强制检定
 }
 
 // 固定资产-查询用
diff --git a/src/views/device/stateManage/components/status-interface.ts b/src/views/device/stateManage/components/status-interface.ts
index 93410a7..dd27189 100644
--- a/src/views/device/stateManage/components/status-interface.ts
+++ b/src/views/device/stateManage/components/status-interface.ts
@@ -90,4 +90,6 @@
 // 目录数组
 export interface EquipmentListRow {
   equipmentId: string
+  assetOriginValue?: string
+  financialValue?: string
 }

diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index b21ad07..cf4a5b9 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -260,6 +260,19 @@
         },
       },
       {
+        path: 'myMeasureDetail/:role/:id',
+        name: 'MyMeasureDetail',
+        component: () => import('@/views/business/lab/myMeasure/measureDetail.vue'),
+        meta: {
+          title: '我的检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          auth: '/lab/myMeasure',
+          activeMenu: '/lab/myMeasureList',
+        },
+      },
+      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -270,6 +283,19 @@
         },
       },
       {
+        path: 'myMeasureDetail/:role/:id',
+        name: 'MyMeasureDetail',
+        component: () => import('@/views/business/lab/myMeasure/measureDetail.vue'),
+        meta: {
+          title: '部门检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          auth: '/lab/deptMeasureList',
+          activeMenu: '/lab/deptMeasureList',
+        },
+      },
+      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 066f192..7a6ebea 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -102,8 +102,9 @@
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
-          localStorage.removeItem('name')
           localStorage.removeItem('token')
+          localStorage.removeItem('nameId')
+          localStorage.removeItem('depId')
           this.username = ''
           this.token = ''
           this.roleList = []
@@ -121,7 +122,8 @@
               this.roleList = res.data.roleIds
               this.roleNames = res.data.roleNames
               this.roleTips = res.data.roleTips
-              localStorage.setItem('name', res.data.name)
+              localStorage.setItem('nameId', res.data.id)
+              localStorage.setItem('depId', res.data.deptId)
             }
             else {
               reject('该用户无角色')
diff --git a/src/views/business/board/overdueReminder/detail.vue b/src/views/business/board/overdueReminder/detail.vue
index 92987d1..0239b71 100644
--- a/src/views/business/board/overdueReminder/detail.vue
+++ b/src/views/business/board/overdueReminder/detail.vue
@@ -5,7 +5,7 @@
 import { ref } from 'vue'
 import dayjs from 'dayjs'
 import ProcessConfig from '@/views/business/schedule/task/components/processConfig.vue'
-import type { ISampleMeasure, ITaskDetail } from '@/views/business/schedule/task/task-interface'
+import type { ISampleMeasure, ITaskDetail } from '@/views/business/schedule/task/task-interface.js'
 import type { Menu, SimpleCertification, SimpleMeasureRecord, dictType } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getTaskDetail } from '@/api/business/schedule/task'
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index d6cc168..05fd811 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -4,8 +4,8 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import DistributeDialog from '../../schedule/task/components/distributeDialog.vue'
 import RollbackDialog from './../components/rollbackDialog.vue'
-import DistributeDialog from './../components/distributeDialog.vue'
 import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
@@ -131,7 +131,8 @@
 const depId = ref('')
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
+  $router.push(`myMeasureDetail/detail/${row.sampleId}?order=${row.orderId}`)
+  // $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
diff --git a/src/views/business/lab/myMeasure/components/chooseLab.vue b/src/views/business/lab/myMeasure/components/chooseLab.vue
new file mode 100644
index 0000000..0dcebfc
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/chooseLab.vue
@@ -0,0 +1,203 @@
+<script setup lang="ts" name="ChooseLab">
+// 选择实验室
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { ILabList, ILabSearchQuery } from '@/views/business/schedule/task/components/lab-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getOrganizeList } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
+const emits = defineEmits(['confirmCheckout'])
+// 是否多选
+const multi = ref(false)
+const dialogVisible = ref(false)
+
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
+// 查询条件
+const listQuery = ref<ILabSearchQuery>({
+  organizeNo: '', // 实验室编号
+  organizeName: '', // 实验室名称
+  meterMajor: '', // 专业
+  organizeType: '3', // 组织类型
+  director: '', // 负责人
+  isLab: '1', // 是否是实验室
+  createStartTime: '',
+  createEndTime: '',
+})
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '实验室名称', value: 'organizeName', width: '160', align: 'center' },
+  // { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
+  { text: '负责人', value: 'director', align: 'center', width: '120' },
+  { text: '计量专业', value: 'meterMajorName', align: 'center' },
+  { text: '实验室能力', value: 'labCapacityName', align: 'center' },
+])
+// 表格数据
+const list = ref<ILabList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 多选的内容
+const checkoutList = ref<ILabList[]>([])
+// 单选
+const singleChecked = ref()
+// 数据查询
+function fetchData(isNowPage = false) {
+  getOrganizeList(listQuery.value).then((response) => {
+    list.value = response.data
+    total.value = parseInt(response.data.length)
+    loadingTable.value = false
+  })
+  loadingTable.value = false
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    organizeNo: '', // 实验室编号
+    organizeName: '', // 实验室名称
+    meterMajor: '', // 专业
+    organizeType: '3', // 组织类型
+    director: '', // 负责人
+    isLab: '1', // 是否是实验室
+    createStartTime: '',
+    createEndTime: '',
+  }
+}
+
+// 点击取消
+const cancle = () => {
+  dialogVisible.value = false
+}
+// 点击确定
+const clickConfirm = () => {
+  // 如果多选
+  if (multi.value) {
+    if (!checkoutList.value.length) {
+      ElMessage({
+        message: '请选择至少一个实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      emits('confirmCheckout', checkoutList.value)
+    }
+  }
+  else {
+    if (!singleChecked.value) {
+      ElMessage({
+        message: '请选择检定实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      const checkValue = list.value.find(item => item.id == singleChecked.value)
+      emits('confirmCheckout', checkValue)
+    }
+  }
+
+  cancle()
+}
+
+// 初始化弹窗
+const initDialog = (multiSelect: boolean) => {
+  multi.value = multiSelect
+  dialogVisible.value = true
+  fetchData()
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <div class="choose-lab-dialog">
+    <el-dialog v-model="dialogVisible" :title="`选择检定实验室${(checkoutList.length > 0 && multi) ? `(已选择${checkoutList.length}个实验室)` : ''}`" width="1000" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.organizeName"
+            placeholder="实验室名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-select
+            v-model.trim="listQuery.meterMajor"
+            clearable
+            placeholder="计量专业"
+          >
+            <el-option
+              v-for="item in measureMajorList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <div style="padding: 5px 10px;">
+        <normal-table
+          :data="list"
+          :total="total"
+          :columns="columns"
+          :query="listQuery"
+          :list-loading="loadingTable"
+          :pagination="false"
+          size="small"
+          @multi-select="handleSelectionChange"
+        >
+          <!-- :is-showmulti-select="multi" -->
+          <!-- :is-multi="multi" -->
+          <template v-if="!multi" #preColumns>
+            <el-table-column label="#" width="55" align="center" fixed="left">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="" width="40" align="center" fixed>
+              <template #default="scope">
+                <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </div>
+
+      <template #footer>
+        <el-button type="primary" @click="clickConfirm">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.choose-lab-dialog {
+  :deep(.el-radio__label) {
+    display: none;
+  }
+}
+</style>
diff --git a/src/views/business/lab/myMeasure/components/lab-interface.ts b/src/views/business/lab/myMeasure/components/lab-interface.ts
new file mode 100644
index 0000000..02b0d1d
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/lab-interface.ts
@@ -0,0 +1,29 @@
+// 查询参数类型
+export interface ILabSearchQuery {
+  organizeNo: string // 组织编号
+  organizeName: string // 名称
+  organizeType: string // 类型-3科室
+  isLab: '1' // 是否是实验室
+  director: string // 负责人
+  meterMajor: string // 专业
+  createStartTime: '' // 创建开始时间
+  createEndTime: '' // 创建结束事假
+}
+
+// 部门返回值对象类型
+export interface ILabList {
+  id: string
+  deptId: string // 部门id
+  director: string // 负责人名称
+  phone: string // 负责人电话
+  meterMajor: string // 计量专业
+  organizeNo: string // 实验室编号
+  organizeName: string // 实验室名称
+  measureItems: string // 全部检测能力
+  pDeptId: string // 所属部门
+  pDeptName: string // 所属部门
+  organizeType: string // 组织类型
+  remark?: string // 备注
+  createTime?: string // 创建时间
+  updateTime?: string // 更新时间
+}
diff --git a/src/views/business/lab/myMeasure/components/processConfig.vue b/src/views/business/lab/myMeasure/components/processConfig.vue
new file mode 100644
index 0000000..bb66076
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/processConfig.vue
@@ -0,0 +1,161 @@
+<script setup lang="ts" name="ProcessConfig">
+import { ref } from 'vue'
+import draggable from 'vuedraggable'
+import { ElMessage } from 'element-plus'
+import type { ISchedule, IScheduleSet } from '../task-interface'
+import ProcessNode from './processNode.vue'
+import ProcessNodeAdd from './processNodeAdd.vue'
+import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
+import { setMeasureProcess, setMeasureProcessByFfy } from '@/api/business/schedule/task'
+const props = defineProps({
+  type: {
+    type: String,
+    default: 'distribute',
+  }, // 类型，决定调用哪个接口
+  // 是否为详情展示页面
+  detail: {
+    type: Boolean,
+    default: false,
+  },
+  // 样品id
+  sampleId: {
+    type: String,
+    required: true,
+  },
+  // 委托单id
+  orderId: {
+    type: String,
+    required: true,
+  },
+  list: {
+    type: Array,
+    default: () => [],
+  },
+})
+const emits = defineEmits(['saveOver'])
+// 默认流程节点
+const defaultProcess: IScheduleSet = {
+  measurePersonId: '', // 执行人
+  measurePerson: '', // 执行人名称
+  measureSegmentId: '', // 执行部门
+  measureSegment: '', // 执行部门名称
+  executiveItem: '', // 检定项目
+  // alreadyCertifications: 0, // 已出具证书总数
+  requireCertifications: 1, // 应出具证书总数
+  measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: '', // 流程更新时间
+}
+// 检定流程列表
+const processList = ref<IScheduleSet[]>([
+  { ...defaultProcess },
+])
+
+watch(() => props.list, (val) => {
+  if (props.list.length > 0) {
+    processList.value = props.list as ISchedule[]
+  }
+},
+{ deep: true, immediate: true })
+
+// 点击添加流程
+const processAdd = () => {
+  processList.value.push({ ...defaultProcess })
+}
+// 检查是否允许移动
+const checkMove = (evt: any) => {
+  // 目的位置元素evt.relatedContext.element
+  // 当前拖动元素evt.draggedContext.element
+  if (evt.relatedContext.element.measureState !== '0') {
+    return false
+  }
+  return true
+}
+
+// 选择实验室弹窗
+const chooseLabDialog = ref()
+// 批量添加流程
+const batchProcessAdd = () => {
+  chooseLabDialog.value.initDialog(true)
+}
+
+// 批量添加实验室
+const batchChooseOver = (labs: ILabList[]) => {
+  for (const item of labs) {
+    const processTemp: IScheduleSet = {
+      measurePersonId: '', // 执行人
+      measurePerson: '', // 执行人名称
+      measureSegmentId: item.deptId, // 执行部门
+      measureSegment: item.organizeName, // 执行部门名称
+      executiveItem: '', // 检定项目
+      measureSequence: '', // 监测顺序
+      // alreadyCertifications: 0, // 已出具证书总数
+      requireCertifications: 1, // 应出具证书总数
+      measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      updateTime: '', // 流程更新时间
+    }
+    processList.value.push(processTemp)
+  }
+}
+
+// 保存流程
+const saveProcess = () => {
+  const form = {
+    measureProcessList: processList.value,
+    executiveList: processList.value,
+    orderId: props.orderId,
+    sampleId: props.sampleId,
+  }
+  // 处理顺序
+  for (const key in form.measureProcessList) {
+    form.measureProcessList[key].measureSequence = (parseInt(key) + 1).toString()
+  }
+  if (props.type == 'distribute') {
+    setMeasureProcess(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
+  else {
+    setMeasureProcessByFfy(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
+}
+// 删除流程
+const deleteProcess = (index: number) => {
+  processList.value.splice(index, 1)
+}
+
+// --------暴露方法
+defineExpose({ saveProcess, batchProcessAdd, deleteProcess })
+</script>
+
+<template>
+  <div>
+    <div class="process-container">
+      <draggable v-model="processList" item-key="id" class="process-draggable" handle=".handle" :move="checkMove">
+        <!-- eslint-disable-next-line vue/no-unused-vars -->
+        <template #item="{ process, index }">
+          <process-node v-model="processList[index]" :step="index + 1" :detail="props.detail" @delete="deleteProcess(index)" />
+        </template>
+        <template #footer>
+          <process-node-add v-if="!props.detail" @click="processAdd" />
+        </template>
+      </draggable>
+    </div>
+    <choose-lab ref="chooseLabDialog" @confirm-checkout="batchChooseOver" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.process-container {
+  .process-draggable {
+    display: flex;
+    flex-wrap: wrap;
+  }
+}
+</style>
diff --git a/src/views/business/lab/myMeasure/components/processNode.vue b/src/views/business/lab/myMeasure/components/processNode.vue
new file mode 100644
index 0000000..fad76ab
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/processNode.vue
@@ -0,0 +1,215 @@
+<script lang="ts" setup name="ProcessNode">
+import {
+  Aim, Rank, Remove,
+} from '@element-plus/icons-vue'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
+// 逻辑代码
+const props = defineProps({
+  // 默认数据
+  modelValue: {
+    type: Object,
+    default: () => {
+      return {
+        measurePersonId: '', // 执行人
+        measurePerson: '', // 执行人名称
+        measureSegmentId: '', // 执行部门
+        measureSegment: '', // 执行部门名称
+        executiveItem: '', // 检定项目
+        alreadyCertifications: 0, // 已出具证书总数
+        requireCertifications: 0, // 应出具证书总数
+        measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        updateTime: '', // 流程更新时间
+      }
+    },
+  },
+  // 是否为详情展示页面
+  detail: {
+    type: Boolean,
+    default: false,
+  },
+  // 步骤
+  step: {
+    type: Number,
+    default: 1,
+  },
+})
+const emit = defineEmits(['update:modelValue', 'delete'])
+
+// ------------定义props参数----------
+const processNodeData = computed({
+  get() {
+    return props.modelValue
+  },
+  set(value) {
+    emit('update:modelValue', value)
+  },
+})
+// 检定环节可编辑-只有待分发状态可编辑
+const deptEdit = computed(() => {
+  const editStates = ['']
+  return editStates.includes(processNodeData.value.measureStatus)
+})
+// 检定人可编辑-待分配状态可编辑
+const personEdit = computed(() => {
+  const editStates = ['', '1', '2']
+  return editStates.includes(processNodeData.value.measureStatus)
+})
+// 证书可编辑-待分发、待分配、待检测状态可编辑
+const certificationEdit = computed(() => {
+  const editStates = ['', '1', '2', '3']
+  return editStates.includes(processNodeData.value.measureStatus)
+})
+// 节点可移动
+const canMove = computed(() => {
+  const editStates = ['', '1']
+  return editStates.includes(processNodeData.value.measureStatus)
+})
+
+// 选择人员
+const choosePersonShow = ref(false)
+const choosePerson = () => {
+  choosePersonShow.value = true
+}
+// 人员选择完毕
+const choosePersonOver = (person: { id: string; name: string }) => {
+  processNodeData.value.measurePersonId = person.id
+  processNodeData.value.measurePerson = person.name
+  choosePersonShow.value = false
+}
+
+// 选择实验室
+const chooseLabDialog = ref()
+const clickChoose = () => {
+  chooseLabDialog.value.initDialog(false)
+}
+const _selectStaffDialog = ref()
+// 实验室选择完毕
+const chooseOver = (lab: ILabList) => {
+  console.log(lab)
+  processNodeData.value.measureSegmentId = lab.deptId
+  processNodeData.value.measureSegment = lab.organizeName
+  // 定义一个对象关联上子组件的 ref 值（注意：这里的属性名必须跟子组件定义的 ref 值一模一样，否者会关联失效）
+  // 延迟使用，因为还没挂载
+  nextTick(() => {
+    _selectStaffDialog.value.fetchData()
+  })
+}
+
+// 移除该节点
+const deleteNode = () => {
+  emit('delete')
+}
+</script>
+
+<template>
+  <div class="process-node">
+    <div class="header">
+      <div class="step">
+        {{ props.step }}
+      </div>
+      <div class="buttons">
+        <el-icon v-show="canMove && !props.detail" class="icon-button" title="移除" @click="deleteNode">
+          <remove />
+        </el-icon>
+        <el-icon v-show="canMove && !props.detail" class="icon-button handle" title="移动">
+          <rank />
+        </el-icon>
+      </div>
+    </div>
+    <div>
+      <div class="line">
+        <span class="label">检定环节</span>
+        <el-input v-model="processNodeData.measureSegment" class="process-input" readonly size="small" :disabled="!deptEdit || props.detail">
+          <template v-if="deptEdit && !props.detail" #append>
+            <el-button :icon="Aim" size="small" link @click="clickChoose" />
+          </template>
+        </el-input>
+      </div>
+      <div class="line">
+        <span class="label">检定人员</span>
+        <el-input v-model="processNodeData.measurePerson" readonly class="process-input" size="small" :disabled="!personEdit || props.detail">
+          <template v-if="personEdit && !props.detail" #append>
+            <el-button :icon="Aim" size="small" link :disabled="processNodeData.measureSegment === ''" @click="choosePerson" />
+          </template>
+        </el-input>
+      </div>
+      <div class="line">
+        <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit || props.detail" /><span class="unit"> 份</span>
+      </div>
+      <div class="line">
+        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStatusName }}</span>
+      </div>
+      <div class="line">
+        <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
+      </div>
+    </div>
+    <!-- 选择实验室弹窗 -->
+    <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
+    <!-- 成员弹框 -->
+    <select-staff-dialog ref="_selectStaffDialog" v-model:visible="choosePersonShow" :data="[processNodeData.measurePersonId]" :dept-id="processNodeData.measureSegmentId" :dept-name="processNodeData.measureSegment" :multi="false" @change="choosePersonOver" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.process-node {
+  // display: inline-block;
+  margin-right: 10px;
+  width: 280px;
+  height: 215px;
+  border: 1px solid #e0e0e0;
+  padding: 5px 15px;
+  border-radius: 5px;
+  background-color: #fafafa;
+  margin-bottom: 10px;
+
+  .header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+    .step {
+      line-height: 28px;
+      font-size: 16px;
+      color: #3d7eff;
+      font-weight: bold;
+      margin-bottom: 5px;
+    }
+
+    .icon-button {
+      color: #999;
+      margin-left: 5px;
+      font-size: 16px;
+
+      &:hover {
+        cursor: pointer;
+      }
+    }
+  }
+
+  .line {
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 4px 0;
+
+    .label {
+      width: 80px;
+      font-size: 14px;
+    }
+
+    .process-input {
+      flex: 1;
+      font-size: 14px;
+    }
+
+    .unit {
+      margin-left: 5px;
+      font-size: 14px;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/lab/myMeasure/components/processNodeAdd.vue b/src/views/business/lab/myMeasure/components/processNodeAdd.vue
new file mode 100644
index 0000000..d7aeea0
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/processNodeAdd.vue
@@ -0,0 +1,46 @@
+<script lang="ts" setup name="ProcessNodeAdd">
+const emit = defineEmits(['click'])
+const add = () => {
+  emit('click')
+}
+</script>
+
+<template>
+  <div class="process-node" @click="add">
+    <div class="add">
+      <el-icon class="add-icon">
+        <plus />
+      </el-icon>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.process-node {
+  // display: inline-block;
+  width: 280px;
+  height: 215px;
+  border: 1px dashed #e0e0e0;
+  padding: 5px 15px;
+  border-radius: 5px;
+  background-color: #fbfbfb;
+
+  &:hover {
+    cursor: pointer;
+    background-color: #f5f5f5;
+  }
+
+  .add {
+    height: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    .add-icon {
+      vertical-align: middle;
+      font-size: 100px;
+      color: #999;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/lab/myMeasure/measureDetail.vue b/src/views/business/lab/myMeasure/measureDetail.vue
new file mode 100644
index 0000000..1a88be8
--- /dev/null
+++ b/src/views/business/lab/myMeasure/measureDetail.vue
@@ -0,0 +1,601 @@
+<!-- 任务分发 -->
+<script lang="ts" setup name="TaskEdit">
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance } from 'element-plus'
+import { ref } from 'vue'
+import ProcessConfig from './components/processConfig.vue'
+import type { ISampleMeasure, ITaskDetail } from './task-interface'
+import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { getTaskDetail } from '@/api/business/schedule/task'
+import countries from '@/components/AddressSelect/country-code.json'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+interface dictType {
+  id: string
+  name: string
+  value: string
+}
+const roleType = ref('distribute') // 角色类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员),
+const countryList = ref(countries) // 国家列表
+const loading = ref(false) // 表单加载状态
+const sampleId = ref('') // 样品详情id
+const orderId = ref('') // 委托书id
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const mesureTypeList = ref<dictType[]>([]) // 检定方式
+const $route = useRoute()
+
+// 获取字典值
+function getDict() {
+  // 获取样品属性
+  getDictByCode('measureCategory').then((response) => {
+    mesureCategoryList.value = response.data
+  })
+  // 获取样品属性
+  getDictByCode('measureType').then((response) => {
+    mesureTypeList.value = response.data
+  })
+}
+getDict()
+
+// 基本信息表单
+const sampleForm = ref<ISampleMeasure>({
+  id: '', // 样品id
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 样品型号
+  manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  phone: '', // 委托方电话
+  postalCode: '', // 委托方邮编
+  customerAddress: '', // 委托方地址
+  measureCategory: '', // 检校类别
+  manufacturer: '', // 生产厂家
+  manufacturerCountry: '', // 厂家国别
+  manufacturingDate: '', // 出厂年月
+  abc: '', // ABC
+  measurePeriod: '', // 检定周期
+  remark: '', // 备注
+  minioFileName: '', // 说明书
+  labelBind: '', // 标签绑定
+  measureType: '1', // 检定方式  1自检、2外包、3外检
+  measureTypeName: '', // 检定方式
+  measureLastTime: '', // 检定日期
+  validDeadline: '', // 有效日期
+  powerVoltage: '', // 电源电压
+  sampleBelong: '', // 样品所属
+  sampleBelongName: '', // 样品所属
+})
+const taskForm = ref <ITaskDetail> ({
+  measureContent: '', // 检定项目
+  specialRequire: '', // 客户特殊要求
+  orderId: '', // 委托单id
+  orderCode: '', // 委托单编号
+  certifications: '', // 证书类别
+  planDeliverTime: '', // 预约送达时间
+  requireOverTime: '', // 要求检完时间
+  measureProcessList: [], // 检定流程
+  measureSendBackList: [], // 退回信息
+  remark: '', // 备注
+  deliverer: '', // 送检人
+  delivererTel: '', // 送检人联系方式
+})
+const ruleFormRef = ref<FormInstance>()
+
+// 自定义校验规则--检定周期为正整数
+const validateMesurePeriod = (rule: any, value: any, callback: any) => {
+  if (value === '') {
+    callback()
+  }
+  else if (!(/(^[1-9]\d*$)/.test(value))) {
+    callback(new Error('请输入一个正整数'))
+  }
+  else {
+    callback()
+  }
+}
+
+// 校验规则
+const rules = ref({
+  mesurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
+}) // 表单验证规则
+
+// 其他关联数据列表
+const dataList = ref({
+  measureRecords: [] as SimpleMeasureRecord[],
+  certificationRecords: [] as SimpleCertification[],
+})
+
+// 获取检定记录
+const fetchMeasureRecords = function (query = null) {
+  dataList.value.measureRecords = []
+}
+// 获取检定证书
+const fetchCertifications = function (query = null) {
+  dataList.value.certificationRecords = []
+}
+interface Menu {
+  name: string
+  columns: TableColumn[]
+  pagination: boolean
+  list: 'measureRecords' | 'certificationRecords'
+  searchFunc: Function
+}
+// 菜单
+const menu: Menu[] = [
+  {
+    name: '检定记录',
+    columns: [
+      { text: '委托单编号', value: 'orderCode' },
+      { text: '委托单日期', value: 'orderTime' },
+      { text: '委托方代码', value: 'customerCode' },
+      { text: '委托方名称', value: 'customerName' },
+      { text: '送检人', value: 'deliverer' },
+      { text: '送检日期', value: 'deliverTime' },
+    ],
+    list: 'measureRecords',
+    pagination: true,
+    searchFunc: fetchMeasureRecords,
+  },
+  {
+    name: '检定证书',
+    columns: [
+      { text: '证书编号', value: 'certificationCode' },
+      { text: '证书名称', value: 'certificationName' },
+      { text: '证书类型', value: 'certificationType' },
+      { text: '证书出具日期', value: 'effectiveDate' },
+      { text: '证书有效期', value: 'expirationDate' },
+    ],
+    list: 'certificationRecords',
+    pagination: true,
+    searchFunc: fetchCertifications,
+  },
+]
+
+const currentMenu = ref('证书监控')
+const currentMenuObj = computed(() => {
+  return menu.find(item => item.name === currentMenu.value)
+})
+
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 打印表单
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '样品详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>样品详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+// 保存样品信息
+function saveForm(formEl: FormInstance | undefined) {
+  if (!formEl) { return }
+  formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认修改样品信息吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (sampleForm.value.id) {
+          updateSample(sampleForm.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+      })
+    }
+  })
+}
+// 获取详情
+const getSampleInfo = () => {
+  getSapmleDetail({ id: sampleId.value }).then((res) => {
+    sampleForm.value = res.data
+  })
+}
+// 获取分发详情
+const getInfo = () => {
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    taskForm.value.specialRequire = res.data.specialRequire // 客户特殊要求
+    taskForm.value.deliverer = res.data.deliverer // 送检人
+    taskForm.value.delivererTel = res.data.delivererTel // 送检人联系方式
+    taskForm.value.measureContent = res.data.measureContent // 检定项目
+    taskForm.value.measureProcessList = res.data.measureProcessList // 检定流程
+    taskForm.value.measureSendBackList = res.data.measureSendBackList // 退回流程
+    console.log('pppppp')
+    console.log(taskForm.value.measureProcessList)
+
+    // 改用一个接口获取
+    sampleForm.value = res.data
+  })
+}
+
+// 点击标签绑定的扫描
+const startScan = () => {
+  // TODO
+}
+
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
+}
+// 保存流程按钮点击
+const saveProcess = () => {
+  processConfigRef.value.saveProcess()
+}
+
+// 文件上传
+const fileRef = ref()
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    // UploadFile(fd).then((res) => {
+    //   if (res.code === 200) {
+    //     sampleForm.value.minioFileName = res.data[0]
+    //     // 重置当前验证
+    //     ElMessage.success('文件上传成功')
+    //   }
+    //   else {
+    //     ElMessage.error(res.message)
+    //   }
+    // })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+onMounted(() => {
+  console.log($route)
+  // 从路由中获取页面类型参数
+  if ($route.params && $route.params.role) {
+    roleType.value = $route.params.role as string // 使用角色
+  }
+  if ($route.params.id) {
+    sampleId.value = $route.params.id as string
+    orderId.value = $route.query.order as string
+    // 获取分发详情
+    getInfo()
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="样品详情">
+      <template #btns>
+        <el-button v-if="roleType === 'detail'" v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <!-- <el-button v-if="roleType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button> -->
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <div id="form">
+        <el-form
+          ref="ruleFormRef"
+          :model="sampleForm"
+          :label-width="120"
+          label-position="right"
+          :rules="rules"
+        >
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="样品编号:" prop="sampleNo">
+                <el-input
+                  v-model="sampleForm.sampleNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品名称:" prop="sampleName">
+                <el-input
+                  v-model="sampleForm.sampleName"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品型号:" prop="sampleModel">
+                <el-input
+                  v-model="sampleForm.sampleModel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂编号:" prop="manufacturingNo">
+                <el-input
+                  v-model="sampleForm.manufacturingNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方代码" prop="customerNo">
+                <el-input
+                  v-model="sampleForm.customerNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方名称" prop="customerName">
+                <el-input
+                  v-model="sampleForm.customerName"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方电话" prop="phone">
+                <el-input
+                  v-model="sampleForm.phone"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方电话'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方邮编" prop="postalCode">
+                <el-input
+                  v-model="sampleForm.postalCode"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方邮编'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="18">
+              <el-form-item label="委托方地址:" prop="companyAddress">
+                <el-input
+                  v-model="sampleForm.customerAddress"
+                  type="textarea"
+                  autosize
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方地址'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="校检类别:">
+                <el-select
+                  v-model="sampleForm.measureCategory"
+                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :disabled="roleType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="生产厂家:">
+                <el-input
+                  v-model="sampleForm.manufacturer"
+                  :placeholder="roleType === 'detail' ? '' : '请输入生产厂家'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="厂家国别:">
+                <el-select
+                  v-model="sampleForm.manufacturerCountry"
+                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :disabled="roleType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂年月:">
+                <el-date-picker
+                  v-model="sampleForm.manufacturingDate"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="roleType === 'detail' ? '' : '请输入出厂年月'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="ABC:">
+                <el-select
+                  v-model="sampleForm.abc"
+                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :disabled="roleType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="送检人:">
+                <el-input
+                  v-model="taskForm.deliverer"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="联系方式:">
+                <el-input
+                  v-model="taskForm.delivererTel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="检定项目:" prop="mesureContent">
+                <el-input
+                  v-model="taskForm.measureContent"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  disabled
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检定周期（月）:">
+                <el-input
+                  v-model="sampleForm.measurePeriod"
+                  :placeholder="roleType === 'detail' ? '' : '请输入检定周期'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="备注:">
+                <el-input
+                  v-model="sampleForm.remark"
+                  type="textarea"
+                  :rows="2"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  disabled
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检定方式:">
+                <el-select
+                  v-model="sampleForm.measureType"
+                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :disabled="roleType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of mesureTypeList" :key="item.value" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="标签绑定:">
+                <el-input
+                  v-model="sampleForm.labelBind"
+                  :placeholder="roleType === 'detail' ? '' : '标签绑定'"
+                  :disabled="roleType === 'detail'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                >
+                  <template v-if="roleType !== 'detail'" #append>
+                    <el-button>
+                      扫描
+                    </el-button>
+                  </template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="14">
+              <el-form-item label="说明书:">
+                <show-photo v-if="sampleForm.minioFileName" :minio-file-name="sampleForm.minioFileName" />
+                <span v-else-if="roleType === 'detail'">无</span>
+                <input v-show="roleType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="roleType !== 'detail'" id="file" type="primary" :disabled="roleType === 'detail'" :style="{ 'margin-left': sampleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ sampleForm.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </detail-page>
+    <detail-block v-if="taskForm.measureProcessList && taskForm.measureProcessList.length >= 1" title="检定流程">
+      <!-- <template #btns>
+        <el-button type="primary" style="margin-bottom: 10px;" @click="batchProcessAdd">
+          批量添加
+        </el-button>
+        <el-button type="primary" style="margin-bottom: 10px;" @click="saveProcess">
+          保存
+        </el-button>
+      </template> -->
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" :detail="true" />
+    </detail-block>
+    <!-- 退回流程 -->
+    <detail-block v-if="taskForm.measureSendBackList && taskForm.measureSendBackList.length >= 1" title="退回流程">
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureSendBackList" :sample-id="sampleId" :detail="true" />
+    </detail-block>
+    <!-- 检定记录、检定证书 -->
+    <detail-block-switch :title="currentMenu">
+      <template #menu>
+        <el-radio-group v-model="currentMenu">
+          <el-radio-button label="证书监控">
+            证书监控
+          </el-radio-button>
+          <el-radio-button label="检定记录">
+            检定记录
+          </el-radio-button>
+          <el-radio-button label="检定证书">
+            检定证书
+          </el-radio-button>
+        </el-radio-group>
+      </template>
+      <!-- 证书监控 -->
+      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" />
+      <!-- 检定记录 -->
+      <measure-records v-if="currentMenu === '检定记录'" :sample-id="sampleId" />
+      <!-- 证书记录 -->
+      <certification-records v-if="currentMenu === '检定证书'" :sample-id="sampleId" />
+    </detail-block-switch>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
+
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 62f8830..e4a4637 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -13,7 +13,6 @@
 import { getMyMeasureList, myExecutiveDone, myExecutiveReceive } from '@/api/business/schedule/task'
 import type { dictType } from '@/global'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
-
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
@@ -128,7 +127,7 @@
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`myMeasureDetail/detail/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
diff --git a/src/views/business/lab/myMeasure/task-interface.ts b/src/views/business/lab/myMeasure/task-interface.ts
new file mode 100644
index 0000000..6503a12
--- /dev/null
+++ b/src/views/business/lab/myMeasure/task-interface.ts
@@ -0,0 +1,169 @@
+// 任务列表查询条件
+export interface ITaskQuery {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  orderNo: string // 委托书编号
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  isUrgent: string // 是否加急
+  sampleBelong: string // 样品属性
+  sampleStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
+  limit: number
+  offset: number
+}
+
+// 我的检测/部门检测查询条件
+export interface ILabQuery {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  orderNo: string // 委托书编号
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  isUrgent: string // 是否加急
+  sampleBelong: string // 样品属性
+  measureStatus: string // 分发状态
+  startTime: string | number //	应检定开始时间
+  endTime: string | number //	应检定结束时间
+  limit: number
+  offset: number
+}
+// 任务列表-返回值
+export interface ITaskList {
+  orderId: string // 委托书编号
+  sampleId: string // 样品唯一标识
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderNo: string // 委托书编号
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  isUrgent: number // 是否加急
+  isUrgentName?: string // 是否加急
+  requireOverTime: string // 应检完时间
+  sampleBelong: string // 样品属性
+  sampleBelongName: string // 样品属性
+  currentMeasureState: string // 当前检定环节
+  currentMeasureStateName: string // 当前检定环节
+  alreadyCertifications: number // 已出具证书总数
+  requireCertifications: number // 应出具证书总数
+  distributeState: string // 分发性质-初次分发、退回分发
+  handOutProperty: string // 分发性质-初次分发、退回分发
+  id?: string // 实验室id
+}
+
+// 实验室检测/我的检测列表
+export interface IlabMeasureList extends ITaskList {
+  id: string // 实验室检测id
+  measurePersonId: string // 检测人id
+  measureSegmentId: string // 检测部门id
+  currentSegmentId: string // 检测部门id (新)
+}
+
+// 全部检测流程节点
+export interface ISchedule {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications: number // 应出具证书总数
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: string // 流程更新时间
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
+  distributePerson: string // 分配人
+  distributeTime: string // 分配时间
+  startTime: string // 检定开始时间
+  overTime: string // 检定完成时间
+}
+// 检测流程节点
+export interface IScheduleSet {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications: number // 应出具证书总数
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: string // 流程更新时间
+  measureSequence?: string // 检测顺序
+}
+// 退回流程节点
+export interface IScheduleBack {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications?: number // 应出具证书总数
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
+}
+
+// 样品检测信息
+export interface ISampleMeasure {
+  id: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  manufacturingNo: string // 出厂编号
+  customerNo: string // 委托方代码
+  customerId: string // 委托方id
+  customerName: string // 委托方名称
+  phone: string // 委托方电话
+  postalCode: string // 委托方邮编
+  customerAddress: string // 委托方地址
+  measureCategory: string // 检校类别
+  manufacturer: string // 生产厂家
+  manufacturerCountry: string // 厂家国别
+  manufacturingDate: string // 出厂年月
+  abc: string // ABC
+  measurePeriod: string // 检定周期
+  minioFileName: string // 说明书
+  labelBind: string // 标签绑定
+  measureType: string // 检定方式
+  measureTypeName: string // 检定方式
+  measureLastTime?: string // 检定日期
+  validDeadline: string // 有效日期
+  powerVoltage: string // 电源电压
+  sampleBelong: string // 样品所属
+  sampleBelongName: string // 样品所属
+  remark: string // 备注
+}
+
+export interface ITaskDetail {
+  measureContent: string // 检定项目
+  measureProcessList: ISchedule[] // 检定流程
+  measureSendBackList: ISchedule[] // 退回信息
+  remark: string // 备注
+  orderId: string // 委托单id
+  orderCode: string // 委托单编号
+  certifications: string // 证书类别
+  planDeliverTime: string // 预约送达时间
+  requireOverTime: string // 要求检完时间
+  specialRequire: string // 客户特殊要求
+  deliverer: string // 送检人
+  delivererTel: string // 送检人联系方式
+}
+
+// 退回
+export interface ISendBack {
+  id: string // 实验室检测id
+  measurePersonId: string // 检定人员id
+  measureSegmentId: string //	检定环节，实验室id
+  operateReason: string // 退回原因
+  orderId: string // 委托书id
+  sampleId: string //	样品id
+}
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index 0efec98..99a6852 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -141,7 +141,6 @@
 // 点击详情
 const handleDetail = (row: ITaskList) => {
   console.log('跳转任务分发详情')
-
   $router.push(`/schedule/task/distribute/${row.sampleId}?order=${row.orderId}`)
 }
 
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 6ad9900..dbaa437 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -83,11 +83,7 @@
     text: '申请时间',
     value: 'time',
     align: 'center',
-  },
-  {
-    text: '审批状态',
-    value: 'approvalStatusName',
-    align: 'center',
+    width: 160,
   },
 ]) // 表格
 // 数据查询
@@ -456,6 +452,16 @@
           </el-table-column>
         </template>
         <template #columns>
+          <el-table-column v-if="activeTitle === '已归还'" label="归还时间" width="160" align="center">
+            <template #default="scope">
+              {{ scope.row.backTime }}
+            </template>
+          </el-table-column>
+          <el-table-column label="审批状态" width="120" align="center">
+            <template #default="scope">
+              {{ scope.row.approvalStatusName }}
+            </template>
+          </el-table-column>
           <el-table-column label="操作" align="center" :width="activeTitle === '待借用' ? '130' : activeTitle === '已借用' ? '110' : '80'">
             <template #default="{ row }">
               <el-button size="small" type="primary" link @click="detail(row)">
diff --git a/src/views/device/borrow/editHandle.vue b/src/views/device/borrow/editHandle.vue
index 9a5b2a6..4e0bc5c 100644
--- a/src/views/device/borrow/editHandle.vue
+++ b/src/views/device/borrow/editHandle.vue
@@ -26,6 +26,7 @@
   applyUnit: '', // 申请单位
   applyPerson: '', // 申请人
   time: '', // 借用时间
+  backTime: '', // 归还时间
   applyDesc: '', // 申请说明
 })
 const list = ref<IdeviceList[]>([])// 表格数据
@@ -163,7 +164,18 @@
                     />
                   </el-form-item>
                 </el-col>
-                <el-col :span="12">
+                <el-col :span="6">
+                  <el-form-item label="归还时间" prop="backTime">
+                    <el-date-picker
+                      v-model="form.backTime"
+                      type="datetime"
+                      format="YYYY-MM-DD hh:mm"
+                      value-format="YYYY-MM-DD hh:mm"
+                      disabled
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="18">
                   <el-form-item label="申请说明" prop="applyDesc">
                     <el-input v-model="form.applyDesc" type="textarea" disabled autosize />
                   </el-form-item>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 2ab77ef..3f90519 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -38,6 +38,7 @@
 const isDetail = ref(false)
 const ruleForm = ref<fixedAssetsType>({
   assetNo: '', // 资产编号
+  compulsoryVerification: '', // 强制检定
   assetType: '', // 资产类型
   assetSource: '', // 资产来源
   equipmentNo: '', // 设备编号
@@ -486,6 +487,14 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
+          <el-form-item label="强制检定" prop="compulsoryVerification">
+            <el-select v-model="ruleForm.compulsoryVerification" :placeholder="title === 'detail' ? '' : '强制检定'" :disabled="title === 'detail'" style="width: 100%;">
+              <el-option label="是" value="1" />
+              <el-option label="否" value="0" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
           <el-form-item label="检定周期(月)" prop="mesureCycle">
             <el-input-number v-model="ruleForm.mesureCycle" :min="12" :max="60" :step="12" :disabled="title === 'detail'" />
             <!-- <el-select v-model="ruleForm.mesureCycle" :placeholder="title === 'detail' ? '' : '检定周期'" clearable style="width: 100%;">
@@ -509,7 +518,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="使用人" prop="usePerson">
-            <el-select v-model="ruleForm.usePerson" :placeholder="title === 'detail' ? '' : '使用人'" :disabled="title === 'detail'" style="width: 100%;">
+            <el-select v-model="ruleForm.usePerson" filterable :placeholder="title === 'detail' ? '' : '使用人'" :disabled="title === 'detail'" style="width: 100%;">
               <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
             </el-select>
           </el-form-item>
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index 479ae05..e46753d 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -94,6 +94,7 @@
   { text: '型号', value: 'modelNo', align: 'center' },
   { text: 'ABC', value: 'abc', align: 'center', width: 58 },
   { text: '检定方式', value: 'mesureTypeName', align: 'center', width: 90 },
+  { text: '强制检定', value: 'compulsoryVerification', align: 'center', width: 90 },
   { text: '管理状态', value: 'managerStateName', align: 'center', width: 100 },
   { text: '使用部门', value: 'useDeptName', align: 'center' },
   { text: '使用人', value: 'usePersonName', align: 'center' },
@@ -139,7 +140,10 @@
   }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows
+      list.value = res.data.rows.map((item: any) => {
+        item.validDate = item.validDate.split(' ')[0]
+        return item
+      })
       total.value = res.data.total
     }
     loadingTable.value = false
@@ -403,7 +407,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="120">
+            <el-table-column label="操作" align="center" width="120" fixed="right">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/device/standingBook/standingBook-interface.ts b/src/views/device/standingBook/standingBook-interface.ts
index bd55019..ee29254 100644
--- a/src/views/device/standingBook/standingBook-interface.ts
+++ b/src/views/device/standingBook/standingBook-interface.ts
@@ -105,7 +105,7 @@
   validDate: string // 有效日期
   version: string // 版本号
   weight: string // 重量（吨）
-
+  compulsoryVerification?: string | number // 强制检定
 }
 
 // 固定资产-查询用
diff --git a/src/views/device/stateManage/components/status-interface.ts b/src/views/device/stateManage/components/status-interface.ts
index 93410a7..dd27189 100644
--- a/src/views/device/stateManage/components/status-interface.ts
+++ b/src/views/device/stateManage/components/status-interface.ts
@@ -90,4 +90,6 @@
 // 目录数组
 export interface EquipmentListRow {
   equipmentId: string
+  assetOriginValue?: string
+  financialValue?: string
 }
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 42e3ed8..4dda89a 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -22,6 +22,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { cancelApproval, fetchApproval } from '@/api/approval'
 
+const user = useUserStore() // 用户信息
 const $route = useRoute()
 const userInfo = useUserStore()
 const $router = useRouter()
@@ -42,8 +43,12 @@
   remark: '', // 申请说明
   time: '', // 时间
   fileList: [] as any[], //	说明书
-  applyUnit: '', // 申请单位
-  applyPerson: '', // 申请人
+  applyUnit: window.localStorage.getItem('depId') as string, // 申请单位
+  applyPerson: window.localStorage.getItem('nameId') as string, // 申请人
+  applyNo: '', // 申请单编号
+  applyName: '', // 申请单名称
+  assetOriginValue: '', // 资产原值
+  financialValue: '', // 财务净值
   equipmentNo: '', // 设备编号
   equipmentName: '', // 设备名称
   modelNo: '', // 型号
@@ -56,15 +61,18 @@
 })
 // 设备借用表单
 const ruleForm2 = ref({
+  applyNo: '', // 申请编号
   applyUnit: '', // 申请单位
   applyPerson: '', // 申请人
-  time: '', // 借用时间
+  time: dayjs().format('YYYY-MM-DD HH:mm:ss'), // 申请时间, // 借用时间
   applyDesc: '', // 申请说明
   applyType: '', // 申请类型
   applyName: '', // 申请名称
+  applyPersonName: user.name, // 申请人名称
+  applyUnitName: user.deptName, // 申请单位名称
   createUser: userInfo.$state.id,
   approvalStatus: '',
-  createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+  createTime: dayjs().format('YYYY-MM-DD hh:mm:ss'),
   id: '',
 })
 const rules1 = ref<FormRules>({
@@ -72,7 +80,9 @@
   applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
   equipmentNo: [{ required: true, message: '设备编号不能为空', trigger: 'blur' }],
   time: [{ required: true, message: `${name.value.substring(2, 4)}时间不能为空`, trigger: 'blur' }],
-  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请单名称不能为空', trigger: 'blur' }],
+  assetOriginValue: [{ required: true, message: '资产原值不能为空', trigger: 'blur' }],
+  financialValue: [{ required: true, message: '财务净值不能为空', trigger: 'blur' }],
 })
 watch(() => ruleForm1.value, (newVal) => {
   if (name.value === '详情') {
@@ -88,10 +98,10 @@
   immediate: true,
 })
 const rules2 = ref<FormRules>({
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  // applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  // applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
   time: [{ required: true, message: '借用时间不能为空', trigger: 'blur' }],
-  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
+  // applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
 })
 const ruleArr = ['applyUnit', 'applyPerson', 'time', 'applyName']
 watch(() => ruleForm2.value, (newVal: { [key: string]: string }, oldVal) => {
@@ -243,10 +253,6 @@
   }
 }
 
-onMounted(async () => {
-  initDialog($route.query)
-})
-
 // 关闭弹窗
 const close = () => {
   $router.back()
@@ -265,6 +271,7 @@
           ...ruleForm2.value,
           equipmentList: borrowList.value.map(item => ({
             equipmentId: item.id,
+
           })),
         }
         if (title.value === '新建') {
@@ -412,6 +419,8 @@
           type: 'warning',
         },
       ).then((res) => {
+        ruleForm1.value.equipmentList[0].assetOriginValue = ruleForm1.value.assetOriginValue
+        ruleForm1.value.equipmentList[0].financialValue = ruleForm1.value.financialValue
         addStatus(ruleForm1.value).then((res) => {
           if (res.code === 200) {
             ElMessage.success('操作成功!')
@@ -745,6 +754,10 @@
     borrowList.value.splice(selectIndex.value, 1, val[0])
   }
 }
+
+onMounted(() => {
+  initDialog($route.query)
+})
 </script>
 
 <template>
@@ -758,13 +771,12 @@
           <el-button v-if="title !== '详情'" type="primary" @click="deviceManageSubmit(ruleFormRef2)">
             提交
           </el-button>
-          <el-button v-if="title !== '详情'" type="primary" @click="deviceManageSave(ruleFormRef2)">
+          <el-button v-if="title !== '详情'" type="primary" style="margin-right: 10px;" @click="deviceManageSave(ruleFormRef2)">
             保存
           </el-button>
         </temalate>
         <!-- 状态管理 -->
         <template v-else>
-          <!-- <template> -->
           <!-- 新建 -->
           <el-button v-if="title === '新建'" type="primary" @click="statusManageSubmit(ruleFormRef1)">
             提交
@@ -807,30 +819,24 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="申请单位" prop="applyUnit">
-              <dept-select v-model="ruleForm1.applyUnit" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
+              <dept-select v-model="ruleForm1.applyUnit" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="申请人" prop="applyPerson">
-              <el-select v-model="ruleForm1.applyPerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
+              <el-select v-model="ruleForm1.applyPerson" :placeholder="title === '详情' ? '' : '申请人'" disabled style="width: 100%;">
                 <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="设备编号" prop="equipmentNo" class="equipmentNo">
-              <el-input v-model.trim="ruleForm1.equipmentNo" :placeholder="title === '详情' ? '' : '设备名称'" disabled>
-                <template v-if="title !== '详情'" #append>
-                  <el-button type="primary" size="small" @click="addRowBtn">
-                    选择
-                  </el-button>
-                </template>
-              </el-input>
+            <el-form-item label="申请单编号" prop="applyNo">
+              <el-input v-model.trim="ruleForm1.applyNo" :placeholder="title === '详情' ? '' : '系统自动生成'" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="设备名称" prop="equipmentName">
-              <el-input v-model.trim="ruleForm1.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" disabled />
+            <el-form-item label="申请单名称" prop="applyName">
+              <el-input v-model.trim="ruleForm1.applyName" :placeholder="title === '详情' ? '' : '申请单名称'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -857,15 +863,52 @@
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
-          <el-col :span="6">
+          <el-col v-if="name.substring(2, 4) !== '处置'" :span="6">
             <el-form-item :label="`${name.substring(2, 4)}开始时间`" prop="time">
               <el-date-picker
-                v-model="ruleForm1.time" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
-                :placeholder="title === '详情' ? '' : `${name.substring(2, 4)}时间`"
+                v-model="ruleForm1.time" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD hh:mm" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : `${name.substring(2, 4)}开始时间`"
                 style="width: 100%;"
               />
             </el-form-item>
           </el-col>
+          <el-col v-else :span="6">
+            <el-form-item label="报废时间" prop="time">
+              <el-date-picker
+                v-model="ruleForm1.time" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD hh:mm" :disabled="title === '详情'"
+                placeholder="报废时间"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备编号" prop="equipmentNo" class="equipmentNo">
+              <el-input v-model.trim="ruleForm1.equipmentNo" :placeholder="title === '详情' ? '' : '设备名称'" disabled>
+                <template v-if="title !== '详情'" #append>
+                  <el-button type="primary" size="small" @click="addRowBtn">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm1.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="资产原值" prop="assetOriginValue">
+              <el-input v-model.trim="ruleForm1.assetOriginValue" :placeholder="title === '详情' ? '' : '资产原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="财务净值" prop="financialValue">
+              <el-input v-model.trim="ruleForm1.financialValue" :placeholder="title === '详情' ? '' : '财务净值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
           <el-col :span="18">
             <el-form-item label="申请理由" prop="remark">
               <el-input v-model.trim="ruleForm1.remark" :placeholder="title === '详情' ? '' : '申请理由'" :disabled="title === '详情'" />
@@ -892,33 +935,53 @@
       <el-form v-if="isDevice" ref="ruleFormRef2" :model="ruleForm2" :rules="rules2" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
+            <el-form-item label="申请编号:">
+              <el-input
+                v-model="ruleForm2.applyNo"
+                :placeholder="title === '详情' ? '' : '系统自动生成'"
+                :class="{ 'detail-input': title === '详情' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="申请名称" prop="applyName">
-              <el-input v-model.trim="ruleForm2.applyName" :placeholder="title === '详情' ? '' : '申请名称'" :disabled="title === '详情'" />
+              <el-input v-model.trim="ruleForm2.applyName" :placeholder="title === '详情' ? '' : '请输入申请名称'" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="申请单位" prop="applyUnit">
-              <dept-select v-model="ruleForm2.applyUnit" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
+              <!-- <dept-select v-model="ruleForm2.applyUnit" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" disabled /> -->
+              <el-input
+                v-model="ruleForm2.applyUnitName"
+                :class="{ 'detail-input': title === '详情' }"
+                disabled
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="申请人" prop="applyPerson">
-              <el-select v-model="ruleForm2.applyPerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
+              <!-- <el-select v-model="ruleForm2.applyPerson" :placeholder="title === '详情' ? '' : '申请人'" disabled style="width: 100%;">
                 <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="借用时间" prop="time">
-              <el-date-picker
-                v-model="ruleForm2.time" type="datetime" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
-                :placeholder="title === '详情' ? '' : '借用时间'"
-                style="width: 100%;"
+              </el-select> -->
+              <el-input
+                v-model="ruleForm2.applyPersonName"
+                :class="{ 'detail-input': title === '详情' }"
+                disabled
               />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="借用时间" prop="time">
+              <el-date-picker
+                v-model="ruleForm2.time" type="datetime" format="YYYY-MM-DD hh:mm" value-format="YYYY-MM-DD hh:mm" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '请选择借用时间'"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
           <el-col :span="18">
             <el-form-item label="申请说明" prop="applyDesc">
               <el-input v-model.trim="ruleForm2.applyDesc" :placeholder="title === '详情' ? '' : '申请说明'" :disabled="title === '详情'" />

diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index b21ad07..cf4a5b9 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -260,6 +260,19 @@
         },
       },
       {
+        path: 'myMeasureDetail/:role/:id',
+        name: 'MyMeasureDetail',
+        component: () => import('@/views/business/lab/myMeasure/measureDetail.vue'),
+        meta: {
+          title: '我的检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          auth: '/lab/myMeasure',
+          activeMenu: '/lab/myMeasureList',
+        },
+      },
+      {
         path: 'deptMeasureList',
         name: 'DeptMeasureList',
         component: () => import('@/views/business/lab/deptMeasure/deptMeasureList.vue'),
@@ -270,6 +283,19 @@
         },
       },
       {
+        path: 'myMeasureDetail/:role/:id',
+        name: 'MyMeasureDetail',
+        component: () => import('@/views/business/lab/myMeasure/measureDetail.vue'),
+        meta: {
+          title: '部门检测详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          auth: '/lab/deptMeasureList',
+          activeMenu: '/lab/deptMeasureList',
+        },
+      },
+      {
         path: 'reportOnCredentialsApproval',
         name: 'ReportOnCredentialsApproval',
         component: () => import('@/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue'),
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 066f192..7a6ebea 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -102,8 +102,9 @@
           const routeStore = useRouteStore()
           const menuStore = useMenuStore()
           localStorage.removeItem('username')
-          localStorage.removeItem('name')
           localStorage.removeItem('token')
+          localStorage.removeItem('nameId')
+          localStorage.removeItem('depId')
           this.username = ''
           this.token = ''
           this.roleList = []
@@ -121,7 +122,8 @@
               this.roleList = res.data.roleIds
               this.roleNames = res.data.roleNames
               this.roleTips = res.data.roleTips
-              localStorage.setItem('name', res.data.name)
+              localStorage.setItem('nameId', res.data.id)
+              localStorage.setItem('depId', res.data.deptId)
             }
             else {
               reject('该用户无角色')
diff --git a/src/views/business/board/overdueReminder/detail.vue b/src/views/business/board/overdueReminder/detail.vue
index 92987d1..0239b71 100644
--- a/src/views/business/board/overdueReminder/detail.vue
+++ b/src/views/business/board/overdueReminder/detail.vue
@@ -5,7 +5,7 @@
 import { ref } from 'vue'
 import dayjs from 'dayjs'
 import ProcessConfig from '@/views/business/schedule/task/components/processConfig.vue'
-import type { ISampleMeasure, ITaskDetail } from '@/views/business/schedule/task/task-interface'
+import type { ISampleMeasure, ITaskDetail } from '@/views/business/schedule/task/task-interface.js'
 import type { Menu, SimpleCertification, SimpleMeasureRecord, dictType } from '@/views/customer/sample/list/sample_list_interface'
 import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { getTaskDetail } from '@/api/business/schedule/task'
diff --git a/src/views/business/lab/deptMeasure/deptMeasureList.vue b/src/views/business/lab/deptMeasure/deptMeasureList.vue
index d6cc168..05fd811 100644
--- a/src/views/business/lab/deptMeasure/deptMeasureList.vue
+++ b/src/views/business/lab/deptMeasure/deptMeasureList.vue
@@ -4,8 +4,8 @@
 import type { Ref } from 'vue'
 import type { DateModelType } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import DistributeDialog from '../../schedule/task/components/distributeDialog.vue'
 import RollbackDialog from './../components/rollbackDialog.vue'
-import DistributeDialog from './../components/distributeDialog.vue'
 import type { ILabQuery, ITaskList, ITaskQuery } from '@/views/business/schedule/task/task-interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { printJSON } from '@/utils/printUtils'
@@ -131,7 +131,8 @@
 const depId = ref('')
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
+  $router.push(`myMeasureDetail/detail/${row.sampleId}?order=${row.orderId}`)
+  // $router.push(`/schedule/task/dispatch/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
diff --git a/src/views/business/lab/myMeasure/components/chooseLab.vue b/src/views/business/lab/myMeasure/components/chooseLab.vue
new file mode 100644
index 0000000..0dcebfc
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/chooseLab.vue
@@ -0,0 +1,203 @@
+<script setup lang="ts" name="ChooseLab">
+// 选择实验室
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { ILabList, ILabSearchQuery } from '@/views/business/schedule/task/components/lab-interface'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getOrganizeList } from '@/api/measure/measureDept'
+import type { dictType } from '@/global'
+import { getDictByCode } from '@/api/system/dict'
+const emits = defineEmits(['confirmCheckout'])
+// 是否多选
+const multi = ref(false)
+const dialogVisible = ref(false)
+
+const measureMajorList = ref<dictType[]>([]) // 计量专业
+// 获取字典值
+function getDict() {
+  // 获取计量专业
+  getDictByCode('measureMajor').then((response) => {
+    measureMajorList.value = response.data
+  })
+}
+getDict()
+// 查询条件
+const listQuery = ref<ILabSearchQuery>({
+  organizeNo: '', // 实验室编号
+  organizeName: '', // 实验室名称
+  meterMajor: '', // 专业
+  organizeType: '3', // 组织类型
+  director: '', // 负责人
+  isLab: '1', // 是否是实验室
+  createStartTime: '',
+  createEndTime: '',
+})
+
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '实验室名称', value: 'organizeName', width: '160', align: 'center' },
+  // { text: '所属部门', value: 'pDeptName', align: 'center', width: '150' },
+  { text: '负责人', value: 'director', align: 'center', width: '120' },
+  { text: '计量专业', value: 'meterMajorName', align: 'center' },
+  { text: '实验室能力', value: 'labCapacityName', align: 'center' },
+])
+// 表格数据
+const list = ref<ILabList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 多选的内容
+const checkoutList = ref<ILabList[]>([])
+// 单选
+const singleChecked = ref()
+// 数据查询
+function fetchData(isNowPage = false) {
+  getOrganizeList(listQuery.value).then((response) => {
+    list.value = response.data
+    total.value = parseInt(response.data.length)
+    loadingTable.value = false
+  })
+  loadingTable.value = false
+}
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    organizeNo: '', // 实验室编号
+    organizeName: '', // 实验室名称
+    meterMajor: '', // 专业
+    organizeType: '3', // 组织类型
+    director: '', // 负责人
+    isLab: '1', // 是否是实验室
+    createStartTime: '',
+    createEndTime: '',
+  }
+}
+
+// 点击取消
+const cancle = () => {
+  dialogVisible.value = false
+}
+// 点击确定
+const clickConfirm = () => {
+  // 如果多选
+  if (multi.value) {
+    if (!checkoutList.value.length) {
+      ElMessage({
+        message: '请选择至少一个实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      emits('confirmCheckout', checkoutList.value)
+    }
+  }
+  else {
+    if (!singleChecked.value) {
+      ElMessage({
+        message: '请选择检定实验室',
+        type: 'warning',
+      })
+    }
+    else {
+      const checkValue = list.value.find(item => item.id == singleChecked.value)
+      emits('confirmCheckout', checkValue)
+    }
+  }
+
+  cancle()
+}
+
+// 初始化弹窗
+const initDialog = (multiSelect: boolean) => {
+  multi.value = multiSelect
+  dialogVisible.value = true
+  fetchData()
+}
+// ----------------------- 以下是暴露的方法内容 ----------------------------
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <div class="choose-lab-dialog">
+    <el-dialog v-model="dialogVisible" :title="`选择检定实验室${(checkoutList.length > 0 && multi) ? `(已选择${checkoutList.length}个实验室)` : ''}`" width="1000" @close="cancle">
+      <search-area
+        :need-clear="true"
+        @search="searchList" @clear="clearList"
+      >
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.organizeName"
+            placeholder="实验室名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-select
+            v-model.trim="listQuery.meterMajor"
+            clearable
+            placeholder="计量专业"
+          >
+            <el-option
+              v-for="item in measureMajorList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <div style="padding: 5px 10px;">
+        <normal-table
+          :data="list"
+          :total="total"
+          :columns="columns"
+          :query="listQuery"
+          :list-loading="loadingTable"
+          :pagination="false"
+          size="small"
+          @multi-select="handleSelectionChange"
+        >
+          <!-- :is-showmulti-select="multi" -->
+          <!-- :is-multi="multi" -->
+          <template v-if="!multi" #preColumns>
+            <el-table-column label="#" width="55" align="center" fixed="left">
+              <template #default="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="" width="40" align="center" fixed>
+              <template #default="scope">
+                <el-radio v-model="singleChecked" :label="scope.row.id" class="radio" />
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </div>
+
+      <template #footer>
+        <el-button type="primary" @click="clickConfirm">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.choose-lab-dialog {
+  :deep(.el-radio__label) {
+    display: none;
+  }
+}
+</style>
diff --git a/src/views/business/lab/myMeasure/components/lab-interface.ts b/src/views/business/lab/myMeasure/components/lab-interface.ts
new file mode 100644
index 0000000..02b0d1d
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/lab-interface.ts
@@ -0,0 +1,29 @@
+// 查询参数类型
+export interface ILabSearchQuery {
+  organizeNo: string // 组织编号
+  organizeName: string // 名称
+  organizeType: string // 类型-3科室
+  isLab: '1' // 是否是实验室
+  director: string // 负责人
+  meterMajor: string // 专业
+  createStartTime: '' // 创建开始时间
+  createEndTime: '' // 创建结束事假
+}
+
+// 部门返回值对象类型
+export interface ILabList {
+  id: string
+  deptId: string // 部门id
+  director: string // 负责人名称
+  phone: string // 负责人电话
+  meterMajor: string // 计量专业
+  organizeNo: string // 实验室编号
+  organizeName: string // 实验室名称
+  measureItems: string // 全部检测能力
+  pDeptId: string // 所属部门
+  pDeptName: string // 所属部门
+  organizeType: string // 组织类型
+  remark?: string // 备注
+  createTime?: string // 创建时间
+  updateTime?: string // 更新时间
+}
diff --git a/src/views/business/lab/myMeasure/components/processConfig.vue b/src/views/business/lab/myMeasure/components/processConfig.vue
new file mode 100644
index 0000000..bb66076
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/processConfig.vue
@@ -0,0 +1,161 @@
+<script setup lang="ts" name="ProcessConfig">
+import { ref } from 'vue'
+import draggable from 'vuedraggable'
+import { ElMessage } from 'element-plus'
+import type { ISchedule, IScheduleSet } from '../task-interface'
+import ProcessNode from './processNode.vue'
+import ProcessNodeAdd from './processNodeAdd.vue'
+import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
+import { setMeasureProcess, setMeasureProcessByFfy } from '@/api/business/schedule/task'
+const props = defineProps({
+  type: {
+    type: String,
+    default: 'distribute',
+  }, // 类型，决定调用哪个接口
+  // 是否为详情展示页面
+  detail: {
+    type: Boolean,
+    default: false,
+  },
+  // 样品id
+  sampleId: {
+    type: String,
+    required: true,
+  },
+  // 委托单id
+  orderId: {
+    type: String,
+    required: true,
+  },
+  list: {
+    type: Array,
+    default: () => [],
+  },
+})
+const emits = defineEmits(['saveOver'])
+// 默认流程节点
+const defaultProcess: IScheduleSet = {
+  measurePersonId: '', // 执行人
+  measurePerson: '', // 执行人名称
+  measureSegmentId: '', // 执行部门
+  measureSegment: '', // 执行部门名称
+  executiveItem: '', // 检定项目
+  // alreadyCertifications: 0, // 已出具证书总数
+  requireCertifications: 1, // 应出具证书总数
+  measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: '', // 流程更新时间
+}
+// 检定流程列表
+const processList = ref<IScheduleSet[]>([
+  { ...defaultProcess },
+])
+
+watch(() => props.list, (val) => {
+  if (props.list.length > 0) {
+    processList.value = props.list as ISchedule[]
+  }
+},
+{ deep: true, immediate: true })
+
+// 点击添加流程
+const processAdd = () => {
+  processList.value.push({ ...defaultProcess })
+}
+// 检查是否允许移动
+const checkMove = (evt: any) => {
+  // 目的位置元素evt.relatedContext.element
+  // 当前拖动元素evt.draggedContext.element
+  if (evt.relatedContext.element.measureState !== '0') {
+    return false
+  }
+  return true
+}
+
+// 选择实验室弹窗
+const chooseLabDialog = ref()
+// 批量添加流程
+const batchProcessAdd = () => {
+  chooseLabDialog.value.initDialog(true)
+}
+
+// 批量添加实验室
+const batchChooseOver = (labs: ILabList[]) => {
+  for (const item of labs) {
+    const processTemp: IScheduleSet = {
+      measurePersonId: '', // 执行人
+      measurePerson: '', // 执行人名称
+      measureSegmentId: item.deptId, // 执行部门
+      measureSegment: item.organizeName, // 执行部门名称
+      executiveItem: '', // 检定项目
+      measureSequence: '', // 监测顺序
+      // alreadyCertifications: 0, // 已出具证书总数
+      requireCertifications: 1, // 应出具证书总数
+      measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+      updateTime: '', // 流程更新时间
+    }
+    processList.value.push(processTemp)
+  }
+}
+
+// 保存流程
+const saveProcess = () => {
+  const form = {
+    measureProcessList: processList.value,
+    executiveList: processList.value,
+    orderId: props.orderId,
+    sampleId: props.sampleId,
+  }
+  // 处理顺序
+  for (const key in form.measureProcessList) {
+    form.measureProcessList[key].measureSequence = (parseInt(key) + 1).toString()
+  }
+  if (props.type == 'distribute') {
+    setMeasureProcess(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
+  else {
+    setMeasureProcessByFfy(form).then((res) => {
+      ElMessage.success('保存成功')
+      emits('saveOver')
+    })
+  }
+}
+// 删除流程
+const deleteProcess = (index: number) => {
+  processList.value.splice(index, 1)
+}
+
+// --------暴露方法
+defineExpose({ saveProcess, batchProcessAdd, deleteProcess })
+</script>
+
+<template>
+  <div>
+    <div class="process-container">
+      <draggable v-model="processList" item-key="id" class="process-draggable" handle=".handle" :move="checkMove">
+        <!-- eslint-disable-next-line vue/no-unused-vars -->
+        <template #item="{ process, index }">
+          <process-node v-model="processList[index]" :step="index + 1" :detail="props.detail" @delete="deleteProcess(index)" />
+        </template>
+        <template #footer>
+          <process-node-add v-if="!props.detail" @click="processAdd" />
+        </template>
+      </draggable>
+    </div>
+    <choose-lab ref="chooseLabDialog" @confirm-checkout="batchChooseOver" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.process-container {
+  .process-draggable {
+    display: flex;
+    flex-wrap: wrap;
+  }
+}
+</style>
diff --git a/src/views/business/lab/myMeasure/components/processNode.vue b/src/views/business/lab/myMeasure/components/processNode.vue
new file mode 100644
index 0000000..fad76ab
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/processNode.vue
@@ -0,0 +1,215 @@
+<script lang="ts" setup name="ProcessNode">
+import {
+  Aim, Rank, Remove,
+} from '@element-plus/icons-vue'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
+import chooseLab from './chooseLab.vue'
+import type { ILabList } from './lab-interface'
+// 逻辑代码
+const props = defineProps({
+  // 默认数据
+  modelValue: {
+    type: Object,
+    default: () => {
+      return {
+        measurePersonId: '', // 执行人
+        measurePerson: '', // 执行人名称
+        measureSegmentId: '', // 执行部门
+        measureSegment: '', // 执行部门名称
+        executiveItem: '', // 检定项目
+        alreadyCertifications: 0, // 已出具证书总数
+        requireCertifications: 0, // 应出具证书总数
+        measureStatus: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        measureStatusName: '', // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+        updateTime: '', // 流程更新时间
+      }
+    },
+  },
+  // 是否为详情展示页面
+  detail: {
+    type: Boolean,
+    default: false,
+  },
+  // 步骤
+  step: {
+    type: Number,
+    default: 1,
+  },
+})
+const emit = defineEmits(['update:modelValue', 'delete'])
+
+// ------------定义props参数----------
+const processNodeData = computed({
+  get() {
+    return props.modelValue
+  },
+  set(value) {
+    emit('update:modelValue', value)
+  },
+})
+// 检定环节可编辑-只有待分发状态可编辑
+const deptEdit = computed(() => {
+  const editStates = ['']
+  return editStates.includes(processNodeData.value.measureStatus)
+})
+// 检定人可编辑-待分配状态可编辑
+const personEdit = computed(() => {
+  const editStates = ['', '1', '2']
+  return editStates.includes(processNodeData.value.measureStatus)
+})
+// 证书可编辑-待分发、待分配、待检测状态可编辑
+const certificationEdit = computed(() => {
+  const editStates = ['', '1', '2', '3']
+  return editStates.includes(processNodeData.value.measureStatus)
+})
+// 节点可移动
+const canMove = computed(() => {
+  const editStates = ['', '1']
+  return editStates.includes(processNodeData.value.measureStatus)
+})
+
+// 选择人员
+const choosePersonShow = ref(false)
+const choosePerson = () => {
+  choosePersonShow.value = true
+}
+// 人员选择完毕
+const choosePersonOver = (person: { id: string; name: string }) => {
+  processNodeData.value.measurePersonId = person.id
+  processNodeData.value.measurePerson = person.name
+  choosePersonShow.value = false
+}
+
+// 选择实验室
+const chooseLabDialog = ref()
+const clickChoose = () => {
+  chooseLabDialog.value.initDialog(false)
+}
+const _selectStaffDialog = ref()
+// 实验室选择完毕
+const chooseOver = (lab: ILabList) => {
+  console.log(lab)
+  processNodeData.value.measureSegmentId = lab.deptId
+  processNodeData.value.measureSegment = lab.organizeName
+  // 定义一个对象关联上子组件的 ref 值（注意：这里的属性名必须跟子组件定义的 ref 值一模一样，否者会关联失效）
+  // 延迟使用，因为还没挂载
+  nextTick(() => {
+    _selectStaffDialog.value.fetchData()
+  })
+}
+
+// 移除该节点
+const deleteNode = () => {
+  emit('delete')
+}
+</script>
+
+<template>
+  <div class="process-node">
+    <div class="header">
+      <div class="step">
+        {{ props.step }}
+      </div>
+      <div class="buttons">
+        <el-icon v-show="canMove && !props.detail" class="icon-button" title="移除" @click="deleteNode">
+          <remove />
+        </el-icon>
+        <el-icon v-show="canMove && !props.detail" class="icon-button handle" title="移动">
+          <rank />
+        </el-icon>
+      </div>
+    </div>
+    <div>
+      <div class="line">
+        <span class="label">检定环节</span>
+        <el-input v-model="processNodeData.measureSegment" class="process-input" readonly size="small" :disabled="!deptEdit || props.detail">
+          <template v-if="deptEdit && !props.detail" #append>
+            <el-button :icon="Aim" size="small" link @click="clickChoose" />
+          </template>
+        </el-input>
+      </div>
+      <div class="line">
+        <span class="label">检定人员</span>
+        <el-input v-model="processNodeData.measurePerson" readonly class="process-input" size="small" :disabled="!personEdit || props.detail">
+          <template v-if="personEdit && !props.detail" #append>
+            <el-button :icon="Aim" size="small" link :disabled="processNodeData.measureSegment === ''" @click="choosePerson" />
+          </template>
+        </el-input>
+      </div>
+      <div class="line">
+        <span class="label">应出具证书</span><el-input-number v-model="processNodeData.requireCertifications" class="process-input" size="small" :disabled="!certificationEdit || props.detail" /><span class="unit"> 份</span>
+      </div>
+      <div class="line">
+        <span class="label">当前状态</span><span class="process-input">{{ processNodeData.measureStatusName }}</span>
+      </div>
+      <div class="line">
+        <span class="label">更新时间</span><span class="process-input">{{ processNodeData.updateTime }}</span>
+      </div>
+    </div>
+    <!-- 选择实验室弹窗 -->
+    <choose-lab ref="chooseLabDialog" @confirm-checkout="chooseOver" />
+    <!-- 成员弹框 -->
+    <select-staff-dialog ref="_selectStaffDialog" v-model:visible="choosePersonShow" :data="[processNodeData.measurePersonId]" :dept-id="processNodeData.measureSegmentId" :dept-name="processNodeData.measureSegment" :multi="false" @change="choosePersonOver" />
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.process-node {
+  // display: inline-block;
+  margin-right: 10px;
+  width: 280px;
+  height: 215px;
+  border: 1px solid #e0e0e0;
+  padding: 5px 15px;
+  border-radius: 5px;
+  background-color: #fafafa;
+  margin-bottom: 10px;
+
+  .header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+    .step {
+      line-height: 28px;
+      font-size: 16px;
+      color: #3d7eff;
+      font-weight: bold;
+      margin-bottom: 5px;
+    }
+
+    .icon-button {
+      color: #999;
+      margin-left: 5px;
+      font-size: 16px;
+
+      &:hover {
+        cursor: pointer;
+      }
+    }
+  }
+
+  .line {
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 4px 0;
+
+    .label {
+      width: 80px;
+      font-size: 14px;
+    }
+
+    .process-input {
+      flex: 1;
+      font-size: 14px;
+    }
+
+    .unit {
+      margin-left: 5px;
+      font-size: 14px;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/lab/myMeasure/components/processNodeAdd.vue b/src/views/business/lab/myMeasure/components/processNodeAdd.vue
new file mode 100644
index 0000000..d7aeea0
--- /dev/null
+++ b/src/views/business/lab/myMeasure/components/processNodeAdd.vue
@@ -0,0 +1,46 @@
+<script lang="ts" setup name="ProcessNodeAdd">
+const emit = defineEmits(['click'])
+const add = () => {
+  emit('click')
+}
+</script>
+
+<template>
+  <div class="process-node" @click="add">
+    <div class="add">
+      <el-icon class="add-icon">
+        <plus />
+      </el-icon>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+.process-node {
+  // display: inline-block;
+  width: 280px;
+  height: 215px;
+  border: 1px dashed #e0e0e0;
+  padding: 5px 15px;
+  border-radius: 5px;
+  background-color: #fbfbfb;
+
+  &:hover {
+    cursor: pointer;
+    background-color: #f5f5f5;
+  }
+
+  .add {
+    height: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    .add-icon {
+      vertical-align: middle;
+      font-size: 100px;
+      color: #999;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/lab/myMeasure/measureDetail.vue b/src/views/business/lab/myMeasure/measureDetail.vue
new file mode 100644
index 0000000..1a88be8
--- /dev/null
+++ b/src/views/business/lab/myMeasure/measureDetail.vue
@@ -0,0 +1,601 @@
+<!-- 任务分发 -->
+<script lang="ts" setup name="TaskEdit">
+import { ElMessage, ElMessageBox } from 'element-plus'
+import type { FormInstance } from 'element-plus'
+import { ref } from 'vue'
+import ProcessConfig from './components/processConfig.vue'
+import type { ISampleMeasure, ITaskDetail } from './task-interface'
+import type { SimpleCertification, SimpleMeasureRecord } from '@/views/customer/sample/list/sample_list_interface'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { getTaskDetail } from '@/api/business/schedule/task'
+import countries from '@/components/AddressSelect/country-code.json'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getDictByCode } from '@/api/system/dict'
+import { getSapmleDetail, updateSample } from '@/api/customer/sampleList'
+interface dictType {
+  id: string
+  name: string
+  value: string
+}
+const roleType = ref('distribute') // 角色类型: distribute待分发(分发人员), dispatch待分配(实验室分配工作人员),
+const countryList = ref(countries) // 国家列表
+const loading = ref(false) // 表单加载状态
+const sampleId = ref('') // 样品详情id
+const orderId = ref('') // 委托书id
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+const mesureTypeList = ref<dictType[]>([]) // 检定方式
+const $route = useRoute()
+
+// 获取字典值
+function getDict() {
+  // 获取样品属性
+  getDictByCode('measureCategory').then((response) => {
+    mesureCategoryList.value = response.data
+  })
+  // 获取样品属性
+  getDictByCode('measureType').then((response) => {
+    mesureTypeList.value = response.data
+  })
+}
+getDict()
+
+// 基本信息表单
+const sampleForm = ref<ISampleMeasure>({
+  id: '', // 样品id
+  sampleNo: '', // 样品编号
+  sampleName: '', // 样品名称
+  sampleModel: '', // 样品型号
+  manufacturingNo: '', // 出厂编号
+  customerId: '', // 委托方id
+  customerNo: '', // 委托方代码
+  customerName: '', // 委托方名称
+  phone: '', // 委托方电话
+  postalCode: '', // 委托方邮编
+  customerAddress: '', // 委托方地址
+  measureCategory: '', // 检校类别
+  manufacturer: '', // 生产厂家
+  manufacturerCountry: '', // 厂家国别
+  manufacturingDate: '', // 出厂年月
+  abc: '', // ABC
+  measurePeriod: '', // 检定周期
+  remark: '', // 备注
+  minioFileName: '', // 说明书
+  labelBind: '', // 标签绑定
+  measureType: '1', // 检定方式  1自检、2外包、3外检
+  measureTypeName: '', // 检定方式
+  measureLastTime: '', // 检定日期
+  validDeadline: '', // 有效日期
+  powerVoltage: '', // 电源电压
+  sampleBelong: '', // 样品所属
+  sampleBelongName: '', // 样品所属
+})
+const taskForm = ref <ITaskDetail> ({
+  measureContent: '', // 检定项目
+  specialRequire: '', // 客户特殊要求
+  orderId: '', // 委托单id
+  orderCode: '', // 委托单编号
+  certifications: '', // 证书类别
+  planDeliverTime: '', // 预约送达时间
+  requireOverTime: '', // 要求检完时间
+  measureProcessList: [], // 检定流程
+  measureSendBackList: [], // 退回信息
+  remark: '', // 备注
+  deliverer: '', // 送检人
+  delivererTel: '', // 送检人联系方式
+})
+const ruleFormRef = ref<FormInstance>()
+
+// 自定义校验规则--检定周期为正整数
+const validateMesurePeriod = (rule: any, value: any, callback: any) => {
+  if (value === '') {
+    callback()
+  }
+  else if (!(/(^[1-9]\d*$)/.test(value))) {
+    callback(new Error('请输入一个正整数'))
+  }
+  else {
+    callback()
+  }
+}
+
+// 校验规则
+const rules = ref({
+  mesurePeriod: [{ validator: validateMesurePeriod, trigger: 'blur' }],
+}) // 表单验证规则
+
+// 其他关联数据列表
+const dataList = ref({
+  measureRecords: [] as SimpleMeasureRecord[],
+  certificationRecords: [] as SimpleCertification[],
+})
+
+// 获取检定记录
+const fetchMeasureRecords = function (query = null) {
+  dataList.value.measureRecords = []
+}
+// 获取检定证书
+const fetchCertifications = function (query = null) {
+  dataList.value.certificationRecords = []
+}
+interface Menu {
+  name: string
+  columns: TableColumn[]
+  pagination: boolean
+  list: 'measureRecords' | 'certificationRecords'
+  searchFunc: Function
+}
+// 菜单
+const menu: Menu[] = [
+  {
+    name: '检定记录',
+    columns: [
+      { text: '委托单编号', value: 'orderCode' },
+      { text: '委托单日期', value: 'orderTime' },
+      { text: '委托方代码', value: 'customerCode' },
+      { text: '委托方名称', value: 'customerName' },
+      { text: '送检人', value: 'deliverer' },
+      { text: '送检日期', value: 'deliverTime' },
+    ],
+    list: 'measureRecords',
+    pagination: true,
+    searchFunc: fetchMeasureRecords,
+  },
+  {
+    name: '检定证书',
+    columns: [
+      { text: '证书编号', value: 'certificationCode' },
+      { text: '证书名称', value: 'certificationName' },
+      { text: '证书类型', value: 'certificationType' },
+      { text: '证书出具日期', value: 'effectiveDate' },
+      { text: '证书有效期', value: 'expirationDate' },
+    ],
+    list: 'certificationRecords',
+    pagination: true,
+    searchFunc: fetchCertifications,
+  },
+]
+
+const currentMenu = ref('证书监控')
+const currentMenuObj = computed(() => {
+  return menu.find(item => item.name === currentMenu.value)
+})
+
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+// 打印表单
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '样品详情', // 打印配置页上方的标题
+  extraHead: '<div style="display: flex;flex-direction: column;text-align: center"><h3>样品详情</h3></div>', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+
+// 保存样品信息
+function saveForm(formEl: FormInstance | undefined) {
+  if (!formEl) { return }
+  formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm(
+        '确认修改样品信息吗？',
+        '提示',
+        {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        },
+      ).then(() => {
+        if (sampleForm.value.id) {
+          updateSample(sampleForm.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('已保存')
+              $router.go(-1)
+            }
+          })
+        }
+      })
+    }
+  })
+}
+// 获取详情
+const getSampleInfo = () => {
+  getSapmleDetail({ id: sampleId.value }).then((res) => {
+    sampleForm.value = res.data
+  })
+}
+// 获取分发详情
+const getInfo = () => {
+  // 获取任务详情
+  getTaskDetail({ orderId: orderId.value, sampleId: sampleId.value }).then((res) => {
+    taskForm.value.specialRequire = res.data.specialRequire // 客户特殊要求
+    taskForm.value.deliverer = res.data.deliverer // 送检人
+    taskForm.value.delivererTel = res.data.delivererTel // 送检人联系方式
+    taskForm.value.measureContent = res.data.measureContent // 检定项目
+    taskForm.value.measureProcessList = res.data.measureProcessList // 检定流程
+    taskForm.value.measureSendBackList = res.data.measureSendBackList // 退回流程
+    console.log('pppppp')
+    console.log(taskForm.value.measureProcessList)
+
+    // 改用一个接口获取
+    sampleForm.value = res.data
+  })
+}
+
+// 点击标签绑定的扫描
+const startScan = () => {
+  // TODO
+}
+
+// 流程配置组件
+const processConfigRef = ref()
+// 批量添加流程按钮点击
+const batchProcessAdd = () => {
+  processConfigRef.value.batchProcessAdd()
+}
+// 保存流程按钮点击
+const saveProcess = () => {
+  processConfigRef.value.saveProcess()
+}
+
+// 文件上传
+const fileRef = ref()
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    // UploadFile(fd).then((res) => {
+    //   if (res.code === 200) {
+    //     sampleForm.value.minioFileName = res.data[0]
+    //     // 重置当前验证
+    //     ElMessage.success('文件上传成功')
+    //   }
+    //   else {
+    //     ElMessage.error(res.message)
+    //   }
+    // })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+onMounted(() => {
+  console.log($route)
+  // 从路由中获取页面类型参数
+  if ($route.params && $route.params.role) {
+    roleType.value = $route.params.role as string // 使用角色
+  }
+  if ($route.params.id) {
+    sampleId.value = $route.params.id as string
+    orderId.value = $route.query.order as string
+    // 获取分发详情
+    getInfo()
+  }
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page title="样品详情">
+      <template #btns>
+        <el-button v-if="roleType === 'detail'" v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <!-- <el-button v-if="roleType !== 'detail'" type="primary" @click="saveForm(ruleFormRef)">
+          保存
+        </el-button> -->
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <div id="form">
+        <el-form
+          ref="ruleFormRef"
+          :model="sampleForm"
+          :label-width="120"
+          label-position="right"
+          :rules="rules"
+        >
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="样品编号:" prop="sampleNo">
+                <el-input
+                  v-model="sampleForm.sampleNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品名称:" prop="sampleName">
+                <el-input
+                  v-model="sampleForm.sampleName"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="样品型号:" prop="sampleModel">
+                <el-input
+                  v-model="sampleForm.sampleModel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂编号:" prop="manufacturingNo">
+                <el-input
+                  v-model="sampleForm.manufacturingNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方代码" prop="customerNo">
+                <el-input
+                  v-model="sampleForm.customerNo"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方名称" prop="customerName">
+                <el-input
+                  v-model="sampleForm.customerName"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方名称'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方电话" prop="phone">
+                <el-input
+                  v-model="sampleForm.phone"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方电话'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="委托方邮编" prop="postalCode">
+                <el-input
+                  v-model="sampleForm.postalCode"
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方邮编'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="18">
+              <el-form-item label="委托方地址:" prop="companyAddress">
+                <el-input
+                  v-model="sampleForm.customerAddress"
+                  type="textarea"
+                  autosize
+                  :placeholder="roleType === 'detail' ? '' : '请输入委托方地址'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="校检类别:">
+                <el-select
+                  v-model="sampleForm.measureCategory"
+                  :placeholder="roleType === 'detail' ? '' : '请选择校检类别'"
+                  :disabled="roleType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of mesureCategoryList" :key="item.value" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="生产厂家:">
+                <el-input
+                  v-model="sampleForm.manufacturer"
+                  :placeholder="roleType === 'detail' ? '' : '请输入生产厂家'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="厂家国别:">
+                <el-select
+                  v-model="sampleForm.manufacturerCountry"
+                  :placeholder="roleType === 'detail' ? '' : '请选择厂家国别'"
+                  :disabled="roleType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="country of countryList" :key="country.code" :label="country.CNName" :value="country.code" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="出厂年月:">
+                <el-date-picker
+                  v-model="sampleForm.manufacturingDate"
+                  type="month"
+                  format="YYYY-MM"
+                  value-format="YYYY-MM"
+                  class="full-width-input"
+                  :placeholder="roleType === 'detail' ? '' : '请输入出厂年月'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="ABC:">
+                <el-select
+                  v-model="sampleForm.abc"
+                  :placeholder="roleType === 'detail' ? '' : '请选择ABC'"
+                  :disabled="roleType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of ['A', 'B', 'C']" :key="item" :label="item" :value="item" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="送检人:">
+                <el-input
+                  v-model="taskForm.deliverer"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="联系方式:">
+                <el-input
+                  v-model="taskForm.delivererTel"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="检定项目:" prop="mesureContent">
+                <el-input
+                  v-model="taskForm.measureContent"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  disabled
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检定周期（月）:">
+                <el-input
+                  v-model="sampleForm.measurePeriod"
+                  :placeholder="roleType === 'detail' ? '' : '请输入检定周期'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                  :disabled="roleType === 'detail'"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="备注:">
+                <el-input
+                  v-model="sampleForm.remark"
+                  type="textarea"
+                  :rows="2"
+                  :placeholder="roleType === 'detail' ? '' : ''"
+                  disabled
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="检定方式:">
+                <el-select
+                  v-model="sampleForm.measureType"
+                  :placeholder="roleType === 'detail' ? '' : '请选择检定方式'"
+                  :disabled="roleType === 'detail'"
+                  class="full-width-input"
+                >
+                  <el-option v-for="item of mesureTypeList" :key="item.value" :label="item.name" :value="item.value" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="标签绑定:">
+                <el-input
+                  v-model="sampleForm.labelBind"
+                  :placeholder="roleType === 'detail' ? '' : '标签绑定'"
+                  :disabled="roleType === 'detail'"
+                  :class="{ 'detail-input': roleType === 'detail' }"
+                >
+                  <template v-if="roleType !== 'detail'" #append>
+                    <el-button>
+                      扫描
+                    </el-button>
+                  </template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="24" class="marg">
+            <el-col :span="14">
+              <el-form-item label="说明书:">
+                <show-photo v-if="sampleForm.minioFileName" :minio-file-name="sampleForm.minioFileName" />
+                <span v-else-if="roleType === 'detail'">无</span>
+                <input v-show="roleType === ''" ref="fileRef" type="file" @change="onFileChange">
+                <el-button v-if="roleType !== 'detail'" id="file" type="primary" :disabled="roleType === 'detail'" :style="{ 'margin-left': sampleForm.minioFileName === '' ? '0px' : '20px' }" @click="upload">
+                  {{ sampleForm.minioFileName === '' ? '上传' : '更换附件' }}
+                </el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </detail-page>
+    <detail-block v-if="taskForm.measureProcessList && taskForm.measureProcessList.length >= 1" title="检定流程">
+      <!-- <template #btns>
+        <el-button type="primary" style="margin-bottom: 10px;" @click="batchProcessAdd">
+          批量添加
+        </el-button>
+        <el-button type="primary" style="margin-bottom: 10px;" @click="saveProcess">
+          保存
+        </el-button>
+      </template> -->
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureProcessList" :sample-id="sampleId" :detail="true" />
+    </detail-block>
+    <!-- 退回流程 -->
+    <detail-block v-if="taskForm.measureSendBackList && taskForm.measureSendBackList.length >= 1" title="退回流程">
+      <process-config ref="processConfigRef" :type="roleType" :order-id="orderId" :list="taskForm.measureSendBackList" :sample-id="sampleId" :detail="true" />
+    </detail-block>
+    <!-- 检定记录、检定证书 -->
+    <detail-block-switch :title="currentMenu">
+      <template #menu>
+        <el-radio-group v-model="currentMenu">
+          <el-radio-button label="证书监控">
+            证书监控
+          </el-radio-button>
+          <el-radio-button label="检定记录">
+            检定记录
+          </el-radio-button>
+          <el-radio-button label="检定证书">
+            检定证书
+          </el-radio-button>
+        </el-radio-group>
+      </template>
+      <!-- 证书监控 -->
+      <certification-monitor v-if="currentMenu === '证书监控'" :sample-id="sampleId" :order-id="taskForm.orderId" />
+      <!-- 检定记录 -->
+      <measure-records v-if="currentMenu === '检定记录'" :sample-id="sampleId" />
+      <!-- 证书记录 -->
+      <certification-records v-if="currentMenu === '检定证书'" :sample-id="sampleId" />
+    </detail-block-switch>
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
+
diff --git a/src/views/business/lab/myMeasure/myMeasureList.vue b/src/views/business/lab/myMeasure/myMeasureList.vue
index 62f8830..e4a4637 100644
--- a/src/views/business/lab/myMeasure/myMeasureList.vue
+++ b/src/views/business/lab/myMeasure/myMeasureList.vue
@@ -13,7 +13,6 @@
 import { getMyMeasureList, myExecutiveDone, myExecutiveReceive } from '@/api/business/schedule/task'
 import type { dictType } from '@/global'
 import type { IMenu } from '@/components/buttonBox/buttonBox'
-
 const { proxy } = getCurrentInstance() as any
 const $router = useRouter()
 // 右上角按钮
@@ -128,7 +127,7 @@
 }
 // 点击详情
 const handleDetail = (row: ITaskList) => {
-  $router.push(`/schedule/task/distribute/${row.sampleId}`)
+  $router.push(`myMeasureDetail/detail/${row.sampleId}?order=${row.orderId}`)
 }
 
 // 点击分发， 弹窗
diff --git a/src/views/business/lab/myMeasure/task-interface.ts b/src/views/business/lab/myMeasure/task-interface.ts
new file mode 100644
index 0000000..6503a12
--- /dev/null
+++ b/src/views/business/lab/myMeasure/task-interface.ts
@@ -0,0 +1,169 @@
+// 任务列表查询条件
+export interface ITaskQuery {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  orderNo: string // 委托书编号
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  isUrgent: string // 是否加急
+  sampleBelong: string // 样品属性
+  sampleStatus: string // 分发状态
+  startTime: string //	应检定开始时间
+  endTime: string //	应检定结束时间
+  limit: number
+  offset: number
+}
+
+// 我的检测/部门检测查询条件
+export interface ILabQuery {
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  orderNo: string // 委托书编号
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  isUrgent: string // 是否加急
+  sampleBelong: string // 样品属性
+  measureStatus: string // 分发状态
+  startTime: string | number //	应检定开始时间
+  endTime: string | number //	应检定结束时间
+  limit: number
+  offset: number
+}
+// 任务列表-返回值
+export interface ITaskList {
+  orderId: string // 委托书编号
+  sampleId: string // 样品唯一标识
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 型号
+  manufacturingNo: string // 出厂编号
+  orderNo: string // 委托书编号
+  customerNo: string // 委托方代码
+  customerName: string // 委托方名称
+  isUrgent: number // 是否加急
+  isUrgentName?: string // 是否加急
+  requireOverTime: string // 应检完时间
+  sampleBelong: string // 样品属性
+  sampleBelongName: string // 样品属性
+  currentMeasureState: string // 当前检定环节
+  currentMeasureStateName: string // 当前检定环节
+  alreadyCertifications: number // 已出具证书总数
+  requireCertifications: number // 应出具证书总数
+  distributeState: string // 分发性质-初次分发、退回分发
+  handOutProperty: string // 分发性质-初次分发、退回分发
+  id?: string // 实验室id
+}
+
+// 实验室检测/我的检测列表
+export interface IlabMeasureList extends ITaskList {
+  id: string // 实验室检测id
+  measurePersonId: string // 检测人id
+  measureSegmentId: string // 检测部门id
+  currentSegmentId: string // 检测部门id (新)
+}
+
+// 全部检测流程节点
+export interface ISchedule {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications: number // 应出具证书总数
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: string // 流程更新时间
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
+  distributePerson: string // 分配人
+  distributeTime: string // 分配时间
+  startTime: string // 检定开始时间
+  overTime: string // 检定完成时间
+}
+// 检测流程节点
+export interface IScheduleSet {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications: number // 应出具证书总数
+  measureStatus: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  measureStatusName: string // 检测状态： 待分配，待检测，检测中，检测完, 已退回/取消
+  updateTime: string // 流程更新时间
+  measureSequence?: string // 检测顺序
+}
+// 退回流程节点
+export interface IScheduleBack {
+  measurePersonId: string // 执行人
+  measurePerson: string // 执行人名称
+  measureSegmentId: string // 执行部门
+  measureSegment: string // 执行部门名称
+  executiveItem: string // 检定项目
+  alreadyCertifications?: number // 已出具证书总数
+  requireCertifications?: number // 应出具证书总数
+  sendBackTime: string // 退回时间
+  sendBackReason: string // 退回原因
+  sendBackPersonId: string // 退回人
+  sendBackPerson: string // 退回人
+}
+
+// 样品检测信息
+export interface ISampleMeasure {
+  id: string // 样品id
+  sampleNo: string // 样品编号
+  sampleName: string // 样品名称
+  sampleModel: string // 样品型号
+  manufacturingNo: string // 出厂编号
+  customerNo: string // 委托方代码
+  customerId: string // 委托方id
+  customerName: string // 委托方名称
+  phone: string // 委托方电话
+  postalCode: string // 委托方邮编
+  customerAddress: string // 委托方地址
+  measureCategory: string // 检校类别
+  manufacturer: string // 生产厂家
+  manufacturerCountry: string // 厂家国别
+  manufacturingDate: string // 出厂年月
+  abc: string // ABC
+  measurePeriod: string // 检定周期
+  minioFileName: string // 说明书
+  labelBind: string // 标签绑定
+  measureType: string // 检定方式
+  measureTypeName: string // 检定方式
+  measureLastTime?: string // 检定日期
+  validDeadline: string // 有效日期
+  powerVoltage: string // 电源电压
+  sampleBelong: string // 样品所属
+  sampleBelongName: string // 样品所属
+  remark: string // 备注
+}
+
+export interface ITaskDetail {
+  measureContent: string // 检定项目
+  measureProcessList: ISchedule[] // 检定流程
+  measureSendBackList: ISchedule[] // 退回信息
+  remark: string // 备注
+  orderId: string // 委托单id
+  orderCode: string // 委托单编号
+  certifications: string // 证书类别
+  planDeliverTime: string // 预约送达时间
+  requireOverTime: string // 要求检完时间
+  specialRequire: string // 客户特殊要求
+  deliverer: string // 送检人
+  delivererTel: string // 送检人联系方式
+}
+
+// 退回
+export interface ISendBack {
+  id: string // 实验室检测id
+  measurePersonId: string // 检定人员id
+  measureSegmentId: string //	检定环节，实验室id
+  operateReason: string // 退回原因
+  orderId: string // 委托书id
+  sampleId: string //	样品id
+}
diff --git a/src/views/business/schedule/task/taskList.vue b/src/views/business/schedule/task/taskList.vue
index 0efec98..99a6852 100644
--- a/src/views/business/schedule/task/taskList.vue
+++ b/src/views/business/schedule/task/taskList.vue
@@ -141,7 +141,6 @@
 // 点击详情
 const handleDetail = (row: ITaskList) => {
   console.log('跳转任务分发详情')
-
   $router.push(`/schedule/task/distribute/${row.sampleId}?order=${row.orderId}`)
 }
 
diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue
index 6ad9900..dbaa437 100644
--- a/src/views/device/borrow/borrowHandle.vue
+++ b/src/views/device/borrow/borrowHandle.vue
@@ -83,11 +83,7 @@
     text: '申请时间',
     value: 'time',
     align: 'center',
-  },
-  {
-    text: '审批状态',
-    value: 'approvalStatusName',
-    align: 'center',
+    width: 160,
   },
 ]) // 表格
 // 数据查询
@@ -456,6 +452,16 @@
           </el-table-column>
         </template>
         <template #columns>
+          <el-table-column v-if="activeTitle === '已归还'" label="归还时间" width="160" align="center">
+            <template #default="scope">
+              {{ scope.row.backTime }}
+            </template>
+          </el-table-column>
+          <el-table-column label="审批状态" width="120" align="center">
+            <template #default="scope">
+              {{ scope.row.approvalStatusName }}
+            </template>
+          </el-table-column>
           <el-table-column label="操作" align="center" :width="activeTitle === '待借用' ? '130' : activeTitle === '已借用' ? '110' : '80'">
             <template #default="{ row }">
               <el-button size="small" type="primary" link @click="detail(row)">
diff --git a/src/views/device/borrow/editHandle.vue b/src/views/device/borrow/editHandle.vue
index 9a5b2a6..4e0bc5c 100644
--- a/src/views/device/borrow/editHandle.vue
+++ b/src/views/device/borrow/editHandle.vue
@@ -26,6 +26,7 @@
   applyUnit: '', // 申请单位
   applyPerson: '', // 申请人
   time: '', // 借用时间
+  backTime: '', // 归还时间
   applyDesc: '', // 申请说明
 })
 const list = ref<IdeviceList[]>([])// 表格数据
@@ -163,7 +164,18 @@
                     />
                   </el-form-item>
                 </el-col>
-                <el-col :span="12">
+                <el-col :span="6">
+                  <el-form-item label="归还时间" prop="backTime">
+                    <el-date-picker
+                      v-model="form.backTime"
+                      type="datetime"
+                      format="YYYY-MM-DD hh:mm"
+                      value-format="YYYY-MM-DD hh:mm"
+                      disabled
+                    />
+                  </el-form-item>
+                </el-col>
+                <el-col :span="18">
                   <el-form-item label="申请说明" prop="applyDesc">
                     <el-input v-model="form.applyDesc" type="textarea" disabled autosize />
                   </el-form-item>
diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue
index 2ab77ef..3f90519 100644
--- a/src/views/device/standingBook/components/baseInfo.vue
+++ b/src/views/device/standingBook/components/baseInfo.vue
@@ -38,6 +38,7 @@
 const isDetail = ref(false)
 const ruleForm = ref<fixedAssetsType>({
   assetNo: '', // 资产编号
+  compulsoryVerification: '', // 强制检定
   assetType: '', // 资产类型
   assetSource: '', // 资产来源
   equipmentNo: '', // 设备编号
@@ -486,6 +487,14 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
+          <el-form-item label="强制检定" prop="compulsoryVerification">
+            <el-select v-model="ruleForm.compulsoryVerification" :placeholder="title === 'detail' ? '' : '强制检定'" :disabled="title === 'detail'" style="width: 100%;">
+              <el-option label="是" value="1" />
+              <el-option label="否" value="0" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
           <el-form-item label="检定周期(月)" prop="mesureCycle">
             <el-input-number v-model="ruleForm.mesureCycle" :min="12" :max="60" :step="12" :disabled="title === 'detail'" />
             <!-- <el-select v-model="ruleForm.mesureCycle" :placeholder="title === 'detail' ? '' : '检定周期'" clearable style="width: 100%;">
@@ -509,7 +518,7 @@
         </el-col>
         <el-col :span="6">
           <el-form-item label="使用人" prop="usePerson">
-            <el-select v-model="ruleForm.usePerson" :placeholder="title === 'detail' ? '' : '使用人'" :disabled="title === 'detail'" style="width: 100%;">
+            <el-select v-model="ruleForm.usePerson" filterable :placeholder="title === 'detail' ? '' : '使用人'" :disabled="title === 'detail'" style="width: 100%;">
               <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
             </el-select>
           </el-form-item>
diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue
index 479ae05..e46753d 100644
--- a/src/views/device/standingBook/components/templatePage.vue
+++ b/src/views/device/standingBook/components/templatePage.vue
@@ -94,6 +94,7 @@
   { text: '型号', value: 'modelNo', align: 'center' },
   { text: 'ABC', value: 'abc', align: 'center', width: 58 },
   { text: '检定方式', value: 'mesureTypeName', align: 'center', width: 90 },
+  { text: '强制检定', value: 'compulsoryVerification', align: 'center', width: 90 },
   { text: '管理状态', value: 'managerStateName', align: 'center', width: 100 },
   { text: '使用部门', value: 'useDeptName', align: 'center' },
   { text: '使用人', value: 'usePersonName', align: 'center' },
@@ -139,7 +140,10 @@
   }
   listPageApi(searchQuery).then((res) => {
     if (res.code === 200) {
-      list.value = res.data.rows
+      list.value = res.data.rows.map((item: any) => {
+        item.validDate = item.validDate.split(' ')[0]
+        return item
+      })
       total.value = res.data.total
     }
     loadingTable.value = false
@@ -403,7 +407,7 @@
             </el-table-column>
           </template>
           <template #columns>
-            <el-table-column label="操作" align="center" width="120">
+            <el-table-column label="操作" align="center" width="120" fixed="right">
               <template #default="{ row }">
                 <el-button v-if="proxy.hasPerm(`/device/${$props.authority}/update`)" size="small" type="primary" link @click="update(row)">
                   编辑
diff --git a/src/views/device/standingBook/standingBook-interface.ts b/src/views/device/standingBook/standingBook-interface.ts
index bd55019..ee29254 100644
--- a/src/views/device/standingBook/standingBook-interface.ts
+++ b/src/views/device/standingBook/standingBook-interface.ts
@@ -105,7 +105,7 @@
   validDate: string // 有效日期
   version: string // 版本号
   weight: string // 重量（吨）
-
+  compulsoryVerification?: string | number // 强制检定
 }
 
 // 固定资产-查询用
diff --git a/src/views/device/stateManage/components/status-interface.ts b/src/views/device/stateManage/components/status-interface.ts
index 93410a7..dd27189 100644
--- a/src/views/device/stateManage/components/status-interface.ts
+++ b/src/views/device/stateManage/components/status-interface.ts
@@ -90,4 +90,6 @@
 // 目录数组
 export interface EquipmentListRow {
   equipmentId: string
+  assetOriginValue?: string
+  financialValue?: string
 }
diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue
index 42e3ed8..4dda89a 100644
--- a/src/views/device/stateManage/components/templateAdd.vue
+++ b/src/views/device/stateManage/components/templateAdd.vue
@@ -22,6 +22,7 @@
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import { cancelApproval, fetchApproval } from '@/api/approval'
 
+const user = useUserStore() // 用户信息
 const $route = useRoute()
 const userInfo = useUserStore()
 const $router = useRouter()
@@ -42,8 +43,12 @@
   remark: '', // 申请说明
   time: '', // 时间
   fileList: [] as any[], //	说明书
-  applyUnit: '', // 申请单位
-  applyPerson: '', // 申请人
+  applyUnit: window.localStorage.getItem('depId') as string, // 申请单位
+  applyPerson: window.localStorage.getItem('nameId') as string, // 申请人
+  applyNo: '', // 申请单编号
+  applyName: '', // 申请单名称
+  assetOriginValue: '', // 资产原值
+  financialValue: '', // 财务净值
   equipmentNo: '', // 设备编号
   equipmentName: '', // 设备名称
   modelNo: '', // 型号
@@ -56,15 +61,18 @@
 })
 // 设备借用表单
 const ruleForm2 = ref({
+  applyNo: '', // 申请编号
   applyUnit: '', // 申请单位
   applyPerson: '', // 申请人
-  time: '', // 借用时间
+  time: dayjs().format('YYYY-MM-DD HH:mm:ss'), // 申请时间, // 借用时间
   applyDesc: '', // 申请说明
   applyType: '', // 申请类型
   applyName: '', // 申请名称
+  applyPersonName: user.name, // 申请人名称
+  applyUnitName: user.deptName, // 申请单位名称
   createUser: userInfo.$state.id,
   approvalStatus: '',
-  createTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+  createTime: dayjs().format('YYYY-MM-DD hh:mm:ss'),
   id: '',
 })
 const rules1 = ref<FormRules>({
@@ -72,7 +80,9 @@
   applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
   equipmentNo: [{ required: true, message: '设备编号不能为空', trigger: 'blur' }],
   time: [{ required: true, message: `${name.value.substring(2, 4)}时间不能为空`, trigger: 'blur' }],
-  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
+  applyName: [{ required: true, message: '申请单名称不能为空', trigger: 'blur' }],
+  assetOriginValue: [{ required: true, message: '资产原值不能为空', trigger: 'blur' }],
+  financialValue: [{ required: true, message: '财务净值不能为空', trigger: 'blur' }],
 })
 watch(() => ruleForm1.value, (newVal) => {
   if (name.value === '详情') {
@@ -88,10 +98,10 @@
   immediate: true,
 })
 const rules2 = ref<FormRules>({
-  applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
-  applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
+  // applyUnit: [{ required: true, message: '申请单位不能为空', trigger: 'blur' }],
+  // applyPerson: [{ required: true, message: '申请人不能为空', trigger: 'blur' }],
   time: [{ required: true, message: '借用时间不能为空', trigger: 'blur' }],
-  applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
+  // applyName: [{ required: true, message: '申请名称不能为空', trigger: 'blur' }],
 })
 const ruleArr = ['applyUnit', 'applyPerson', 'time', 'applyName']
 watch(() => ruleForm2.value, (newVal: { [key: string]: string }, oldVal) => {
@@ -243,10 +253,6 @@
   }
 }
 
-onMounted(async () => {
-  initDialog($route.query)
-})
-
 // 关闭弹窗
 const close = () => {
   $router.back()
@@ -265,6 +271,7 @@
           ...ruleForm2.value,
           equipmentList: borrowList.value.map(item => ({
             equipmentId: item.id,
+
           })),
         }
         if (title.value === '新建') {
@@ -412,6 +419,8 @@
           type: 'warning',
         },
       ).then((res) => {
+        ruleForm1.value.equipmentList[0].assetOriginValue = ruleForm1.value.assetOriginValue
+        ruleForm1.value.equipmentList[0].financialValue = ruleForm1.value.financialValue
         addStatus(ruleForm1.value).then((res) => {
           if (res.code === 200) {
             ElMessage.success('操作成功!')
@@ -745,6 +754,10 @@
     borrowList.value.splice(selectIndex.value, 1, val[0])
   }
 }
+
+onMounted(() => {
+  initDialog($route.query)
+})
 </script>
 
 <template>
@@ -758,13 +771,12 @@
           <el-button v-if="title !== '详情'" type="primary" @click="deviceManageSubmit(ruleFormRef2)">
             提交
           </el-button>
-          <el-button v-if="title !== '详情'" type="primary" @click="deviceManageSave(ruleFormRef2)">
+          <el-button v-if="title !== '详情'" type="primary" style="margin-right: 10px;" @click="deviceManageSave(ruleFormRef2)">
             保存
           </el-button>
         </temalate>
         <!-- 状态管理 -->
         <template v-else>
-          <!-- <template> -->
           <!-- 新建 -->
           <el-button v-if="title === '新建'" type="primary" @click="statusManageSubmit(ruleFormRef1)">
             提交
@@ -807,30 +819,24 @@
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
             <el-form-item label="申请单位" prop="applyUnit">
-              <dept-select v-model="ruleForm1.applyUnit" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
+              <dept-select v-model="ruleForm1.applyUnit" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="申请人" prop="applyPerson">
-              <el-select v-model="ruleForm1.applyPerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
+              <el-select v-model="ruleForm1.applyPerson" :placeholder="title === '详情' ? '' : '申请人'" disabled style="width: 100%;">
                 <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="设备编号" prop="equipmentNo" class="equipmentNo">
-              <el-input v-model.trim="ruleForm1.equipmentNo" :placeholder="title === '详情' ? '' : '设备名称'" disabled>
-                <template v-if="title !== '详情'" #append>
-                  <el-button type="primary" size="small" @click="addRowBtn">
-                    选择
-                  </el-button>
-                </template>
-              </el-input>
+            <el-form-item label="申请单编号" prop="applyNo">
+              <el-input v-model.trim="ruleForm1.applyNo" :placeholder="title === '详情' ? '' : '系统自动生成'" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="设备名称" prop="equipmentName">
-              <el-input v-model.trim="ruleForm1.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" disabled />
+            <el-form-item label="申请单名称" prop="applyName">
+              <el-input v-model.trim="ruleForm1.applyName" :placeholder="title === '详情' ? '' : '申请单名称'" :disabled="title === '详情'" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -857,15 +863,52 @@
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
-          <el-col :span="6">
+          <el-col v-if="name.substring(2, 4) !== '处置'" :span="6">
             <el-form-item :label="`${name.substring(2, 4)}开始时间`" prop="time">
               <el-date-picker
-                v-model="ruleForm1.time" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
-                :placeholder="title === '详情' ? '' : `${name.substring(2, 4)}时间`"
+                v-model="ruleForm1.time" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD hh:mm" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : `${name.substring(2, 4)}开始时间`"
                 style="width: 100%;"
               />
             </el-form-item>
           </el-col>
+          <el-col v-else :span="6">
+            <el-form-item label="报废时间" prop="time">
+              <el-date-picker
+                v-model="ruleForm1.time" type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD hh:mm" :disabled="title === '详情'"
+                placeholder="报废时间"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备编号" prop="equipmentNo" class="equipmentNo">
+              <el-input v-model.trim="ruleForm1.equipmentNo" :placeholder="title === '详情' ? '' : '设备名称'" disabled>
+                <template v-if="title !== '详情'" #append>
+                  <el-button type="primary" size="small" @click="addRowBtn">
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="设备名称" prop="equipmentName">
+              <el-input v-model.trim="ruleForm1.equipmentName" :placeholder="title === '详情' ? '' : '设备名称'" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="资产原值" prop="assetOriginValue">
+              <el-input v-model.trim="ruleForm1.assetOriginValue" :placeholder="title === '详情' ? '' : '资产原值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="财务净值" prop="financialValue">
+              <el-input v-model.trim="ruleForm1.financialValue" :placeholder="title === '详情' ? '' : '财务净值'" :disabled="title === '详情'" />
+            </el-form-item>
+          </el-col>
           <el-col :span="18">
             <el-form-item label="申请理由" prop="remark">
               <el-input v-model.trim="ruleForm1.remark" :placeholder="title === '详情' ? '' : '申请理由'" :disabled="title === '详情'" />
@@ -892,33 +935,53 @@
       <el-form v-if="isDevice" ref="ruleFormRef2" :model="ruleForm2" :rules="rules2" label-position="right" label-width="110px" class="form" :class="[title === '详情' ? 'isDetail' : '']">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
+            <el-form-item label="申请编号:">
+              <el-input
+                v-model="ruleForm2.applyNo"
+                :placeholder="title === '详情' ? '' : '系统自动生成'"
+                :class="{ 'detail-input': title === '详情' }"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="申请名称" prop="applyName">
-              <el-input v-model.trim="ruleForm2.applyName" :placeholder="title === '详情' ? '' : '申请名称'" :disabled="title === '详情'" />
+              <el-input v-model.trim="ruleForm2.applyName" :placeholder="title === '详情' ? '' : '请输入申请名称'" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="申请单位" prop="applyUnit">
-              <dept-select v-model="ruleForm2.applyUnit" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" :disabled="title === '详情'" />
+              <!-- <dept-select v-model="ruleForm2.applyUnit" :data="useDeptList" :placeholder="title === '详情' ? '' : '申请单位'" disabled /> -->
+              <el-input
+                v-model="ruleForm2.applyUnitName"
+                :class="{ 'detail-input': title === '详情' }"
+                disabled
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="申请人" prop="applyPerson">
-              <el-select v-model="ruleForm2.applyPerson" :placeholder="title === '详情' ? '' : '申请人'" :disabled="title === '详情'" style="width: 100%;">
+              <!-- <el-select v-model="ruleForm2.applyPerson" :placeholder="title === '详情' ? '' : '申请人'" disabled style="width: 100%;">
                 <el-option v-for="item in usePersonList" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <el-form-item label="借用时间" prop="time">
-              <el-date-picker
-                v-model="ruleForm2.time" type="datetime" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DD HH:mm" :disabled="title === '详情'"
-                :placeholder="title === '详情' ? '' : '借用时间'"
-                style="width: 100%;"
+              </el-select> -->
+              <el-input
+                v-model="ruleForm2.applyPersonName"
+                :class="{ 'detail-input': title === '详情' }"
+                disabled
               />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24">
+          <el-col :span="6">
+            <el-form-item label="借用时间" prop="time">
+              <el-date-picker
+                v-model="ruleForm2.time" type="datetime" format="YYYY-MM-DD hh:mm" value-format="YYYY-MM-DD hh:mm" :disabled="title === '详情'"
+                :placeholder="title === '详情' ? '' : '请选择借用时间'"
+                style="width: 100%;"
+              />
+            </el-form-item>
+          </el-col>
           <el-col :span="18">
             <el-form-item label="申请说明" prop="applyDesc">
               <el-input v-model.trim="ruleForm2.applyDesc" :placeholder="title === '详情' ? '' : '申请说明'" :disabled="title === '详情'" />
diff --git a/src/views/device/stateManage/components/templateList.vue b/src/views/device/stateManage/components/templateList.vue
index 0e6c220..e757cb8 100644
--- a/src/views/device/stateManage/components/templateList.vue
+++ b/src/views/device/stateManage/components/templateList.vue
@@ -75,21 +75,25 @@
     text: '申请编号',
     value: 'applyNo',
     align: 'center',
+    width: 180,
   },
   {
     text: '申请类型',
     value: 'applyTypeName',
     align: 'center',
+    width: 120,
   },
   {
     text: '设备编号',
     value: 'equipmentNo',
     align: 'center',
+    width: 180,
   },
   {
     text: '设备名称',
     value: 'equipmentName',
     align: 'center',
+    width: 120,
   },
   {
     text: '型号',
@@ -100,11 +104,13 @@
     text: '设备状态',
     value: 'managerStateName',
     align: 'center',
+    width: 120,
   },
   {
     text: '申请单位',
     value: 'applyUnitName',
     align: 'center',
+    width: 120,
   },
   {
     text: '申请人',
@@ -115,11 +121,13 @@
     text: `${props.name.substring(2, 4)}时间`,
     value: 'time',
     align: 'center',
+    width: 180,
   },
   {
     text: '审批状态',
     value: 'approvalStatusName',
     align: 'center',
+    width: 100,
   },
 ]) // 表格
 const list = ref([]) // 表格数据